From 429a716d44e8edbf00311bc6366c00a07fb5a8a1 Mon Sep 17 00:00:00 2001 From: OrionTheFox <76465278+OrionTheFox@users.noreply.github.com> Date: Sun, 7 May 2023 20:15:37 -0600 Subject: [PATCH] Repaths a few outdated instances of the HoS's cap, removes a straggling redsec item (#20972) * Remove HoS's redsec skirt from their locker Redsec is dead. * Fixes missing repaths to hos/cap and other related tweaks TG repathed these, which means now we don't need to worry about reskinning applying to the beret! We should probably make sure to use the new type tho... * remove dupe hop coat from garmentbag * update the single hos cap path on modular interdyne * more missed cap paths and removes now-redundant beret flag The base-type has the flag which covers the beret --- _maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm | 2 +- code/game/objects/items/storage/garment.dm | 3 +-- code/modules/clothing/head/jobs.dm | 1 - .../modules/clothing/clothing_variation_overrides/head.dm | 3 --- modular_skyrat/modules/command_vendor/code/vending.dm | 4 ++-- .../modules/customization/modules/clothing/head/head.dm | 2 +- modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm | 4 ++-- modular_skyrat/modules/mapping/code/mob_spawns.dm | 2 +- 8 files changed, 8 insertions(+), 13 deletions(-) diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index b84d0619da5..3852db38c0a 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -4976,7 +4976,7 @@ name = "\proper station admiral's locker"; req_access = list("syndicate") }, -/obj/item/clothing/head/hats/hos/syndicate, +/obj/item/clothing/head/hats/hos/cap/syndicate, /obj/item/clothing/head/hats/hos/beret/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/under/rank/captain/skyrat/utility/syndicate, diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index cf56ea3a4cf..3bf254c1eb4 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -70,10 +70,9 @@ new /obj/item/clothing/head/hats/hopcap(src) new /obj/item/clothing/neck/cloak/hop(src) new /obj/item/clothing/shoes/laceup(src) - new /obj/item/clothing/suit/hooded/wintercoat/hop(src) /obj/item/storage/bag/garment/hos/PopulateContents() - new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) + //new /obj/item/clothing/under/rank/security/head_of_security/skirt(src) SKYRAT EDIT REMOVAL - Blue Sec new /obj/item/clothing/under/rank/security/head_of_security/alt(src) new /obj/item/clothing/under/rank/security/head_of_security/alt/skirt(src) new /obj/item/clothing/under/rank/security/head_of_security/grey(src) diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index be3ff5b0ae9..1c02a8785f1 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -209,7 +209,6 @@ greyscale_config = /datum/greyscale_config/beret_badge greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#39393f#f0cc8f" - current_skin = "beret_badge" //SKYRAT EDIT ADDITION - prevents reskinning the hat; (RESKINNING NEEDS A CODE REWRITE SO IT STOPS SPREADING TO SUBTYPES OR CAN AT LEAST BE SET TO FALSE) /obj/item/clothing/head/hats/hos/beret/navyhos name = "head of security's formal beret" diff --git a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm index 0422908683d..dd4aed55d6f 100644 --- a/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm +++ b/modular_skyrat/master_files/code/modules/clothing/clothing_variation_overrides/head.dm @@ -12,9 +12,6 @@ /obj/item/clothing/head/utility/chefhat supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/hats/hos/beret - supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON - /obj/item/clothing/head/soft/paramedic supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON diff --git a/modular_skyrat/modules/command_vendor/code/vending.dm b/modular_skyrat/modules/command_vendor/code/vending.dm index 9ea4232d614..3c6bc091dc9 100644 --- a/modular_skyrat/modules/command_vendor/code/vending.dm +++ b/modular_skyrat/modules/command_vendor/code/vending.dm @@ -115,9 +115,9 @@ /obj/item/clothing/shoes/sneakers/brown = 1, ) access_lists["[ACCESS_HOS]"] = list( - /obj/item/clothing/head/hats/hos = 1, + /obj/item/clothing/head/hats/hos/cap = 1, /obj/item/clothing/head/hats/hos/beret/navyhos = 1, - /obj/item/clothing/head/hats/hos/peacekeeper/sol = 1, + /obj/item/clothing/head/hats/hos/cap/peacekeeper/sol = 1, /obj/item/clothing/head/hats/imperial/hos = 1, /obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1, /obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol = 1, diff --git a/modular_skyrat/modules/customization/modules/clothing/head/head.dm b/modular_skyrat/modules/customization/modules/clothing/head/head.dm index 708ea9eaadc..1ae32ae621f 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/head.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/head.dm @@ -81,7 +81,7 @@ icon_state = "policeofficercap" supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/hats/hos/peacekeeper/sol +/obj/item/clothing/head/hats/hos/cap/peacekeeper/sol name = "sol police chief cap" desc = "A blue hat adorned with gold, rumoured to be used to distract Agents with its swag." icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' diff --git a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm index 86790b27839..7478198ae60 100644 --- a/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm +++ b/modular_skyrat/modules/goofsec/code/sec_clothing_overrides.dm @@ -294,7 +294,7 @@ fire = 20 acid = 50 -/obj/item/clothing/head/hats/hos +/obj/item/clothing/head/hats/hos/cap icon = 'modular_skyrat/master_files/icons/obj/clothing/hats.dmi' worn_icon = 'modular_skyrat/master_files/icons/mob/clothing/head.dmi' icon_state = "hoscap_blue" @@ -319,7 +319,7 @@ ) //Need to quickly redefine this so the icon doesnt break -/obj/item/clothing/head/hats/hos/syndicate +/obj/item/clothing/head/hats/hos/cap/syndicate icon = 'icons/obj/clothing/head/hats.dmi' worn_icon = 'icons/mob/clothing/head/hats.dmi' icon_state = "hoscap" diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index 7e7f4937040..7822942de11 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -300,7 +300,7 @@ suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate back = /obj/item/storage/backpack/satchel belt = /obj/item/gun/ballistic/automatic/pistol/aps - head = /obj/item/clothing/head/hats/hos/syndicate + head = /obj/item/clothing/head/hats/hos/cap/syndicate id = /obj/item/card/id/advanced/gold/generic id_trim = /datum/id_trim/syndicom/skyrat/ds2/stationadmiral