diff --git a/code/datums/ammo/misc.dm b/code/datums/ammo/misc.dm
index bea9d957cf2a..77924d6871af 100644
--- a/code/datums/ammo/misc.dm
+++ b/code/datums/ammo/misc.dm
@@ -379,7 +379,7 @@
/datum/ammo/grenade_container/tank_glauncher
max_range = 8
-/datum/ammo/grenade_container/chimera_launcher
+/datum/ammo/grenade_container/blackfoot_launcher
name = "starburst shell"
nade_type = /obj/item/explosive/grenade/high_explosive/starshell
diff --git a/code/datums/supply_packs/vehicle_ammo.dm b/code/datums/supply_packs/vehicle_ammo.dm
index 509024c3731a..c4ed044c43a5 100644
--- a/code/datums/supply_packs/vehicle_ammo.dm
+++ b/code/datums/supply_packs/vehicle_ammo.dm
@@ -162,12 +162,12 @@
group = "Vehicle Ammo"
/datum/supply_packs/blackfoot_ammo
- name = "Chimera Launchers ammunition (x4)"
+ name = "Blackfoot Launchers ammunition (x4)"
contains = list(
- /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo,
- /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo,
- /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo,
- /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo,
+ /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo,
+ /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo,
+ /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo,
+ /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo,
)
cost = 40
containertype = /obj/structure/closet/crate/weapon
diff --git a/code/datums/supply_packs/vehicle_equipment.dm b/code/datums/supply_packs/vehicle_equipment.dm
index 64216ddccdaa..cfacb92308e4 100644
--- a/code/datums/supply_packs/vehicle_equipment.dm
+++ b/code/datums/supply_packs/vehicle_equipment.dm
@@ -9,7 +9,7 @@
group = "Vehicle Equipment"
/datum/supply_packs/landing_pad
- name = "AD-19D landing pad (x1)"
+ name = "AD-19E landing pad (x1)"
contains = list(
/obj/structure/landing_pad_folded,
)
diff --git a/code/game/jobs/job/command/auxiliary/operations_pilot.dm b/code/game/jobs/job/command/auxiliary/operations_pilot.dm
index 801c9eee9a2b..9517d0019e3e 100644
--- a/code/game/jobs/job/command/auxiliary/operations_pilot.dm
+++ b/code/game/jobs/job/command/auxiliary/operations_pilot.dm
@@ -5,7 +5,7 @@
supervisors = "the auxiliary support officer"
flags_startup_parameters = ROLE_HIDDEN
gear_preset = /datum/equipment_preset/uscm_ship/op
- entry_message_body = "Your job is to fly, protect, and maintain the AD-19D blackfoot. While you are an officer, your authority is limited to the vtol, where you have authority over the enlisted personnel."
+ entry_message_body = "Your job is to fly, protect, and maintain the AD-19E blackfoot. While you are an officer, your authority is limited to the vtol, where you have authority over the enlisted personnel."
/obj/effect/landmark/start/pilot/operations_pilot
name = JOB_OPERATIONS_PILOT
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 3c45d7770eb7..e0c2bc2b1f7a 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -22,7 +22,7 @@
/obj/structure/extinguisher_cabinet/blackfoot
name = "integrated fire cabinet"
- desc = "A compact on-board fire suppression system specially designed for implementation aboard the aircraft. In grunt terms, it's a fancy-pants fire extinguisher cabinet. Good if the Chimera launchers misfire, or if some chucklehead forgets to put the pilot light out on their flamer."
+ desc = "A compact on-board fire suppression system specially designed for implementation aboard the aircraft. In grunt terms, it's a fancy-pants fire extinguisher cabinet. Good if the Blackfoot launchers misfire, or if some chucklehead forgets to put the pilot light out on their flamer."
icon = 'icons/obj/vehicles/interiors/blackfoot.dmi'
icon_state = "fire-cab"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index f88ad652a12d..2a5b459ec5f1 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -722,7 +722,7 @@ GLOBAL_LIST_INIT(be_special_flags, list(
* * width - Screen' width.
* * height - Screen's height.
*/
-/datum/preferences/proc/SetChoices(mob/user, limit = 21, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
+/datum/preferences/proc/SetChoices(mob/user, limit = 22, list/splitJobs = list(JOB_CHIEF_REQUISITION, JOB_WO_CMO), width = 950, height = 750)
if(!GLOB.RoleAuthority)
return
diff --git a/code/modules/cm_marines/Donator_Items.dm b/code/modules/cm_marines/Donator_Items.dm
index 27c2e24edfdf..ab85f25eff5b 100644
--- a/code/modules/cm_marines/Donator_Items.dm
+++ b/code/modules/cm_marines/Donator_Items.dm
@@ -456,7 +456,7 @@
icon_state = "hawkeye_jacket_u"
item_state = "hawkeye_jacket_u"
-/obj/item/clothing/suit/storage/marine/fluff/chimera //CKEY=theultimatechimera
+/obj/item/clothing/suit/storage/marine/fluff/blackfoot //CKEY=theultimatechimera
name = "Brett's Trenchcoat"
desc = "A trenchcoat of authority. DONOR ITEM"
icon_state = "hos"
@@ -968,7 +968,7 @@
)
flags_inventory = BLOCKSHARPOBJ
-/obj/item/clothing/head/helmet/marine/fluff/chimera //CKEY=theultimatechimera
+/obj/item/clothing/head/helmet/marine/fluff/blackfoot //CKEY=theultimatechimera
name = "Brett's hat"
desc = "A fancy beret. DONOR ITEM"
icon_state = "hosberet"
diff --git a/code/modules/vehicles/blackfoot/blackfoot.dm b/code/modules/vehicles/blackfoot/blackfoot.dm
index 96cffbc50036..25d9a1eb7619 100644
--- a/code/modules/vehicles/blackfoot/blackfoot.dm
+++ b/code/modules/vehicles/blackfoot/blackfoot.dm
@@ -42,7 +42,7 @@
hardpoints_allowed = list(
/obj/item/hardpoint/locomotion/blackfoot_thrusters,
- /obj/item/hardpoint/primary/chimera_launchers,
+ /obj/item/hardpoint/primary/blackfoot_launchers,
/obj/item/hardpoint/support/sensor_array,
/obj/item/hardpoint/secondary/doorgun,
)
@@ -77,13 +77,10 @@
var/image/thrust_overlay
- var/last_turn = 0
- var/turn_delay = 1 SECONDS
-
var/state = STATE_STOWED
- var/last_flight_sound = 0
- var/flight_sound_cooldown = 4 SECONDS
+ COOLDOWN_DECLARE(turn_delay)
+ COOLDOWN_DECLARE(flight_sound_cooldown)
var/obj/blackfoot_shadow/shadow_holder
@@ -224,7 +221,7 @@
if(state == STATE_VTOL)
return ..()
- if(last_turn + turn_delay > world.time)
+ if(!COOLDOWN_FINISHED(src, turn_delay))
return FALSE
if(state != STATE_FLIGHT)
@@ -241,8 +238,10 @@
if(!.)
return
- shadow_holder.dir = dir
- last_turn = world.time
+ COOLDOWN_START(src, turn_delay, 1 SECONDS)
+
+ if(shadow_holder)
+ shadow_holder.dir = dir
/obj/vehicle/multitile/blackfoot/process(deltatime)
if (state == STATE_FLIGHT)
@@ -251,8 +250,8 @@
thrust_overlay = image(icon, "flight_thrust")
overlays += thrust_overlay
- if(world.time > last_flight_sound + flight_sound_cooldown)
- last_flight_sound = world.time
+ if(COOLDOWN_FINISHED(src, flight_sound_cooldown))
+ COOLDOWN_START(src, flight_sound_cooldown, 4 SECONDS)
playsound(loc, 'sound/vehicles/vtol/exteriorflight.ogg', 25, FALSE)
for(var/atom/movable/screen/blackfoot/custom_screen as anything in custom_hud)
@@ -435,7 +434,7 @@
remove_action(M, /datum/action/human_action/blackfoot/toggle_targeting)
M.client?.mouse_pointer_icon = initial(M.client?.mouse_pointer_icon)
- var/obj/item/hardpoint/primary/chimera_launchers/launchers = locate() in hardpoints
+ var/obj/item/hardpoint/primary/blackfoot_launchers/launchers = locate() in hardpoints
if(launchers)
launchers.safety = TRUE
@@ -752,7 +751,7 @@
state = STATE_DEPLOYED
/obj/vehicle/multitile/blackfoot/proc/toggle_targeting()
- var/obj/item/hardpoint/primary/chimera_launchers/launchers = locate() in hardpoints
+ var/obj/item/hardpoint/primary/blackfoot_launchers/launchers = locate() in hardpoints
if(!launchers)
to_chat(seats[VEHICLE_DRIVER], SPAN_WARNING("CRITICAL ERROR: NO LAUNCHERS DETECTED."))
@@ -1302,24 +1301,24 @@
/obj/item/fuel_pump = 1,
/obj/item/flight_cpu = 1,
/obj/item/landing_pad_light = 4,
- /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo = 4,
+ /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo = 4,
)
icon_state = "secure_crate_strapped"
-/obj/structure/chimera_loader
- name = "\improper chimera internal access point"
+/obj/structure/blackfoot_loader
+ name = "\improper blackfoot internal access point"
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi'
var/obj/vehicle/multitile/blackfoot/linked_blackfoot
-/obj/structure/chimera_loader/attackby(obj/item/attack_item, mob/user)
+/obj/structure/blackfoot_loader/attackby(obj/item/attack_item, mob/user)
if(!linked_blackfoot)
return
- if(istype(attack_item, /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo))
- var/obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo/ammo = attack_item
- var/obj/item/hardpoint/primary/chimera_launchers/launchers = locate() in linked_blackfoot.hardpoints
+ if(istype(attack_item, /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo))
+ var/obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo/ammo = attack_item
+ var/obj/item/hardpoint/primary/blackfoot_launchers/launchers = locate() in linked_blackfoot.hardpoints
if(!launchers)
return
diff --git a/code/modules/vehicles/blackfoot/interior.dm b/code/modules/vehicles/blackfoot/interior.dm
index abcf00a796a9..d163aa5dd798 100644
--- a/code/modules/vehicles/blackfoot/interior.dm
+++ b/code/modules/vehicles/blackfoot/interior.dm
@@ -49,8 +49,8 @@
. = ..()
-/obj/effect/landmark/interior/spawn/chimera_loader/on_load(datum/interior/interior)
- var/obj/structure/chimera_loader/loader = new(get_turf(src))
+/obj/effect/landmark/interior/spawn/blackfoot_loader/on_load(datum/interior/interior)
+ var/obj/structure/blackfoot_loader/loader = new(get_turf(src))
loader.name = name
loader.setDir(dir)
diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/blackfoot_launchers_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/blackfoot_launchers_ammo.dm
new file mode 100644
index 000000000000..6cc6f44448bc
--- /dev/null
+++ b/code/modules/vehicles/hardpoints/hardpoint_ammo/blackfoot_launchers_ammo.dm
@@ -0,0 +1,10 @@
+/obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo
+ name = "Blackfoot Launchers Ammunition"
+ desc = ""
+ caliber = "20mm"
+ icon_state = "blackfoot-ammo"
+ icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi'
+ w_class = SIZE_LARGE
+ default_ammo = /datum/ammo/grenade_container/blackfoot_launcher
+ max_rounds = 5
+ gun_type = /obj/item/hardpoint/primary/blackfoot_launchers
diff --git a/code/modules/vehicles/hardpoints/hardpoint_ammo/chimera_launchers_ammo.dm b/code/modules/vehicles/hardpoints/hardpoint_ammo/chimera_launchers_ammo.dm
deleted file mode 100644
index 2bad90264a7c..000000000000
--- a/code/modules/vehicles/hardpoints/hardpoint_ammo/chimera_launchers_ammo.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo
- name = "Chimera Launchers Ammunition"
- desc = ""
- caliber = "20mm"
- icon_state = "chimera-ammo"
- icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi'
- w_class = SIZE_LARGE
- default_ammo = /datum/ammo/grenade_container/chimera_launcher
- max_rounds = 5
- gun_type = /obj/item/hardpoint/primary/chimera_launchers
diff --git a/code/modules/vehicles/hardpoints/primary/chimera_launchers.dm b/code/modules/vehicles/hardpoints/primary/blackfoot_launchers.dm
similarity index 67%
rename from code/modules/vehicles/hardpoints/primary/chimera_launchers.dm
rename to code/modules/vehicles/hardpoints/primary/blackfoot_launchers.dm
index bd92b45f613d..2ae39b2efede 100644
--- a/code/modules/vehicles/hardpoints/primary/chimera_launchers.dm
+++ b/code/modules/vehicles/hardpoints/primary/blackfoot_launchers.dm
@@ -1,6 +1,6 @@
-/obj/item/hardpoint/primary/chimera_launchers
- name = "\improper AG-66/L Chimera Launcher System"
- desc = "The Chimera Launcher System, commonly referred two as just 'chimeras', is a variable payload dump-salvo type disposable munitions deployer, designed for short-range, quick-arming explosives to be fired in volleys from the quad-barrel launch tubes."
+/obj/item/hardpoint/primary/blackfoot_launchers
+ name = "\improper AG-66/L Blackfoot Launcher System"
+ desc = "The Blackfoot Launcher System, commonly referred two as just 'blackfoots', is a variable payload dump-salvo type disposable munitions deployer, designed for short-range, quick-arming explosives to be fired in volleys from the quad-barrel launch tubes."
icon = 'icons/obj/vehicles/hardpoints/blackfoot.dmi'
icon_state = "launchers"
@@ -12,7 +12,7 @@
health = 500
firing_arc = 180
- ammo = new /obj/item/ammo_magazine/hardpoint/chimera_launchers_ammo
+ ammo = new /obj/item/ammo_magazine/hardpoint/blackfoot_launchers_ammo
max_clips = 2
gun_firemode = GUN_FIREMODE_SEMIAUTO
@@ -25,7 +25,7 @@
var/safety = TRUE
-/obj/item/hardpoint/primary/chimera_launchers/get_icon_image(x_offset, y_offset, new_dir)
+/obj/item/hardpoint/primary/blackfoot_launchers/get_icon_image(x_offset, y_offset, new_dir)
var/obj/vehicle/multitile/blackfoot/blackfoot_owner = owner
if(!blackfoot_owner)
@@ -35,7 +35,7 @@
return icon
-/obj/item/hardpoint/primary/chimera_launchers/try_fire(atom/target, mob/living/user, params)
+/obj/item/hardpoint/primary/blackfoot_launchers/try_fire(atom/target, mob/living/user, params)
if(safety)
to_chat(user, SPAN_WARNING("Targeting mode is not enabled, unable to fire."))
return
@@ -47,7 +47,7 @@
return ..()
// Just removes the sleep because it sucks
-/obj/item/hardpoint/primary/chimera_launchers/reload(mob/user)
+/obj/item/hardpoint/primary/blackfoot_launchers/reload(mob/user)
if(!LAZYLEN(backup_clips))
to_chat(usr, SPAN_WARNING("\The [name] has no remaining backup clips."))
return
diff --git a/colonialmarines.dme b/colonialmarines.dme
index e21a6ddf6f3a..b99dd9322a96 100644
--- a/colonialmarines.dme
+++ b/colonialmarines.dme
@@ -2591,7 +2591,7 @@
#include "code\modules\vehicles\hardpoints\armor\snowplow.dm"
#include "code\modules\vehicles\hardpoints\hardpoint_ammo\arc_sentry_ammo.dm"
#include "code\modules\vehicles\hardpoints\hardpoint_ammo\autocannon_ammo.dm"
-#include "code\modules\vehicles\hardpoints\hardpoint_ammo\chimera_launchers_ammo.dm"
+#include "code\modules\vehicles\hardpoints\hardpoint_ammo\blackfoot_launchers_ammo.dm"
#include "code\modules\vehicles\hardpoints\hardpoint_ammo\cupola_ammo.dm"
#include "code\modules\vehicles\hardpoints\hardpoint_ammo\doorgun_ammo.dm"
#include "code\modules\vehicles\hardpoints\hardpoint_ammo\dualcannon_ammo.dm"
@@ -2609,7 +2609,7 @@
#include "code\modules\vehicles\hardpoints\holder\tank_turret.dm"
#include "code\modules\vehicles\hardpoints\primary\arc_sentry.dm"
#include "code\modules\vehicles\hardpoints\primary\autocannon.dm"
-#include "code\modules\vehicles\hardpoints\primary\chimera_launchers.dm"
+#include "code\modules\vehicles\hardpoints\primary\blackfoot_launchers.dm"
#include "code\modules\vehicles\hardpoints\primary\dual_cannon.dm"
#include "code\modules\vehicles\hardpoints\primary\flamer.dm"
#include "code\modules\vehicles\hardpoints\primary\ltb.dm"
diff --git a/icons/obj/vehicles/blackfoot_peripherals.dmi b/icons/obj/vehicles/blackfoot_peripherals.dmi
index a2443766adae..458589ce158a 100644
Binary files a/icons/obj/vehicles/blackfoot_peripherals.dmi and b/icons/obj/vehicles/blackfoot_peripherals.dmi differ
diff --git a/maps/interiors/blackfoot.dmm b/maps/interiors/blackfoot.dmm
index 740d7d273b8c..92f92f5c5326 100644
--- a/maps/interiors/blackfoot.dmm
+++ b/maps/interiors/blackfoot.dmm
@@ -34,8 +34,8 @@
"q" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-left";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-left";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = 19;
pixel_x = -7
@@ -52,8 +52,8 @@
"M" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-right";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-right";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = 20;
pixel_x = 8
diff --git a/maps/interiors/blackfoot_doorgun.dmm b/maps/interiors/blackfoot_doorgun.dmm
index c2cd8386b353..6e8985d75fb3 100644
--- a/maps/interiors/blackfoot_doorgun.dmm
+++ b/maps/interiors/blackfoot_doorgun.dmm
@@ -39,8 +39,8 @@
"q" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-left";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-left";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = -24;
pixel_x = 3
@@ -62,8 +62,8 @@
"M" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-right";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-right";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = -24;
pixel_x = -3
diff --git a/maps/interiors/blackfoot_transport.dmm b/maps/interiors/blackfoot_transport.dmm
index 2df53ec27bfd..2081271b5050 100644
--- a/maps/interiors/blackfoot_transport.dmm
+++ b/maps/interiors/blackfoot_transport.dmm
@@ -36,8 +36,8 @@
"q" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_left_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-left";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-left";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = 19;
pixel_x = -7
@@ -56,8 +56,8 @@
"M" = (
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_top,
/obj/structure/bed/chair/vehicle/blackfoot/bottom_right_bottom,
-/obj/effect/landmark/interior/spawn/chimera_loader{
- icon_state = "chimera-ammo-interior-right";
+/obj/effect/landmark/interior/spawn/blackfoot_loader{
+ icon_state = "blackfoot-ammo-interior-right";
icon = 'icons/obj/vehicles/blackfoot_peripherals.dmi';
pixel_y = 20;
pixel_x = 8
diff --git a/maps/map_files/USS_Almayer/USS_Almayer.dmm b/maps/map_files/USS_Almayer/USS_Almayer.dmm
index ae1d91806511..5bf3c05e20be 100644
--- a/maps/map_files/USS_Almayer/USS_Almayer.dmm
+++ b/maps/map_files/USS_Almayer/USS_Almayer.dmm
@@ -34933,7 +34933,7 @@
pixel_x = 2
},
/obj/effect/decal/cleanable/dirt,
-/obj/item/hardpoint/primary/chimera_launchers{
+/obj/item/hardpoint/primary/blackfoot_launchers{
pixel_y = 7;
pixel_x = -4
},