From d0d3d30d83c1f4e6926b4acf185adb2815ecde40 Mon Sep 17 00:00:00 2001 From: CRUNCH <143041327+Fordoxia@users.noreply.github.com> Date: Thu, 7 Mar 2024 09:33:08 +0000 Subject: [PATCH] Makes the crowbars of non-construction borgs red (#24281) * Gives non-engiborgs red crowbars * Update code/game/objects/items/tools/crowbar.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> * Update code/game/objects/items/tools/crowbar.dm Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --------- Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com> --- code/game/objects/items/tools/crowbar.dm | 5 +++++ .../mob/living/silicon/robot/robot_modules.dm | 22 +++++++++---------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/code/game/objects/items/tools/crowbar.dm b/code/game/objects/items/tools/crowbar.dm index 8c06df0a140..4d58d09d211 100644 --- a/code/game/objects/items/tools/crowbar.dm +++ b/code/game/objects/items/tools/crowbar.dm @@ -112,6 +112,11 @@ force = 10 toolspeed = 0.5 +/obj/item/crowbar/cyborg/red + name = "emergency hydraulic crowbar" + desc = "A hydraulic prying tool, compact but powerful. Supplied to non-construction cyborgs primarily to allow them to pry open airlocks during power outages." + icon_state = "crowbar_red" + /obj/item/crowbar/power name = "jaws of life" desc = "A set of jaws of life, the magic of science has managed to fit it down into a device small enough to fit in a tool belt. It's fitted with a prying head." diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index a2b4e91bbec..ca5d92bab00 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -326,7 +326,7 @@ subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/healthanalyzer/advanced, /obj/item/robotanalyzer, /obj/item/reagent_scanner/adv, @@ -430,7 +430,7 @@ subsystems = list(/mob/living/silicon/proc/subsystem_crew_monitor) basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/restraints/handcuffs/cable/zipties/cyborg, /obj/item/melee/baton/loaded, /obj/item/gun/energy/disabler/cyborg, @@ -455,7 +455,7 @@ module_type = "Janitor" basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/soap/nanotrasen, /obj/item/storage/bag/trash/cyborg, /obj/item/mop/advanced/cyborg, @@ -514,7 +514,7 @@ module_type = "Service" basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/handheld_chem_dispenser/booze, /obj/item/handheld_chem_dispenser/soda, /obj/item/pen/multi, @@ -578,7 +578,7 @@ custom_removals = list("KA modkits") basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/storage/bag/ore/cyborg, /obj/item/pickaxe/drill/cyborg, /obj/item/shovel, @@ -625,7 +625,7 @@ /obj/item/flash/cyborg, /obj/item/melee/energy/sword/cyborg, /obj/item/gun/energy/pulse/cyborg, - /obj/item/crowbar/cyborg + /obj/item/crowbar/cyborg/red, ) special_rechargables = list(/obj/item/gun/energy/pulse/cyborg) @@ -639,7 +639,7 @@ /obj/item/gun/energy/printer, /obj/item/gun/projectile/revolver/grenadelauncher/multi/cyborg, /obj/item/card/emag, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/pinpointer/operative ) @@ -665,7 +665,7 @@ /obj/item/bonegel, /obj/item/FixOVein, /obj/item/card/emag, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/pinpointer/operative, /obj/item/stack/medical/bruise_pack/advanced/cyborg/syndicate, /obj/item/stack/medical/ointment/advanced/cyborg/syndicate, @@ -714,7 +714,7 @@ module_actions = list(/datum/action/innate/robot_sight/thermal, /datum/action/innate/robot_magpulse) basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/gun/energy/immolator/multi/cyborg, // See comments on /robot_module/combat below /obj/item/melee/baton/loaded, // secondary weapon, for things immune to burn, immune to ranged weapons, or for arresting low-grade threats /obj/item/restraints/handcuffs/cable/zipties/cyborg, @@ -732,7 +732,7 @@ module_actions = list(/datum/action/innate/robot_magpulse) basic_modules = list( /obj/item/flash/cyborg, - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/gun/energy/immolator/multi/cyborg, // primary weapon, strong at close range (ie: against blob/terror/xeno), but consumes a lot of energy per shot. // Borg gets 40 shots of this weapon. Gamma Sec ERT gets 10. // So, borg has way more burst damage, but also takes way longer to recharge / get back in the fight once depleted. Has to find a borg recharger and sit in it for ages. @@ -753,7 +753,7 @@ module_type = "Standard" module_actions = list(/datum/action/innate/robot_sight/thermal/alien) basic_modules = list( - /obj/item/crowbar/cyborg, + /obj/item/crowbar/cyborg/red, /obj/item/melee/energy/alien/claws, /obj/item/flash/cyborg/alien, /obj/item/reagent_containers/spray/alien/stun,