From 93081644f0e5ac431866f744bcf017275d599ee2 Mon Sep 17 00:00:00 2001 From: Furior Date: Sun, 22 Oct 2023 23:27:47 +0700 Subject: [PATCH] Exile fix and some mapping issue --- _maps/map_files220/generic/centcomm.dmm | 14 +++++----- modular_ss220/gateway/_gateway.dme | 1 + modular_ss220/gateway/code/exile.dm | 36 +++++++++++++++++++++++++ modular_ss220/jobs/code/cards_ids.dm | 2 +- 4 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 modular_ss220/gateway/code/exile.dm diff --git a/_maps/map_files220/generic/centcomm.dmm b/_maps/map_files220/generic/centcomm.dmm index 3d62db32c8d0..44c85216e2d0 100644 --- a/_maps/map_files220/generic/centcomm.dmm +++ b/_maps/map_files220/generic/centcomm.dmm @@ -28574,14 +28574,12 @@ /obj/item/clothing/under/suit/mafia/tan, /obj/item/clothing/under/suit/mafia, /obj/item/clothing/under/suit/mafia, -/obj/item/clothing/under/rank/civilian/lawyer/black, -/obj/item/clothing/under/rank/civilian/lawyer/black, -/obj/item/clothing/under/rank/civilian/lawyer/blue, -/obj/item/clothing/under/rank/civilian/lawyer/blue, -/obj/item/clothing/under/rank/civilian/lawyer/purple, -/obj/item/clothing/under/rank/civilian/lawyer/purple, -/obj/item/clothing/under/rank/civilian/lawyer/red, -/obj/item/clothing/under/rank/civilian/lawyer/red, +/obj/item/clothing/under/rank/procedure/lawyer/black, +/obj/item/clothing/under/rank/procedure/lawyer/black, +/obj/item/clothing/under/rank/procedure/lawyer/blue, +/obj/item/clothing/under/rank/procedure/lawyer/blue, +/obj/item/clothing/under/rank/procedure/lawyer/red, +/obj/item/clothing/under/rank/procedure/lawyer/red, /obj/effect/decal/warning_stripes/white{ color = "76643a" }, diff --git a/modular_ss220/gateway/_gateway.dme b/modular_ss220/gateway/_gateway.dme index e1b285dcac04..a07e04caa1db 100644 --- a/modular_ss220/gateway/_gateway.dme +++ b/modular_ss220/gateway/_gateway.dme @@ -1,5 +1,6 @@ #include "_gateway.dm" +#include "code/exile.dm" #include "code/gateway.dm" #include "code/gateway_config.dm" #include "code/gateway_initialize.dm" diff --git a/modular_ss220/gateway/code/exile.dm b/modular_ss220/gateway/code/exile.dm new file mode 100644 index 000000000000..8c0c48d15392 --- /dev/null +++ b/modular_ss220/gateway/code/exile.dm @@ -0,0 +1,36 @@ +// Exile implants will allow you to use the station gate, but not return home. +// This will allow security to exile badguys/for badguys to exile their kill targets +/obj/item/implant/exile + name = "exile bio-chip" + desc = "Prevents you from returning from away missions" + origin_tech = "materials=2;biotech=3;magnets=2;bluespace=3" + activated = BIOCHIP_ACTIVATED_PASSIVE + implant_data = /datum/implant_fluff/exile + implant_state = "implant-nanotrasen" + +/datum/implant_fluff/exile + name = "Nanotrasen Employee Exile Bio-chip" + life = "Known to last up to 3 to 4 years." + notes = "The onboard station gateway system has been modified to reject entry by individuals containing this bio-chip." + function = "Prevents the user from reentering the station through the gateway.... alive." + +/obj/item/implanter/exile + name = "bio-chip implanter (exile)" + implant_type = /obj/item/implant/exile + +/obj/item/implantcase/exile + name = "bio-chip case - 'Exile'" + desc = "A glass case containing an exile bio-chip." + implant_type = /obj/item/implant/exile + +/obj/structure/closet/secure_closet/exile + name = "exile bio-chips" + req_access = list(ACCESS_ARMORY) + +/obj/structure/closet/secure_closet/exile/populate_contents() + new /obj/item/implanter/exile(src) + new /obj/item/implantcase/exile(src) + new /obj/item/implantcase/exile(src) + new /obj/item/implantcase/exile(src) + new /obj/item/implantcase/exile(src) + new /obj/item/implantcase/exile(src) diff --git a/modular_ss220/jobs/code/cards_ids.dm b/modular_ss220/jobs/code/cards_ids.dm index dbb8ac982d67..5ad4386a8f14 100644 --- a/modular_ss220/jobs/code/cards_ids.dm +++ b/modular_ss220/jobs/code/cards_ids.dm @@ -18,7 +18,7 @@ GLOBAL_LIST_INIT(Jobs_SS220, list("intern", "cadet", "trainee", "student")) /mob/living/carbon/human/sec_hud_set_ID() var/image/holder = hud_list[ID_HUD] - holder.icon = 'icons/mob/hud.dmi' + holder.icon = 'icons/mob/hud/sechud.dmi' if(wear_id && (wear_id.get_job_name() in GLOB.Jobs_SS220)) holder.icon = 'modular_ss220/jobs/icons/hud.dmi' . = ..()