From 26de2b81110c38702ac68f53fa663157e2617bc9 Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 16 Aug 2019 10:49:26 -0400 Subject: [PATCH 1/2] greybois --- _maps/map_files/generic/CentCom.dmm | 2 +- code/datums/ert.dm | 10 +++++++ code/modules/antagonists/greybois/greybois.dm | 23 ++++++++++++++++ code/modules/clothing/outfits/ert.dm | 27 +++++++++++++++++++ tgstation.dme | 1 + 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 code/modules/antagonists/greybois/greybois.dm diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 115ad3d363..f2e0599ae6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -9840,7 +9840,7 @@ id = "XCCFerry"; name = "Hanger Bay Shutters"; pixel_y = 24; - req_access_txt = "2" + req_access_txt = "101" }, /obj/effect/turf_decal/stripes/line{ dir = 5 diff --git a/code/datums/ert.dm b/code/datums/ert.dm index d61c95c8f2..8fc0a9155b 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -55,3 +55,13 @@ rename_team = "Inquisition" mission = "Destroy any traces of paranormal activity aboard the station." polldesc = "a Nanotrasen paranormal response team" + +/datum/ert/greybois + code = "Green" + teamsize = 1 + opendoors = FALSE + enforce_human = FALSE + roles = /datum/antagonist/greybois + leader_role = /datum/antagonist/greybois/greygod + rename_team = "Emergency Assistants" + polldesc = "an Emergency Assistant" diff --git a/code/modules/antagonists/greybois/greybois.dm b/code/modules/antagonists/greybois/greybois.dm new file mode 100644 index 0000000000..b5e18045e8 --- /dev/null +++ b/code/modules/antagonists/greybois/greybois.dm @@ -0,0 +1,23 @@ +/datum/antagonist/greybois + name = "Emergency Assistant" + show_name_in_check_antagonists = TRUE + show_in_antagpanel = FALSE + var/mission = "Assist the station." + var/datum/outfit/outfit = /datum/outfit/ert/greybois + +/datum/antagonist/greybois/greygod + outfit = /datum/outfit/ert/greybois/greygod + +/datum/antagonist/greybois/greet() + to_chat(owner, "You are an Emergency Assistant.") + to_chat(owner, "Central Command is sending you to [station_name()] with the task: [mission]") + +/datum/antagonist/greybois/on_gain() + equipERT() + . = ..() + +/datum/antagonist/greybois/proc/equipERT() + var/mob/living/carbon/human/H = owner.current + if(!istype(H)) + return + H.equipOutfit(outfit) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index b4310a7f42..2ab5190b71 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -163,6 +163,33 @@ /obj/item/gun/energy/pulse/pistol/loyalpin=1,\ /obj/item/construction/rcd/combat=1) +/datum/outfit/ert/greybois + name = "Emergency Assistant" + + uniform = /obj/item/clothing/under/color/grey/glorf + shoes = /obj/item/clothing/shoes/sneakers/black + gloves = /obj/item/clothing/gloves/color/fyellow + ears = /obj/item/radio/headset + head = /obj/item/clothing/head/soft/grey + belt = /obj/item/storage/belt/utility/full + back = /obj/item/storage/backpack + mask = /obj/item/clothing/mask/gas + l_pocket = /obj/item/tank/internals/emergency_oxygen + l_hand = /obj/item/storage/toolbox/emergency/old + id = /obj/item/card/id + +/datum/outfit/ert/greybois/greygod + suit = /obj/item/clothing/suit/hazardvest + l_hand = /obj/item/storage/toolbox/plastitanium + +/datum/outfit/ert/greybois/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + if(visualsOnly) + return + var/obj/item/card/id/W = H.wear_id + W.registered_name = H.real_name + W.assignment = "Assistant" + W.access = list(ACCESS_MAINT_TUNNELS,ACCESS_CENT_GENERAL) + W.update_label(W.registered_name, W.assignment) /datum/outfit/centcom_official name = "CentCom Official" diff --git a/tgstation.dme b/tgstation.dme index da990c169a..d9d0395fa6 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -1279,6 +1279,7 @@ #include "code\modules\antagonists\disease\disease_mob.dm" #include "code\modules\antagonists\ert\ert.dm" #include "code\modules\antagonists\greentext\greentext.dm" +#include "code\modules\antagonists\greybois\greybois.dm" #include "code\modules\antagonists\highlander\highlander.dm" #include "code\modules\antagonists\monkey\monkey.dm" #include "code\modules\antagonists\morph\morph.dm" From 542915faa62ab06c64d92cbe634eb7d321ec3472 Mon Sep 17 00:00:00 2001 From: Sishen Date: Fri, 16 Aug 2019 10:53:24 -0400 Subject: [PATCH 2/2] Update ert.dm --- code/modules/clothing/outfits/ert.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index 2ab5190b71..86c8f5335f 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -181,6 +181,7 @@ /datum/outfit/ert/greybois/greygod suit = /obj/item/clothing/suit/hazardvest l_hand = /obj/item/storage/toolbox/plastitanium + gloves = /obj/item/clothing/gloves/color/yellow /datum/outfit/ert/greybois/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) if(visualsOnly)