diff --git a/code/modules/vending/security.dm b/code/modules/vending/security.dm index 01fff9bdf6db..220bd1acdb7d 100644 --- a/code/modules/vending/security.dm +++ b/code/modules/vending/security.dm @@ -32,6 +32,9 @@ /obj/item/watertank/pepperspray = 2, /obj/item/storage/belt/holster/energy = 4, /obj/item/ammo_box/magazine/m35 = 5, //monkestation edit: Paco sec + /obj/item/clothing/head/guardmanhelmet = 1, //monkestation edit: Guardman + /obj/item/clothing/under/guardmanuniform = 1, //monkestation edit: Guardman + /obj/item/clothing/suit/armor/guardmanvest = 1, //monkestation edit: Guardman ) refill_canister = /obj/item/vending_refill/security default_price = PAYCHECK_CREW diff --git a/monkestation/code/modules/clothing/head/costume.dm b/monkestation/code/modules/clothing/head/costume.dm index 30373848e4b0..74bc8674fbea 100644 --- a/monkestation/code/modules/clothing/head/costume.dm +++ b/monkestation/code/modules/clothing/head/costume.dm @@ -38,3 +38,10 @@ worn_icon = 'monkestation/icons/mob/clothing/head.dmi' icon_state = "knowingclownhat" worn_y_offset = 6 + +/obj/item/clothing/head/guardmanhelmet + name = "guardman's helmet" + desc = "Keeps your brain intact when fighting heretics" + icon = 'monkestation/icons/obj/clothing/hats.dmi' + worn_icon = 'monkestation/icons/mob/clothing/head.dmi' + icon_state = "guardman_helmet" \ No newline at end of file diff --git a/monkestation/code/modules/clothing/suits/coats.dm b/monkestation/code/modules/clothing/suits/coats.dm index 32bbb248acfb..5b5eaef23c23 100644 --- a/monkestation/code/modules/clothing/suits/coats.dm +++ b/monkestation/code/modules/clothing/suits/coats.dm @@ -96,6 +96,14 @@ 'monkestation/sound/voice/screams/misc/HL1 Scientist/scream_sci1.ogg', 'monkestation/sound/voice/screams/misc/HL1 Scientist/scream_sci2.ogg') +/obj/item/clothing/suit/armor/guardmanvest + name = "guardman's vest" + desc = "It keeps your guts intact, thats really all that matters" + icon = 'monkestation/icons/obj/clothing/suits.dmi' + worn_icon = 'monkestation/icons/mob/clothing/suit.dmi' + icon_state = "guardman_vest" + + //Only basic and scientist labcoats get to STAPH /obj/item/clothing/suit/toggle/labcoat/cmo @@ -181,4 +189,4 @@ /obj/item/clothing/suit/armor/secduster/science name = "science security duster" icon_state = "cowboy_sec_science" - masktype = /obj/item/clothing/mask/breath/sec_bandana/science + masktype = /obj/item/clothing/mask/breath/sec_bandana/science \ No newline at end of file diff --git a/monkestation/code/modules/clothing/under/undersuit.dm b/monkestation/code/modules/clothing/under/undersuit.dm index 59b81bdc13ed..9cc681910a3f 100644 --- a/monkestation/code/modules/clothing/under/undersuit.dm +++ b/monkestation/code/modules/clothing/under/undersuit.dm @@ -75,3 +75,10 @@ icon_state = "wonka" worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' worn_icon_state = "wonka" + +/obj/item/clothing/under/guardmanuniform + name = "guardman's uniform" + desc = "The red color is meant to hide either your blood or the xeno's blood, do xenos even have red blood?" + icon = 'monkestation/icons/obj/clothing/uniforms.dmi' + icon_state = "guardman_uniform" + worn_icon = 'monkestation/icons/mob/clothing/uniform.dmi' \ No newline at end of file diff --git a/monkestation/icons/mob/clothing/head.dmi b/monkestation/icons/mob/clothing/head.dmi index d900f7ca1b74..5905870683a4 100644 Binary files a/monkestation/icons/mob/clothing/head.dmi and b/monkestation/icons/mob/clothing/head.dmi differ diff --git a/monkestation/icons/mob/clothing/suit.dmi b/monkestation/icons/mob/clothing/suit.dmi index b205f37c5e4e..08b398e6c981 100644 Binary files a/monkestation/icons/mob/clothing/suit.dmi and b/monkestation/icons/mob/clothing/suit.dmi differ diff --git a/monkestation/icons/mob/clothing/uniform.dmi b/monkestation/icons/mob/clothing/uniform.dmi index ad0c552ff500..f1430ba85536 100644 Binary files a/monkestation/icons/mob/clothing/uniform.dmi and b/monkestation/icons/mob/clothing/uniform.dmi differ diff --git a/monkestation/icons/obj/clothing/hats.dmi b/monkestation/icons/obj/clothing/hats.dmi index abf2d81a471a..740eef80cb52 100644 Binary files a/monkestation/icons/obj/clothing/hats.dmi and b/monkestation/icons/obj/clothing/hats.dmi differ diff --git a/monkestation/icons/obj/clothing/suits.dmi b/monkestation/icons/obj/clothing/suits.dmi index 7881728374fe..e4a71324d665 100644 Binary files a/monkestation/icons/obj/clothing/suits.dmi and b/monkestation/icons/obj/clothing/suits.dmi differ diff --git a/monkestation/icons/obj/clothing/uniforms.dmi b/monkestation/icons/obj/clothing/uniforms.dmi index f175393dc57c..722dc1587b30 100644 Binary files a/monkestation/icons/obj/clothing/uniforms.dmi and b/monkestation/icons/obj/clothing/uniforms.dmi differ