Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Re-modularizes Yogs Detective Coats #15514

Merged
JamieD1 merged 1 commit into from
Sep 4, 2022
Merged

Re-modularizes Yogs Detective Coats #15514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions code/game/objects/items/storage/backpack.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -718,9 +718,9 @@
new /obj/item/clothing/under/yogs/golddetective(src)
new /obj/item/clothing/under/yogs/greydetective(src)
new /obj/item/clothing/under/yogs/blackdetective(src)
new /obj/item/clothing/suit/det_suit/golddetective(src)
new /obj/item/clothing/suit/det_suit/detectivecoat(src)
new /obj/item/clothing/suit/det_suit/bluedetective(src)
new /obj/item/clothing/suit/yogs/golddetective(src)
new /obj/item/clothing/suit/yogs/detectivecoat(src)
new /obj/item/clothing/suit/yogs/bluedetective(src)

/obj/item/storage/backpack/duffelbag/clothing/sec/warden
name = "Warden's clothing duffelbag"
Expand Down
24 changes: 18 additions & 6 deletions yogstation/code/modules/clothing/suits/miscellaneous.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,12 +243,16 @@
icon_state = "caretakerhood"
flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDEHAIR

/obj/item/clothing/suit/det_suit/golddetective
/obj/item/clothing/suit/yogs/golddetective
name = "gold detective jacket"
desc = "A detective jacket, in gold!"
icon_state = "gold_detective"
item_state = "gold_item"
mutantrace_variation = NO_MUTANTRACE_VARIATION //Check inherits from det_suit
armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45)

/obj/item/clothing/suit/yogs/golddetective/Initialize()
. = ..()
allowed = GLOB.detective_vest_allowed

/obj/item/clothing/suit/yogs/leathercoat
name = "black leather coat"
Expand All @@ -268,12 +272,16 @@
icon_state = "janitor_coat"
item_state = "janitor_item"

/obj/item/clothing/suit/det_suit/detectivecoat
/obj/item/clothing/suit/yogs/detectivecoat
name = "detective long coat"
desc = "For those detectives that value fashion over function."
icon_state = "detective_coat"
item_state = "detective_item"
mutantrace_variation = NO_MUTANTRACE_VARIATION //Check inherits from det_suit
armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45)

/obj/item/clothing/suit/yogs/detectivecoat/Initialize()
. = ..()
allowed = GLOB.detective_vest_allowed

/obj/item/clothing/suit/yogs/blacktrenchcoat
name = "black trenchcoat"
Expand All @@ -294,12 +302,16 @@
icon_state = "monkrobes"
item_state = "monkrobes"

/obj/item/clothing/suit/det_suit/bluedetective
/obj/item/clothing/suit/yogs/bluedetective
name = "blue detective jacket"
desc = "A detective jacket that is blue!"
icon_state = "blue_detective"
item_state = "blue_item"
mutantrace_variation = NO_MUTANTRACE_VARIATION //Check inherits from det_suit
armor = list(MELEE = 25, BULLET = 10, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, RAD = 0, FIRE = 0, ACID = 45)

/obj/item/clothing/suit/yogs/bluedetective/Initialize()
. = ..()
allowed = GLOB.detective_vest_allowed

/obj/item/clothing/suit/hooded/spesshoodie
mob_overlay_icon = 'yogstation/icons/mob/clothing/suit/suit.dmi'
Expand Down