Skip to content

Commit

Permalink
Merge pull request #561 from NicoDeLuna/GuardsmenSecuniform
Browse files Browse the repository at this point in the history
Guardman's security uniform
  • Loading branch information
dwasint authored Nov 17, 2023
2 parents 847eb45 + 8d7e8b6 commit e1f57d1
Show file tree
Hide file tree
Showing 10 changed files with 26 additions and 1 deletion.
3 changes: 3 additions & 0 deletions code/modules/vending/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions monkestation/code/modules/clothing/head/costume.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 9 additions & 1 deletion monkestation/code/modules/clothing/suits/coats.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
7 changes: 7 additions & 0 deletions monkestation/code/modules/clothing/under/undersuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Binary file modified monkestation/icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified monkestation/icons/mob/clothing/suit.dmi
Binary file not shown.
Binary file modified monkestation/icons/mob/clothing/uniform.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified monkestation/icons/obj/clothing/uniforms.dmi
Binary file not shown.

0 comments on commit e1f57d1

Please sign in to comment.