diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index e558d24594f..5ed7d1710a5 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -634,7 +634,7 @@ REAGENT SCANNER user.show_message("Growth progress: [T.amount_grown]/10", 1) /obj/item/bodyanalyzer - name = "body analyzer" + name = "handheld body analyzer" icon = 'icons/obj/device.dmi' icon_state = "bodyanalyzer_0" item_state = "healthanalyser" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index c3595288213..cbe1b1c1e62 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -238,6 +238,12 @@ obj/item/clothing/head/blob desc = "An in-atmosphere helmet worn by security members of the Nanotrasen Emergency Response Team. Has red highlights." icon_state = "erthelmet_sec" +/obj/item/clothing/head/helmet/ert/security/paranormal + name = "paranormal emergency response team helmet" + desc = "An in-atmosphere helmet worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils." + icon_state = "knight_templar" + item_state = "knight_templar" + //Engineer /obj/item/clothing/head/helmet/ert/engineer name = "emergency response team engineer helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index bda11216a06..8e91fbb2dd2 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -440,6 +440,13 @@ name = "emergency response team security armor" desc = "A set of armor worn by security members of the Nanotrasen Emergency Response Team. Has red highlights." icon_state = "ertarmor_sec" + + +/obj/item/clothing/suit/armor/vest/ert/security/paranormal + name = "emergency response team paranormal armor" + desc = "A set of armor worn by paranormal members of the Nanotrasen Emergency Response Team. Has crusader sigils." + icon_state = "knight_templar" + item_state = "knight_templar" //Engineer /obj/item/clothing/suit/armor/vest/ert/engineer diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm index e006cd84151..322c0931161 100644 --- a/code/modules/projectiles/ammunition/energy.dm +++ b/code/modules/projectiles/ammunition/energy.dm @@ -75,7 +75,7 @@ /obj/item/ammo_casing/energy/immolator/scatter projectile_type = /obj/item/projectile/beam/immolator/weak e_cost = 125 - pellets = 8 + pellets = 6 variance = 25 select_name = "scatter" diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index b9d8782a8c5..d38acae9c3a 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -345,14 +345,10 @@ var/ert_request_answered = 0 pda = /obj/item/pda/heads/ert id = /obj/item/card/id/ert l_ear = /obj/item/radio/headset/ert/alt + box = /obj/item/storage/box/responseteam implants = list(/obj/item/implant/mindshield) -/datum/outfit/job/centcom/response_team/pre_equip() - . = ..() - backpack_contents.Insert(1, /obj/item/storage/box/responseteam) - backpack_contents[/obj/item/storage/box/responseteam] = 1 - /obj/item/radio/centcom name = "centcomm bounced radio" frequency = ERT_FREQ @@ -363,13 +359,11 @@ var/ert_request_answered = 0 /obj/item/storage/box/responseteam/New() ..() - contents = list() - sleep(1) - new /obj/item/clothing/mask/breath( src ) - new /obj/item/tank/emergency_oxygen/engi( src ) - new /obj/item/flashlight/flare( src ) - new /obj/item/kitchen/knife/combat( src ) - new /obj/item/radio/centcom( src ) - new /obj/item/reagent_containers/food/pill/salicylic( src ) - new /obj/item/reagent_containers/food/pill/patch/synthflesh( src ) + new /obj/item/clothing/mask/breath(src) + new /obj/item/tank/emergency_oxygen/engi(src) + new /obj/item/flashlight/flare(src) + new /obj/item/kitchen/knife/combat(src) + new /obj/item/radio/centcom(src) + new /obj/item/reagent_containers/food/pill/patch/synthflesh(src) + new /obj/item/reagent_containers/hypospray/autoinjector(src) return diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index a37dbe00de2..2d0758440f8 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -65,7 +65,7 @@ /obj/item/organ/internal/cyberimp/eyes/hud/security, /obj/item/organ/internal/cyberimp/chest/nutriment ) - belt = /obj/item/gun/energy/gun/nuclear + belt = /obj/item/gun/energy/gun/blueshield/pdw9 backpack_contents = list( /obj/item/clothing/head/helmet/space/hardsuit/ert/commander = 1, @@ -114,7 +114,6 @@ belt = /obj/item/storage/belt/security/response_team pda = /obj/item/pda/heads/ert/security id = /obj/item/card/id/ert/security - var/has_grenades = FALSE /datum/outfit/job/centcom/response_team/security/amber name = "RT Security (Amber)" @@ -136,19 +135,21 @@ /datum/outfit/job/centcom/response_team/security/red name = "RT Security (Red)" - has_grenades = TRUE shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/color/black suit = /obj/item/clothing/suit/space/hardsuit/ert/security - suit_store = /obj/item/gun/energy/gun/blueshield - glasses = /obj/item/clothing/glasses/hud/security/sunglasses - cybernetic_implants = list( - /obj/item/organ/internal/cyberimp/arm/flash, - /obj/item/organ/internal/cyberimp/chest/nutriment - ) + suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 + glasses = /obj/item/clothing/glasses/sunglasses + r_hand = /obj/item/gun/projectile/automatic/lasercarbine + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/flash, + /obj/item/organ/internal/cyberimp/chest/nutriment, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + backpack_contents = list( /obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1, /obj/item/clothing/mask/gas/sechailer = 1, @@ -161,7 +162,6 @@ /datum/outfit/job/centcom/response_team/security/gamma name = "RT Security (Gamma)" - has_grenades = TRUE shoes = /obj/item/clothing/shoes/magboots/advance gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/security/gamma @@ -386,11 +386,13 @@ backpack_contents = list( /obj/item/clothing/mask/gas/sechailer/swat = 1, /obj/item/storage/box/zipties = 1, - /obj/item/flashlight = 1) + /obj/item/flashlight/seclite = 1 + ) /datum/outfit/job/centcom/response_team/paranormal/amber name = "RT Paranormal (Amber)" - suit = /obj/item/clothing/suit/armor/vest/ert/security + suit = /obj/item/clothing/suit/armor/vest/ert/security/paranormal + head = /obj/item/clothing/head/helmet/ert/security/paranormal suit_store = /obj/item/gun/energy/gun/advtaser r_pocket = /obj/item/nullrod @@ -398,17 +400,29 @@ name = "RT Paranormal (Red)" suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor - suit_store = /obj/item/gun/energy/gun/nuclear + suit_store = /obj/item/gun/energy/gun r_pocket = /obj/item/nullrod + glasses = /obj/item/clothing/glasses/sunglasses + + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/chest/nutriment + ) /datum/outfit/job/centcom/response_team/paranormal/gamma name = "RT Paranormal (Gamma)" suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor suit_store = /obj/item/gun/energy/gun/nuclear - r_pocket = /obj/item/gun/energy/pulse/pistol l_pocket = /obj/item/grenade/clusterbuster/holy shoes = /obj/item/clothing/shoes/magboots/advance + glasses = /obj/item/clothing/glasses/night + + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/chest/nutriment/plus, + /obj/item/organ/internal/cyberimp/eyes/hud/security, + /obj/item/organ/internal/cyberimp/brain/anti_stun + ) //////////////////// JANITORIAL /////////////////// @@ -451,6 +465,10 @@ r_pocket = /obj/item/scythe/tele l_pocket = /obj/item/gun/energy/gun/mini + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/advmop + ) + /datum/outfit/job/centcom/response_team/janitorial/gamma name = "RT Janitor (Gamma)" suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi index a9afaaff5bc..1fc59f10afd 100644 Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ