cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-18 10:33:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into just-defibrillator-things

Browse Source
This commit is contained in:
E-MonaRhg
2021-07-09 00:03:38 +02:00
parent abef5e648f d85f2261e5
commit c303a2b3f2
632 changed files with 15669 additions and 22631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/response_team/ert.dm
+1
View File
@@ -312,6 +312,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
id = /obj/item/card/id/ert
l_ear = /obj/item/radio/headset/ert/alt
box = /obj/item/storage/box/responseteam
gloves = /obj/item/clothing/gloves/combat
implants = list(/obj/item/implant/mindshield)
code/modules/response_team/ert_outfits.dm
-16
View File
@@ -54,7 +54,6 @@
/datum/outfit/job/centcom/response_team/commander/amber
name = "RT Commander (Amber)"
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest/ert/command
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer
@@ -71,7 +70,6 @@
/datum/outfit/job/centcom/response_team/commander/red
name = "RT Commander (Red)"
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/commander
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -95,7 +93,6 @@
/datum/outfit/job/centcom/response_team/commander/gamma
name = "RT Commander (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/commander/gamma
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -136,7 +133,6 @@
/datum/outfit/job/centcom/response_team/security/amber
name = "RT Security (Amber)"
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/color/black
suit = /obj/item/clothing/suit/armor/vest/ert/security
suit_store = /obj/item/gun/energy/gun/advtaser
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
@@ -155,7 +151,6 @@
name = "RT Security (Red)"
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/pdw9
glasses = /obj/item/clothing/glasses/sunglasses
@@ -183,7 +178,6 @@
/datum/outfit/job/centcom/response_team/security/gamma
name = "RT Security (Gamma)"
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
suit_store = /obj/item/gun/energy/gun/nuclear
@@ -221,7 +215,6 @@
rt_mob_job = "ERT Engineering"
back = /obj/item/storage/backpack/ert/engineer
uniform = /obj/item/clothing/under/rank/engineer
belt = /obj/item/storage/belt/utility/full/multitool
pda = /obj/item/pda/heads/ert/engineering
id = /obj/item/card/id/ert/engineering
@@ -229,7 +222,6 @@
/datum/outfit/job/centcom/response_team/engineer/amber
name = "RT Engineer (Amber)"
shoes = /obj/item/clothing/shoes/magboots
gloves = /obj/item/clothing/gloves/color/yellow
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer
suit_store = /obj/item/tank/internals/emergency_oxygen/engi
glasses = /obj/item/clothing/glasses/meson/engine
@@ -248,7 +240,6 @@
/datum/outfit/job/centcom/response_team/engineer/red
name = "RT Engineer (Red)"
shoes = /obj/item/clothing/shoes/magboots/advance
gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/chief/full
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
suit_store = /obj/item/tank/internals/emergency_oxygen/engi
@@ -274,7 +265,6 @@
/datum/outfit/job/centcom/response_team/engineer/gamma
name = "RT Engineer (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/chief/full
suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma
suit_store = /obj/item/gun/energy/gun/blueshield/pdw9
@@ -316,7 +306,6 @@
name = "RT Medic (Amber)"
shoes = /obj/item/clothing/shoes/white
gloves = /obj/item/clothing/gloves/color/latex
suit = /obj/item/clothing/suit/armor/vest/ert/medical
suit_store = /obj/item/gun/energy/gun/mini
glasses = /obj/item/clothing/glasses/hud/health
@@ -345,7 +334,6 @@
name = "RT Medic (Red)"
rt_mob_job = "ERT Medical"
shoes = /obj/item/clothing/shoes/white
gloves = /obj/item/clothing/gloves/color/latex/nitrile
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
suit_store = /obj/item/gun/energy/gun
@@ -378,7 +366,6 @@
/datum/outfit/job/centcom/response_team/medic/gamma
name = "RT Medic (Gamma)"
shoes = /obj/item/clothing/shoes/magboots/advance
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/medical/gamma
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -418,7 +405,6 @@
rt_mob_job = "ERT Paranormal"
uniform = /obj/item/clothing/under/rank/chaplain
back = /obj/item/storage/backpack/ert/security
gloves = /obj/item/clothing/gloves/color/black
shoes = /obj/item/clothing/shoes/combat
l_ear = /obj/item/radio/headset/ert/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
@@ -487,7 +473,6 @@
uniform = /obj/item/clothing/under/color/purple/sensor
back = /obj/item/storage/backpack/ert/janitor
belt = /obj/item/storage/belt/janitor/full
gloves = /obj/item/clothing/gloves/color/yellow
shoes = /obj/item/clothing/shoes/galoshes
l_ear = /obj/item/radio/headset/ert/alt
id = /obj/item/card/id/centcom
@@ -529,7 +514,6 @@
name = "RT Janitor (Gamma)"
suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
gloves = /obj/item/clothing/gloves/combat
suit_store = /obj/item/gun/energy/gun
l_pocket = /obj/item/grenade/clusterbuster/cleaner
r_pocket = /obj/item/scythe/tele