Skip to content

Commit

Permalink
adds paranormal loadouts, alters ERT survival kit box, updates PDW 9 …
Browse files Browse the repository at this point in the history
…sprite, adds paranormal armour variants.
  • Loading branch information
Birdtalon committed Sep 28, 2018
1 parent 55fa8bb commit deec799
Show file tree
Hide file tree
Showing 7 changed files with 54 additions and 29 deletions.
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/scanners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 7 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammunition/energy.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
22 changes: 8 additions & 14 deletions code/modules/response_team/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
44 changes: 31 additions & 13 deletions code/modules/response_team/ert_outfits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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)"
Expand All @@ -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
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/chest/nutriment,
/obj/item/organ/internal/cyberimp/eyes/hud/security
)
r_hand = /obj/item/gun/projectile/automatic/lasercarbine


backpack_contents = list(
/obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
/obj/item/clothing/mask/gas/sechailer = 1,
Expand All @@ -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
Expand Down Expand Up @@ -386,29 +386,43 @@
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

/datum/outfit/job/centcom/response_team/paranormal/red
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 ///////////////////

Expand Down Expand Up @@ -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
Expand Down
Binary file modified icons/obj/guns/energy.dmi
Binary file not shown.

0 comments on commit deec799

Please sign in to comment.