diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index c20046beea9..5ba58e2f313 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -246,8 +246,9 @@ new /obj/item/grenade/flashbang(src) update_icon() -/obj/item/storage/belt/security/response_team/gamma/New() - new /obj/item/melee/classic_baton(src) +/obj/item/storage/belt/security/response_team_gamma/New() + ..() + new /obj/item/melee/baton/loaded(src) new /obj/item/reagent_containers/spray/pepper(src) new /obj/item/flash(src) new /obj/item/grenade/flashbang(src) diff --git a/code/modules/clothing/spacesuits/ert.dm b/code/modules/clothing/spacesuits/ert.dm index fcbcb07b375..d08591ed40d 100644 --- a/code/modules/clothing/spacesuits/ert.dm +++ b/code/modules/clothing/spacesuits/ert.dm @@ -40,7 +40,7 @@ allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/t_scanner, /obj/item/rcd, /obj/item/crowbar, \ /obj/item/screwdriver, /obj/item/weldingtool, /obj/item/wirecutters, /obj/item/wrench, /obj/item/multitool, \ /obj/item/radio, /obj/item/analyzer, /obj/item/gun/energy/laser, /obj/item/gun/energy/pulse, \ - /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield) + /obj/item/gun/energy/gun/advtaser, /obj/item/melee/baton, /obj/item/gun/energy/gun, /obj/item/gun/projectile/automatic/lasercarbine, /obj/item/gun/energy/gun/blueshield, /obj/item/gun/energy/immolator/multi) strip_delay = 130 species_fit = list("Drask", "Vox") sprite_sheets = list( @@ -57,6 +57,7 @@ item_color = "ert_commander" /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma + name = "elite emergency response team commander helmet" max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammacommander" item_color = "gammacommander" @@ -68,6 +69,7 @@ item_state = "suit-command" /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma + name = "elite emergency response team commander suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //Security @@ -79,6 +81,7 @@ item_color = "ert_security" /obj/item/clothing/head/helmet/space/hardsuit/ert/security/gamma + name = "elite emergency response team security helmet" max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammasecurity" item_color = "gammasecurity" @@ -90,6 +93,7 @@ item_state = "syndicate-black-red" /obj/item/clothing/suit/space/hardsuit/ert/security/gamma + name = "elite emergency response team security suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //Engineer @@ -102,6 +106,7 @@ //Engineer /obj/item/clothing/head/helmet/space/hardsuit/ert/engineer/gamma + name = "elite emergency response team engineer helmet" max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammaengineer" item_color = "gammaengineer" @@ -113,6 +118,7 @@ item_state = "suit-orange" /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma + name = "elite emergency response team engineer suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //Medical @@ -123,6 +129,7 @@ item_color = "ert_medical" /obj/item/clothing/head/helmet/space/hardsuit/ert/medical/gamma + name = "elite emergency response team medical helmet" max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammamedical" item_color = "gammamedical" @@ -133,6 +140,7 @@ icon_state = "ert_medical" /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma + name = "elite emergency response team medical suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //Janitor @@ -143,6 +151,7 @@ item_color = "ert_janitor" /obj/item/clothing/head/helmet/space/hardsuit/ert/janitor/gamma + name = "elite emergency response team janitor helmet" max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT icon_state = "hardsuit0-gammajanitor" item_color = "gammajanitor" @@ -153,6 +162,7 @@ icon_state = "ert_janitor" /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma + name = "elite emergency response team janitor suit" max_heat_protection_temperature = FIRE_IMMUNITY_SUIT_MAX_TEMP_PROTECT //Paranormal diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 74bb7ae81de..87b6cc45e21 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -83,6 +83,7 @@ suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma glasses = /obj/item/clothing/glasses/night suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 + belt = /obj/item/gun/projectile/automatic/pistol/enforcer {mag_type = /obj/item/ammo_box/magazine/m45/enforcer45/lethal} backpack_contents = list( /obj/item/clothing/head/helmet/space/hardsuit/ert/commander/gamma = 1, @@ -100,10 +101,6 @@ /obj/item/organ/internal/cyberimp/arm/flash ) -/datum/outfit/job/centcomm/response_team/commander/gamma/pre_equip() - var/gun = new /obj/item/gun/projectile/automatic/pistol/enforcer {mag_type = /obj/item/ammo_box/magazine/m45/enforcer45/lethal} - belt = gun - //////////////////// SECURITY /////////////////// /datum/outfit/job/centcom/response_team/security @@ -165,7 +162,7 @@ shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma - belt = /obj/item/storage/belt/security/response_team/gamma + belt = /obj/item/storage/belt/security/response_team_gamma suit_store = /obj/item/gun/energy/gun/nuclear glasses = /obj/item/clothing/glasses/night l_pocket = /obj/item/restraints/legcuffs/bola/energy @@ -359,11 +356,11 @@ ) cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/surgery/l, + /obj/item/organ/internal/cyberimp/arm/medibeam, /obj/item/organ/internal/cyberimp/chest/nutriment/plus, /obj/item/organ/internal/cyberimp/eyes/hud/medical, - /obj/item/organ/internal/cyberimp/brain/anti_stun, - /obj/item/organ/internal/cyberimp/arm/surgery, - /obj/item/organ/internal/cyberimp/arm/medibeam + /obj/item/organ/internal/cyberimp/brain/anti_stun ) //////////////////// PARANORMAL /////////////////// diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm index 682c3a54170..0b77113d89b 100644 --- a/code/modules/surgery/organs/augments_arms.dm +++ b/code/modules/surgery/organs/augments_arms.dm @@ -168,7 +168,6 @@ /obj/item/organ/internal/cyberimp/arm/gun/laser/l parent_organ = "l_arm" - /obj/item/organ/internal/cyberimp/arm/gun/taser name = "arm-mounted taser implant" desc = "A variant of the arm cannon implant that fires electrodes and disabler shots. The cannon emerges from the subject's arm and remains inside when not in use." @@ -245,6 +244,10 @@ contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/bonegel/augment, /obj/item/FixOVein/augment, /obj/item/bonesetter/augment) origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3" +/obj/item/organ/internal/cyberimp/arm/surgery/l + parent_organ = "l_arm" + slot = "l_arm_device" + // lets make IPCs even *more* vulnerable to EMPs! /obj/item/organ/internal/cyberimp/arm/power_cord name = "APC-compatible power adapter implant" diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 4858435cc5f..507dd7626e0 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -19,6 +19,7 @@ var/obj/item/organ/internal/replaced = M.get_organ_slot(slot) if(replaced) + to_chat(world, "[replaced] replaced by [src]") if(dont_remove_slot) non_primary = 1 else