cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +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-27 16:37:58 +02:00
parent f83b8ae14e 9131bb0623
commit 4ee75ce29d
612 changed files with 30944 additions and 45575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/response_team/ert.dm
+1 -1
View File
@@ -47,7 +47,7 @@ GLOBAL_VAR_INIT(ert_request_answered, FALSE)
return 0
var/player_age_check = check_client_age(client, GLOB.responseteam_age)
if(player_age_check && config.use_age_restriction_for_antags)
if(player_age_check && GLOB.configuration.gamemode.antag_account_age_restriction)
to_chat(src, "<span class='warning'>This role is not yet available to you. You need to wait another [player_age_check] days.</span>")
return 0
code/modules/response_team/ert_outfits.dm
+14 -14
View File
@@ -321,12 +321,11 @@
/obj/item/clothing/head/helmet/ert/medical = 1,
/obj/item/clothing/mask/surgical = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/firstaid/regular = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/box/autoinjectors = 1,
/obj/item/roller = 1,
/obj/item/storage/pill_bottle/ert = 1,
/obj/item/flashlight = 1,
/obj/item/healthupgrade = 1,
/obj/item/handheld_defibrillator = 1
)
@@ -349,13 +348,12 @@
backpack_contents = list(
/obj/item/clothing/mask/surgical = 1,
/obj/item/storage/firstaid/toxin = 1,
/obj/item/storage/firstaid/brute = 1,
/obj/item/storage/firstaid/fire = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/storage/box/autoinjectors = 1,
/obj/item/roller = 1,
/obj/item/clothing/shoes/magboots = 1,
/obj/item/bodyanalyzer = 1,
/obj/item/healthupgrade = 1,
/obj/item/handheld_defibrillator = 1
)
@@ -378,9 +376,10 @@
backpack_contents = list(
/obj/item/bodyanalyzer/advanced = 1,
/obj/item/storage/firstaid/doctor = 1,
/obj/item/storage/firstaid/adv = 1,
/obj/item/extinguisher/mini = 1,
/obj/item/roller = 1,
/obj/item/healthanalyzer/advanced = 1,
/obj/item/handheld_defibrillator = 1
)
@@ -483,16 +482,15 @@
/obj/item/reagent_containers/spray/cleaner = 1,
/obj/item/storage/bag/trash = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/holosign_creator = 1,
/obj/item/flashlight = 1)
/obj/item/melee/flyswatter = 1)
/datum/outfit/job/centcom/response_team/janitorial/amber
name = "RT Janitor (Amber)"
suit = /obj/item/clothing/suit/armor/vest/ert/janitor
head = /obj/item/clothing/head/helmet/ert/janitor
glasses = /obj/item/clothing/glasses/sunglasses
r_hand = /obj/item/gun/energy/disabler
r_pocket = /obj/item/flashlight
suit_store = /obj/item/gun/energy/disabler
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/arm/advmop)
@@ -503,7 +501,7 @@
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
r_pocket = /obj/item/scythe/tele
l_pocket = /obj/item/gun/energy/gun/mini
suit_store = /obj/item/gun/energy/gun/mini
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/arm/janitorial,
@@ -513,20 +511,22 @@
/datum/outfit/job/centcom/response_team/janitorial/gamma
name = "RT Janitor (Gamma)"
suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor/gamma
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
glasses = /obj/item/clothing/glasses/night
suit_store = /obj/item/gun/energy/gun
l_pocket = /obj/item/grenade/clusterbuster/cleaner
r_pocket = /obj/item/scythe/tele
shoes = /obj/item/clothing/shoes/magboots/advance
backpack_contents = list(
/obj/item/grenade/chem_grenade/antiweed = 2,
/obj/item/grenade/clusterbuster/cleaner = 1,
/obj/item/storage/box/lights/mixed = 1,
/obj/item/storage/bag/trash/bluespace = 1,
/obj/item/reagent_containers/spray/cleaner = 1
/obj/item/reagent_containers/spray/cleaner = 1,
/obj/item/melee/flyswatter = 1
)
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/chest/nutriment/plus,
/obj/item/organ/internal/cyberimp/arm/advmop,
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened
)