From d692b601990d4119792925e7cc642ca91043a4de Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 7 Jan 2023 05:22:43 +0100 Subject: [PATCH] [MIRROR] Fixes HOS Beret (and all of its subtypes) having wrong path and thus not being armored [MDB IGNORE] (#18191) * Fixes HOS Beret (and all of its subtypes) having wrong path and thus not being armored * Modular and Mirror! * Additional hos beret Co-authored-by: SkeletalElite Co-authored-by: Funce Co-authored-by: Jolly-66 <70232195+Jolly-66@users.noreply.github.com> --- .../RandomRuins/SpaceRuins/forgottenship.dmm | 2 +- .../SpaceRuins/skyrat/interdynefob.dmm | 6 +- _maps/map_files/MetaStation/MetaStation.dmm | 308 +++++++++--------- _maps/templates/battlecruiser_starfury.dmm | 2 +- code/modules/cargo/packs/security.dm | 2 +- code/modules/clothing/head/jobs.dm | 6 +- .../jobs/job_types/head_of_security.dm | 2 +- code/modules/mafia/outfits.dm | 2 +- .../mob_spawn/ghost_roles/unused_roles.dm | 2 +- .../clothing_variation_overrides/head.dm | 2 +- .../modules/command_vendor/code/vending.dm | 2 +- .../modules/clothing/head/jobs.dm | 4 +- .../modules/faction/code/clothes.dm | 2 +- modular_skyrat/modules/faction/code/outfit.dm | 6 +- .../modules/mapping/code/mob_spawns.dm | 2 +- .../code/peacekeeper/peacekeeper_clothing.dm | 2 +- .../modules/teshari/code/teshari_clothes.dm | 2 +- .../modules/vox_sprites/code/head.dm | 2 +- tools/UpdatePaths/Scripts/72024_hos_beret.txt | 1 + 19 files changed, 179 insertions(+), 178 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/72024_hos_beret.txt diff --git a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm index c86a1a53cf1..76ee1eee80f 100644 --- a/_maps/RandomRuins/SpaceRuins/forgottenship.dmm +++ b/_maps/RandomRuins/SpaceRuins/forgottenship.dmm @@ -1112,7 +1112,7 @@ req_access = list("syndicate"); secure = 1 }, -/obj/item/clothing/head/hos/beret/syndicate, +/obj/item/clothing/head/hats/hos/beret/syndicate, /obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/under/syndicate, diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm index 01ec80eca8f..7ecebcf6a2d 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/interdynefob.dmm @@ -2729,7 +2729,7 @@ }, /obj/item/binoculars, /obj/item/radio/headset/interdyne/command, -/obj/item/clothing/head/hos/beret/syndicate, +/obj/item/clothing/head/hats/hos/beret/syndicate, /obj/item/clothing/glasses/sunglasses, /obj/item/encryptionkey/headset_syndicate/interdyne, /obj/item/encryptionkey/headset_syndicate/interdyne, @@ -5061,7 +5061,7 @@ req_access = list("syndicate") }, /obj/item/clothing/head/hats/hos/syndicate, -/obj/item/clothing/head/hos/beret/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, /obj/item/radio/headset/interdyne/command, @@ -8056,7 +8056,7 @@ name = "Master at arms' armored greatcoat" }, /obj/item/gun/energy/disabler, -/obj/item/clothing/head/hos/beret/syndicate, +/obj/item/clothing/head/hats/hos/beret/syndicate, /obj/structure/window/reinforced/survival_pod{ dir = 4 }, diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 4a01d558fdf..06cef921bbe 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -8882,20 +8882,6 @@ /obj/machinery/status_display/evac/directional/north, /turf/open/floor/engine, /area/station/engineering/supermatter/room) -"doa" = ( -/obj/structure/cable, -/obj/machinery/door/airlock{ - name = "Custodial Closet" - }, -/obj/structure/disposalpipe/segment{ - dir = 4 - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, -/obj/effect/mapping_helpers/airlock/access/all/service/janitor, -/obj/effect/landmark/navigate_destination/janitor, -/turf/open/floor/iron, -/area/station/maintenance/starboard/greater) "dox" = ( /obj/structure/rack, /obj/item/screwdriver{ @@ -9370,6 +9356,20 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/station/maintenance/port/fore) +"dwD" = ( +/obj/structure/cable, +/obj/machinery/door/airlock{ + name = "Custodial Closet" + }, +/obj/structure/disposalpipe/segment{ + dir = 4 + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2, +/obj/effect/mapping_helpers/airlock/access/all/service/janitor, +/obj/effect/landmark/navigate_destination/janitor, +/turf/open/floor/iron, +/area/station/maintenance/starboard/greater) "dwJ" = ( /obj/structure/lattice, /obj/effect/spawner/random/structure/grille, @@ -10208,6 +10208,25 @@ }, /turf/open/floor/iron, /area/station/security/office) +"dOo" = ( +/obj/structure/safe, +/obj/item/storage/secure/briefcase/riches, +/obj/item/storage/backpack/duffelbag/syndie/hitman, +/obj/item/card/id/advanced/silver/reaper, +/obj/item/lazarus_injector, +/obj/item/gun/energy/disabler, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/ammo_box/a357, +/obj/item/clothing/neck/stethoscope, +/obj/item/book{ + desc = "An undeniably handy book."; + icon_state = "bookknock"; + name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" + }, +/obj/effect/turf_decal/bot_white/left, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/ai_monitored/command/nuke_storage) "dOs" = ( /obj/structure/sign/warning/no_smoking, /turf/closed/wall/r_wall, @@ -13707,6 +13726,13 @@ /obj/effect/landmark/event_spawn, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"fbO" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Surgery C Maintenance" + }, +/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, +/turf/open/floor/plating, +/area/station/maintenance/aft/greater) "fbP" = ( /obj/effect/turf_decal/tile/neutral, /obj/structure/cable, @@ -16348,25 +16374,6 @@ /obj/effect/turf_decal/tile/yellow/half/contrasted, /turf/open/floor/iron, /area/station/engineering/break_room) -"gdG" = ( -/obj/structure/safe, -/obj/item/storage/secure/briefcase/riches, -/obj/item/storage/backpack/duffelbag/syndie/hitman, -/obj/item/card/id/advanced/silver/reaper, -/obj/item/lazarus_injector, -/obj/item/gun/energy/disabler, -/obj/item/gun/ballistic/revolver/russian, -/obj/item/ammo_box/a357, -/obj/item/clothing/neck/stethoscope, -/obj/item/book{ - desc = "An undeniably handy book."; - icon_state = "bookknock"; - name = "\improper A Simpleton's Guide to Safe-cracking with Stethoscopes" - }, -/obj/effect/turf_decal/bot_white/left, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/ai_monitored/command/nuke_storage) "gdL" = ( /obj/effect/turf_decal/trimline/blue/filled/line{ dir = 4 @@ -20057,18 +20064,6 @@ dir = 1 }, /area/station/engineering/atmos) -"hug" = ( -/obj/structure/table, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_x = -6; - pixel_y = 11 - }, -/obj/item/phone{ - pixel_x = 6; - pixel_y = 1 - }, -/turf/open/floor/iron, -/area/station/cargo/drone_bay) "huj" = ( /obj/effect/landmark/event_spawn, /turf/open/floor/iron/dark, @@ -20077,6 +20072,12 @@ /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, /turf/closed/wall/r_wall, /area/station/maintenance/starboard/greater) +"hup" = ( +/obj/machinery/door/airlock/maintenance{ + name = "Medbay Maintenance" + }, +/turf/open/floor/plating, +/area/station/maintenance/port/aft) "huq" = ( /obj/machinery/modular_computer/console/preset/id{ dir = 4 @@ -20384,6 +20385,15 @@ /obj/structure/disposalpipe/segment, /turf/open/floor/iron/dark, /area/station/medical/break_room) +"hyI" = ( +/obj/item/kirbyplants/random, +/obj/effect/turf_decal/siding/purple{ + dir = 5 + }, +/obj/machinery/airalarm/directional/east, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "hyN" = ( /obj/structure/sign/warning/secure_area, /turf/closed/wall/r_wall, @@ -21213,12 +21223,6 @@ }, /turf/open/floor/iron, /area/station/science/research) -"hRd" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Medbay Maintenance" - }, -/turf/open/floor/plating, -/area/station/maintenance/port/aft) "hRf" = ( /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -22814,18 +22818,6 @@ /obj/item/kirbyplants/random, /turf/open/floor/iron/white, /area/station/science/xenobiology) -"irB" = ( -/obj/structure/table, -/obj/effect/turf_decal/tile/purple, -/obj/effect/turf_decal/tile/purple{ - dir = 1 - }, -/obj/structure/extinguisher_cabinet/directional/south, -/obj/item/reagent_containers/cup/glass/mug/britcup{ - pixel_y = 2 - }, -/turf/open/floor/iron, -/area/station/science/research) "irL" = ( /obj/effect/turf_decal/trimline/blue/filled/line, /turf/open/floor/iron/white, @@ -23562,41 +23554,6 @@ /obj/machinery/door/airlock/public/glass/incinerator/atmos_interior, /turf/open/floor/engine, /area/station/maintenance/disposal/incinerator) -"iCs" = ( -/obj/structure/closet/crate/secure/weapon{ - desc = "A secure clothing crate."; - name = "formal uniform crate"; - req_access = list("armory") - }, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/under/rank/security/officer/formal, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/suit/jacket/officer/blue, -/obj/item/clothing/under/rank/security/warden/formal, -/obj/item/clothing/suit/jacket/warden/blue, -/obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/jacket/hos/blue, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navyofficer, -/obj/item/clothing/head/beret/sec/navywarden, -/obj/item/clothing/head/hos/beret/navyhos, -/obj/structure/extinguisher_cabinet/directional/east, -/obj/structure/cable, -/obj/effect/turf_decal/tile/blue/half/contrasted, -/turf/open/floor/iron/dark, -/area/station/security/lockers) "iCz" = ( /obj/effect/mapping_helpers/airlock/locked, /obj/machinery/door/airlock/vault{ @@ -24168,6 +24125,11 @@ }, /turf/open/floor/plating, /area/station/maintenance/aft/lesser) +"iLG" = ( +/obj/effect/spawner/random/vending/snackvend, +/obj/machinery/newscaster/directional/west, +/turf/open/floor/iron/dark, +/area/station/hallway/primary/central) "iLH" = ( /obj/machinery/flasher/directional/west{ id = "Cell 1" @@ -25951,6 +25913,18 @@ /obj/structure/extinguisher_cabinet/directional/north, /turf/open/floor/iron/white, /area/station/medical/surgery/theatre) +"jox" = ( +/obj/structure/table, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_x = -6; + pixel_y = 11 + }, +/obj/item/phone{ + pixel_x = 6; + pixel_y = 1 + }, +/turf/open/floor/iron, +/area/station/cargo/drone_bay) "jpr" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/command_all, @@ -27961,6 +27935,18 @@ }, /turf/open/floor/iron/dark, /area/station/command/heads_quarters/ce) +"jWu" = ( +/obj/structure/table, +/obj/effect/turf_decal/tile/purple, +/obj/effect/turf_decal/tile/purple{ + dir = 1 + }, +/obj/structure/extinguisher_cabinet/directional/south, +/obj/item/reagent_containers/cup/glass/mug/britcup{ + pixel_y = 2 + }, +/turf/open/floor/iron, +/area/station/science/research) "jWR" = ( /obj/item/radio/intercom/directional/east, /obj/effect/turf_decal/siding/wood{ @@ -46046,17 +46032,6 @@ }, /turf/open/floor/iron/dark, /area/station/command/bridge) -"qsP" = ( -/obj/machinery/computer/scan_consolenew{ - dir = 4 - }, -/obj/effect/turf_decal/siding/purple{ - dir = 8 - }, -/obj/machinery/light/directional/west, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "qsQ" = ( /obj/machinery/light/directional/north, /obj/machinery/computer/security/wooden_tv, @@ -48136,6 +48111,10 @@ }, /turf/open/floor/engine, /area/station/science/cytology) +"rec" = ( +/obj/docking_port/stationary/escape_pod, +/turf/open/space/basic, +/area/space) "ret" = ( /obj/effect/spawner/random/trash/garbage{ spawn_scatter_radius = 1 @@ -53870,12 +53849,6 @@ /obj/effect/turf_decal/tile/blue/half/contrasted, /turf/open/floor/iron/white, /area/station/medical/medbay/central) -"taw" = ( -/obj/docking_port/stationary/escape_pod{ - dir = 4 - }, -/turf/open/space/basic, -/area/space) "taz" = ( /obj/structure/cable, /obj/machinery/power/solar{ @@ -55530,15 +55503,6 @@ /obj/effect/landmark/start/scientist, /turf/open/floor/iron/dark, /area/station/science/lab) -"tDh" = ( -/obj/item/kirbyplants/random, -/obj/effect/turf_decal/siding/purple{ - dir = 5 - }, -/obj/machinery/airalarm/directional/east, -/obj/effect/turf_decal/tile/neutral/fourcorners, -/turf/open/floor/iron/dark, -/area/station/science/genetics) "tDk" = ( /obj/structure/rack, /obj/effect/spawner/random/techstorage/engineering_all, @@ -59549,6 +59513,41 @@ }, /turf/open/space/basic, /area/space) +"uXE" = ( +/obj/structure/closet/crate/secure/weapon{ + desc = "A secure clothing crate."; + name = "formal uniform crate"; + req_access = list("armory") + }, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/under/rank/security/officer/formal, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/suit/jacket/officer/blue, +/obj/item/clothing/under/rank/security/warden/formal, +/obj/item/clothing/suit/jacket/warden/blue, +/obj/item/clothing/under/rank/security/head_of_security/formal, +/obj/item/clothing/suit/jacket/hos/blue, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navyofficer, +/obj/item/clothing/head/beret/sec/navywarden, +/obj/item/clothing/head/hats/hos/beret/navyhos, +/obj/structure/extinguisher_cabinet/directional/east, +/obj/structure/cable, +/obj/effect/turf_decal/tile/blue/half/contrasted, +/turf/open/floor/iron/dark, +/area/station/security/lockers) "uXG" = ( /obj/machinery/door/airlock/maintenance{ name = "Psychology Maintenance" @@ -59658,13 +59657,6 @@ /obj/machinery/power/apc/auto_name/directional/west, /turf/open/floor/iron, /area/station/security/prison/work) -"uZb" = ( -/obj/machinery/door/airlock/maintenance{ - name = "Surgery C Maintenance" - }, -/obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, -/turf/open/floor/plating, -/area/station/maintenance/aft/greater) "uZj" = ( /obj/structure/sign/directions/security{ dir = 1; @@ -60035,6 +60027,17 @@ }, /turf/open/floor/iron/white, /area/station/medical/chemistry) +"vhq" = ( +/obj/machinery/computer/scan_consolenew{ + dir = 4 + }, +/obj/effect/turf_decal/siding/purple{ + dir = 8 + }, +/obj/machinery/light/directional/west, +/obj/effect/turf_decal/tile/neutral/fourcorners, +/turf/open/floor/iron/dark, +/area/station/science/genetics) "vht" = ( /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -62646,6 +62649,12 @@ /obj/effect/mapping_helpers/broken_floor, /turf/open/floor/plating, /area/station/maintenance/starboard/greater) +"waq" = ( +/obj/docking_port/stationary/escape_pod{ + dir = 4 + }, +/turf/open/space/basic, +/area/space) "was" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -63756,11 +63765,6 @@ }, /turf/open/floor/plating, /area/station/maintenance/port) -"wvH" = ( -/obj/effect/spawner/random/vending/snackvend, -/obj/machinery/newscaster/directional/west, -/turf/open/floor/iron/dark, -/area/station/hallway/primary/central) "wvP" = ( /obj/effect/turf_decal/tile/blue/fourcorners, /obj/machinery/iv_drip, @@ -65039,10 +65043,6 @@ /obj/structure/reagent_dispensers/fueltank/large, /turf/open/floor/iron, /area/station/engineering/atmos) -"wTE" = ( -/obj/docking_port/stationary/escape_pod, -/turf/open/space/basic, -/area/space) "wTF" = ( /obj/structure/cable, /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4, @@ -78459,7 +78459,7 @@ tkr aaa aaa aaa -wTE +rec cSk auJ jMZ @@ -87520,7 +87520,7 @@ tzE ucc tSw tSw -uZb +fbO tSw tSw tSw @@ -88285,7 +88285,7 @@ sWO oxW dqN vlH -hRd +hup miy tFr nMf @@ -89233,7 +89233,7 @@ fru wrG uzb phP -hug +jox jXu tfR jXu @@ -90527,7 +90527,7 @@ rlU vis mCi ixT -gdG +dOo rlU aaa aEH @@ -90829,7 +90829,7 @@ sVY sVY sVY sVY -wvH +iLG xxk ahr bMY @@ -94091,7 +94091,7 @@ isc aaa aaa aaa -wTE +rec tYS lgS jKq @@ -97031,7 +97031,7 @@ cId rQl oIg wBq -qsP +vhq vKW jNX jxW @@ -97188,7 +97188,7 @@ aaa rrt aaa ahj -iCs +uXE sCi kiW rfb @@ -98055,7 +98055,7 @@ bBo gwf gfZ gqm -tDh +hyI cDA jrb lkL @@ -106017,7 +106017,7 @@ gcV nNe nbS aHM -irB +jWu oWk ddu wmi @@ -106257,7 +106257,7 @@ unL uNd unL unL -doa +dwD unL tUn tUn @@ -106695,7 +106695,7 @@ aaa aaa szp aaa -taw +waq aaa szp szp @@ -114707,7 +114707,7 @@ dgm dgB fJy aaa -taw +waq aaa fJy oAQ diff --git a/_maps/templates/battlecruiser_starfury.dmm b/_maps/templates/battlecruiser_starfury.dmm index e8020ed61d5..02fb9aae6f7 100644 --- a/_maps/templates/battlecruiser_starfury.dmm +++ b/_maps/templates/battlecruiser_starfury.dmm @@ -2691,7 +2691,7 @@ }, /obj/item/card/id/advanced/black/syndicate_command/captain_id/syndie_spare, /obj/item/clothing/head/hats/hos/syndicate, -/obj/item/clothing/head/hos/beret/syndicate, +/obj/item/clothing/head/hats/hos/beret/syndicate, /obj/item/clothing/under/syndicate/skirt, /obj/item/clothing/under/syndicate, /obj/item/storage/belt/military/assault, diff --git a/code/modules/cargo/packs/security.dm b/code/modules/cargo/packs/security.dm index a9d9fde953e..5f5a2961b65 100644 --- a/code/modules/cargo/packs/security.dm +++ b/code/modules/cargo/packs/security.dm @@ -104,7 +104,7 @@ /obj/item/clothing/head/beret/sec/navywarden, /obj/item/clothing/under/rank/security/head_of_security/formal, /obj/item/clothing/suit/jacket/hos/blue, - /obj/item/clothing/head/hos/beret/navyhos, + /obj/item/clothing/head/hats/hos/beret/navyhos, ) crate_name = "security clothing crate" */ diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index 804dd2357a6..36f3af4ae7e 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -146,7 +146,7 @@ name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." -/obj/item/clothing/head/hos/beret +/obj/item/clothing/head/hats/hos/beret name = "head of security's beret" desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." icon_state = "beret_badge" @@ -155,12 +155,12 @@ greyscale_colors = "#39393f#FFCE5B" 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/hos/beret/navyhos +/obj/item/clothing/head/hats/hos/beret/navyhos name = "head of security's formal beret" desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction." greyscale_colors = "#3C485A#FFCE5B" -/obj/item/clothing/head/hos/beret/syndicate +/obj/item/clothing/head/hats/hos/beret/syndicate name = "syndicate beret" desc = "A black beret with thick armor padding inside. Stylish and robust." diff --git a/code/modules/jobs/job_types/head_of_security.dm b/code/modules/jobs/job_types/head_of_security.dm index db74473a496..2198ab7dda2 100644 --- a/code/modules/jobs/job_types/head_of_security.dm +++ b/code/modules/jobs/job_types/head_of_security.dm @@ -61,7 +61,7 @@ ears = /obj/item/radio/headset/heads/hos/alt glasses = /obj/item/clothing/glasses/hud/security/sunglasses gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/hos/beret + head = /obj/item/clothing/head/hats/hos/beret shoes = /obj/item/clothing/shoes/jackboots/sec l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 4d86faf2f4d..394e0b566de 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -75,7 +75,7 @@ shoes = /obj/item/clothing/shoes/jackboots suit = /obj/item/clothing/suit/armor/hos/trenchcoat gloves = /obj/item/clothing/gloves/color/black - head = /obj/item/clothing/head/hos/beret + head = /obj/item/clothing/head/hats/hos/beret glasses = /obj/item/clothing/glasses/hud/security/sunglasses /datum/outfit/mafia/warden diff --git a/code/modules/mob_spawn/ghost_roles/unused_roles.dm b/code/modules/mob_spawn/ghost_roles/unused_roles.dm index dffac3be04e..ec6106bf41e 100644 --- a/code/modules/mob_spawn/ghost_roles/unused_roles.dm +++ b/code/modules/mob_spawn/ghost_roles/unused_roles.dm @@ -309,7 +309,7 @@ name = "Syndicate Ship Captain" uniform = /obj/item/clothing/under/syndicate/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate - head = /obj/item/clothing/head/hos/beret/syndicate + head = /obj/item/clothing/head/hats/hos/beret/syndicate ears = /obj/item/radio/headset/syndicate/alt/leader r_pocket = /obj/item/knife/combat/survival id = /obj/item/card/id/advanced/black/syndicate_command/captain_id 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 ff1a34fe141..fea693345db 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,7 +12,7 @@ /obj/item/clothing/head/utility/chefhat supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/hos/beret +/obj/item/clothing/head/hats/hos/beret supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON /obj/item/clothing/head/soft/paramedic diff --git a/modular_skyrat/modules/command_vendor/code/vending.dm b/modular_skyrat/modules/command_vendor/code/vending.dm index b1a26c10bc8..232e4c88159 100644 --- a/modular_skyrat/modules/command_vendor/code/vending.dm +++ b/modular_skyrat/modules/command_vendor/code/vending.dm @@ -117,7 +117,7 @@ ) access_lists["[ACCESS_HOS]"] = list( /obj/item/clothing/head/hats/hos = 1, - /obj/item/clothing/head/hos/beret/navyhos = 1, + /obj/item/clothing/head/hats/hos/beret/navyhos = 1, /obj/item/clothing/head/hats/hos/peacekeeper/sol = 1, /obj/item/clothing/head/hats/imperial/hos = 1, /obj/item/clothing/under/rank/security/head_of_security/peacekeeper = 1, diff --git a/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm b/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm index 4d9b2defc8e..66145b3377c 100644 --- a/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm +++ b/modular_skyrat/modules/customization/modules/clothing/head/jobs.dm @@ -1,6 +1,6 @@ // This is for all the berets that /tg/ didn't want. You're welcome, they should look better. -/obj/item/clothing/head/hos/beret +/obj/item/clothing/head/hats/hos/beret name = "head of security beret" desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection." icon_state = "beret_badge" @@ -8,7 +8,7 @@ greyscale_config_worn = /datum/greyscale_config/beret_badge/worn greyscale_colors = "#3F3C40#FFCE5B" -/obj/item/clothing/head/hos/beret/syndicate +/obj/item/clothing/head/hats/hos/beret/syndicate name = "syndicate beret" desc = "A black beret with thick armor padding inside. Stylish and robust." greyscale_colors = "#3F3C40#DB2929" diff --git a/modular_skyrat/modules/faction/code/clothes.dm b/modular_skyrat/modules/faction/code/clothes.dm index ac86b7c1792..9deb9db169c 100644 --- a/modular_skyrat/modules/faction/code/clothes.dm +++ b/modular_skyrat/modules/faction/code/clothes.dm @@ -1,3 +1,3 @@ -/obj/item/clothing/head/hos/beret/faction +/obj/item/clothing/head/hats/hos/beret/faction name = "faction beret" desc = "A black beret with thick armor padding inside. Stylish and robust. There's an unknown insignia emblazoned on it." diff --git a/modular_skyrat/modules/faction/code/outfit.dm b/modular_skyrat/modules/faction/code/outfit.dm index a2dc1f86488..4728353e4ec 100644 --- a/modular_skyrat/modules/faction/code/outfit.dm +++ b/modular_skyrat/modules/faction/code/outfit.dm @@ -1,6 +1,6 @@ /datum/outfit/faction_captain name = "Faction - Captain" - head = /obj/item/clothing/head/hos/beret/faction + head = /obj/item/clothing/head/hats/hos/beret/faction uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/armor/hos/trenchcoat shoes = /obj/item/clothing/shoes/combat @@ -32,7 +32,7 @@ /datum/outfit/faction_medic name = "Faction - Medic" - head = /obj/item/clothing/head/hos/beret/faction + head = /obj/item/clothing/head/hats/hos/beret/faction uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/armor/hos/trenchcoat shoes = /obj/item/clothing/shoes/combat @@ -48,7 +48,7 @@ /datum/outfit/faction_tech name = "Faction - Tech" - head = /obj/item/clothing/head/hos/beret/faction + head = /obj/item/clothing/head/hats/hos/beret/faction uniform = /obj/item/clothing/under/syndicate suit = /obj/item/clothing/suit/armor/hos/trenchcoat suit_store = /obj/item/gun/energy/e_gun diff --git a/modular_skyrat/modules/mapping/code/mob_spawns.dm b/modular_skyrat/modules/mapping/code/mob_spawns.dm index c331e1416be..ee18b5ee305 100644 --- a/modular_skyrat/modules/mapping/code/mob_spawns.dm +++ b/modular_skyrat/modules/mapping/code/mob_spawns.dm @@ -264,7 +264,7 @@ suit = /obj/item/clothing/suit/armor/vest/warden/syndicate glasses = /obj/item/clothing/glasses/hud/security/sunglasses/redsec back = /obj/item/storage/backpack/satchel/sec/redsec - head = /obj/item/clothing/head/hos/beret/syndicate + head = /obj/item/clothing/head/hats/hos/beret/syndicate r_pocket = /obj/item/flashlight/seclite implants = list( /obj/item/implant/weapons_auth, diff --git a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm index 8e28b5a6e2b..315c6f68bb6 100644 --- a/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm +++ b/modular_skyrat/modules/sec_haul/code/peacekeeper/peacekeeper_clothing.dm @@ -37,7 +37,7 @@ icon_state = "peacekeeper_sergeant_cap" supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON -/obj/item/clothing/head/hos/beret/peacekeeper +/obj/item/clothing/head/hats/hos/beret/peacekeeper name = "head of security's peacekeeper beret" desc = "A special beret with the Head of Security's insignia emblazoned on it. A symbol of excellence, a badge of courage, a mark of distinction." supports_variations_flags = CLOTHING_SNOUTED_VARIATION_NO_NEW_ICON diff --git a/modular_skyrat/modules/teshari/code/teshari_clothes.dm b/modular_skyrat/modules/teshari/code/teshari_clothes.dm index 7440c42368a..c3369485b38 100644 --- a/modular_skyrat/modules/teshari/code/teshari_clothes.dm +++ b/modular_skyrat/modules/teshari/code/teshari_clothes.dm @@ -83,7 +83,7 @@ /obj/item/clothing/head/beret greyscale_config_worn_teshari = /datum/greyscale_config/beret/worn/teshari -/obj/item/clothing/head/hos/beret +/obj/item/clothing/head/hats/hos/beret greyscale_config_worn_teshari = /datum/greyscale_config/beret_badge/worn/teshari /obj/item/clothing/head/beret/sec diff --git a/modular_skyrat/modules/vox_sprites/code/head.dm b/modular_skyrat/modules/vox_sprites/code/head.dm index be7ef291a8b..34aa0dbfe70 100644 --- a/modular_skyrat/modules/vox_sprites/code/head.dm +++ b/modular_skyrat/modules/vox_sprites/code/head.dm @@ -16,7 +16,7 @@ /obj/item/clothing/head/beret greyscale_config_worn_vox = /datum/greyscale_config/beret/worn/vox -/obj/item/clothing/head/hos/beret +/obj/item/clothing/head/hats/hos/beret greyscale_config_worn_vox = /datum/greyscale_config/beret_badge/worn/vox /obj/item/clothing/head/beret/sec diff --git a/tools/UpdatePaths/Scripts/72024_hos_beret.txt b/tools/UpdatePaths/Scripts/72024_hos_beret.txt new file mode 100644 index 00000000000..68c9ad3b05f --- /dev/null +++ b/tools/UpdatePaths/Scripts/72024_hos_beret.txt @@ -0,0 +1 @@ +/obj/item/clothing/head/hos/beret : /obj/item/clothing/head/hats/hos/beret{@OLD} \ No newline at end of file