diff --git a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm index 42ca9e3a167..199bd564786 100644 --- a/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm +++ b/_maps/RandomRuins/IceRuins/icemoon_surface_asteroid.dmm @@ -8,7 +8,7 @@ /area/icemoon/surface) "h" = ( /obj/effect/mob_spawn/corpse/human/skeleton, -/obj/item/clothing/suit/bronze, +/obj/item/clothing/suit/costume/bronze, /obj/item/clothing/shoes/bronze, /obj/item/clothing/head/bronze, /turf/open/floor/bronze{ diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index 99211d81f2f..d48b3d8622c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -584,7 +584,7 @@ }, /obj/item/clothing/neck/beads, /obj/item/clothing/glasses/sunglasses/reagent, -/obj/item/clothing/suit/hawaiian, +/obj/item/clothing/suit/costume/hawaiian, /turf/open/floor/wood, /area/ruin/powered/beach) "sV" = ( @@ -1265,7 +1265,7 @@ /obj/structure/closet/cabinet, /obj/item/storage/backpack/duffelbag, /obj/item/clothing/under/shorts/blue, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /obj/item/clothing/shoes/sandal{ desc = "A very fashionable pair of flip-flops."; name = "flip-flops" diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm index 94ebab0e4d2..1dbd60e75f4 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_elephant_graveyard.dmm @@ -117,7 +117,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/dirt/dust, /obj/item/clothing/head/fedora/curator, -/obj/item/clothing/suit/curator, +/obj/item/clothing/suit/jacket/curator, /turf/open/floor/mineral/titanium/white, /area/ruin/powered/graveyard_shuttle) "cm" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 2bf659a4945..c9c68737bec 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -209,7 +209,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/machinery/light/directional/west, /turf/open/floor/vault, /area/ruin/powered/seedvault) @@ -352,7 +352,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/vault, /area/ruin/powered/seedvault) diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index ef2f00da598..74f318cdab9 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -196,7 +196,7 @@ "aQ" = ( /obj/structure/closet/crate/radiation, /obj/item/clothing/head/radiation, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/geiger_counter, /turf/open/floor/mineral/titanium/yellow, /area/ruin/space/has_grav/derelictoutpost/dockedship) diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index ced7167268e..6a975b74189 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -8557,8 +8557,8 @@ /area/ruin/space/ancientstation/beta/hall) "Tx" = ( /obj/structure/closet/radiation, -/obj/item/clothing/suit/radiation, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/head/radiation, /obj/item/geiger_counter, diff --git a/_maps/RandomZLevels/SnowCabin.dmm b/_maps/RandomZLevels/SnowCabin.dmm index d6c2729f0e1..7c04d81e075 100644 --- a/_maps/RandomZLevels/SnowCabin.dmm +++ b/_maps/RandomZLevels/SnowCabin.dmm @@ -3858,7 +3858,7 @@ invoke_damage = 60; name = "ice rune" }, -/obj/item/clothing/suit/snowman{ +/obj/item/clothing/suit/costume/snowman{ desc = "The dead body of a snowman. There's holes to stick your own body in it."; name = "snowman corpse" }, diff --git a/_maps/RandomZLevels/TheBeach.dmm b/_maps/RandomZLevels/TheBeach.dmm index 21db0abda1e..0be6b8bd10b 100644 --- a/_maps/RandomZLevels/TheBeach.dmm +++ b/_maps/RandomZLevels/TheBeach.dmm @@ -125,7 +125,7 @@ }, /obj/item/clothing/head/pirate, /obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/claymore/cutlass{ desc = "A piratey, foam sword used by kids to train themselves in the business of \"negotiating\" the transfer of treasure."; force = 0; diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d54742cdf5a..39a753ec01a 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -8596,7 +8596,7 @@ /area/station/maintenance/port/fore) "ckB" = ( /obj/structure/closet/secure_closet/hop, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /obj/item/bedsheet/ian, /turf/open/floor/iron/grimy, /area/station/command/heads_quarters/hop) @@ -20242,7 +20242,7 @@ /area/station/science/research) "fyD" = ( /obj/structure/table/wood, -/obj/item/clothing/suit/cardborg, +/obj/item/clothing/suit/costume/cardborg, /obj/item/clothing/head/cardborg, /obj/machinery/light/small/directional/east, /obj/effect/decal/cleanable/dirt, @@ -30276,7 +30276,7 @@ /area/station/engineering/atmos/project) "ilz" = ( /obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/decal/cleanable/dirt, @@ -39635,7 +39635,7 @@ /obj/item/clothing/head/fedora/det_hat{ icon_state = "curator" }, -/obj/item/clothing/suit/det_suit{ +/obj/item/clothing/suit/jacket/det_suit{ icon_state = "curator" }, /obj/item/clothing/under/rank/security/detective, @@ -69245,7 +69245,7 @@ /area/station/maintenance/aft) "sJM" = ( /obj/structure/table/wood, -/obj/item/clothing/suit/justice, +/obj/item/clothing/suit/costume/justice, /obj/item/clothing/head/helmet/justice/escape{ name = "justice helmet" }, @@ -83611,7 +83611,7 @@ /area/station/maintenance/port/lesser) "wsH" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/blindfold, /obj/effect/turf_decal/tile/red/half/contrasted{ @@ -86090,7 +86090,7 @@ /area/station/cargo/qm) "xdJ" = ( /obj/structure/table, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/ears/earmuffs, @@ -89563,7 +89563,7 @@ /obj/structure/bed{ dir = 4 }, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/blindfold, /obj/effect/turf_decal/tile/red/half/contrasted{ diff --git a/_maps/map_files/IceBoxStation/IceBoxStation.dmm b/_maps/map_files/IceBoxStation/IceBoxStation.dmm index b2b2b7c5a4b..c411e5598da 100644 --- a/_maps/map_files/IceBoxStation/IceBoxStation.dmm +++ b/_maps/map_files/IceBoxStation/IceBoxStation.dmm @@ -1247,7 +1247,7 @@ /area/station/science/xenobiology) "aut" = ( /obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, /obj/item/extinguisher, @@ -7262,7 +7262,7 @@ /turf/open/floor/iron, /area/station/engineering/atmos) "cfS" = ( -/obj/item/clothing/suit/snowman{ +/obj/item/clothing/suit/costume/snowman{ name = "Man of Snow" }, /obj/item/clothing/head/snowman{ @@ -9862,7 +9862,7 @@ /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/suit/hooded/bee_costume, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/head/hooded/bee_hood, @@ -10845,8 +10845,8 @@ network = list("isolation"); pixel_y = -32 }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket{ +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket{ pixel_x = 6 }, /obj/machinery/camera/directional/east{ @@ -22091,7 +22091,7 @@ /area/station/maintenance/port/aft) "gFR" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/geiger_counter, /obj/effect/turf_decal/stripes/line{ @@ -22875,7 +22875,7 @@ /area/station/medical/break_room) "gSr" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -27417,7 +27417,7 @@ /area/icemoon/surface/outdoors/nospawn) "ipP" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/north, /turf/open/floor/iron/white/textured, @@ -45890,7 +45890,7 @@ anchored = 1 }, /obj/item/clothing/under/pants/track, -/obj/item/clothing/suit/ianshirt, +/obj/item/clothing/suit/costume/ianshirt, /turf/open/floor/iron, /area/station/maintenance/starboard/fore) "nXH" = ( diff --git a/_maps/map_files/KiloStation/KiloStation.dmm b/_maps/map_files/KiloStation/KiloStation.dmm index 5cec1dad621..0352f26708f 100644 --- a/_maps/map_files/KiloStation/KiloStation.dmm +++ b/_maps/map_files/KiloStation/KiloStation.dmm @@ -37808,7 +37808,7 @@ /obj/effect/turf_decal/bot, /obj/structure/rack, /obj/effect/decal/cleanable/cobweb, -/obj/item/clothing/suit/fire/firefighter{ +/obj/item/clothing/suit/utility/fire/firefighter{ pixel_y = 5 }, /obj/item/clothing/mask/breath, @@ -75194,7 +75194,7 @@ /area/station/maintenance/fore) "vtv" = ( /obj/structure/table/bronze, -/obj/item/clothing/suit/bronze, +/obj/item/clothing/suit/costume/bronze, /obj/item/clothing/shoes/bronze{ pixel_x = -12 }, @@ -76579,7 +76579,7 @@ /area/station/maintenance/disposal/incinerator) "vKp" = ( /obj/item/clothing/head/cardborg, -/obj/item/clothing/suit/cardborg, +/obj/item/clothing/suit/costume/cardborg, /obj/structure/closet/cardboard/metal, /obj/machinery/airalarm/directional/east, /turf/open/floor/plating, @@ -82648,7 +82648,7 @@ /area/station/maintenance/starboard) "xun" = ( /obj/structure/table, -/obj/item/clothing/suit/justice, +/obj/item/clothing/suit/costume/justice, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/station/maintenance/aft) diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index def523d529d..1f42f0850bb 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -20138,7 +20138,7 @@ /turf/closed/wall/r_wall, /area/station/command/teleporter) "huF" = ( -/obj/item/clothing/suit/snowman, +/obj/item/clothing/suit/costume/snowman, /obj/item/clothing/head/snowman, /turf/open/floor/fake_snow, /area/station/maintenance/port/aft) @@ -31436,7 +31436,7 @@ /obj/structure/bed{ dir = 4 }, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/effect/turf_decal/trimline/blue/filled/line{ @@ -33549,7 +33549,7 @@ /area/station/command/gateway) "lVn" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/machinery/light/small/directional/east, @@ -38450,7 +38450,7 @@ /area/station/command/bridge) "nEF" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/item/electropack, @@ -44373,7 +44373,7 @@ "pNp" = ( /obj/machinery/light/small/broken/directional/west, /obj/structure/table, -/obj/item/clothing/suit/cyborg_suit, +/obj/item/clothing/suit/costume/cyborg_suit, /obj/item/clothing/mask/gas/cyborg, /turf/open/floor/plating, /area/station/maintenance/starboard/aft) @@ -45080,7 +45080,7 @@ /area/station/maintenance/department/medical/central) "qbr" = ( /obj/structure/bed, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/mask/muzzle, /obj/structure/cable, @@ -45367,16 +45367,16 @@ /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/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, -/obj/item/clothing/suit/security/officer, +/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/security/warden, +/obj/item/clothing/suit/jacket/warden/blue, /obj/item/clothing/under/rank/security/head_of_security/formal, -/obj/item/clothing/suit/security/hos, +/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, @@ -58161,7 +58161,7 @@ /obj/structure/chair/comfy{ dir = 1 }, -/obj/item/clothing/suit/nerdshirt, +/obj/item/clothing/suit/costume/nerdshirt, /obj/item/clothing/head/fedora, /turf/open/floor/plating, /area/station/maintenance/port/aft) @@ -66923,7 +66923,7 @@ /turf/open/floor/iron, /area/station/ai_monitored/command/storage/eva) "xCf" = ( -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/electropack, /obj/structure/table, /obj/structure/cable, @@ -68863,7 +68863,7 @@ }, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/eyepatch, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /turf/open/floor/iron/dark, /area/station/medical/office) "yli" = ( diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 7f8a3ccd955..570048d5155 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -7012,16 +7012,16 @@ /obj/effect/turf_decal/tile/dark/fourcorners, /obj/effect/turf_decal/siding/wood, /obj/structure/table/reinforced/plastitaniumglass, -/obj/item/clothing/suit/hawaiian{ +/obj/item/clothing/suit/costume/hawaiian{ pixel_x = -3; pixel_y = -3 }, -/obj/item/clothing/suit/hawaiian, -/obj/item/clothing/suit/hawaiian{ +/obj/item/clothing/suit/costume/hawaiian, +/obj/item/clothing/suit/costume/hawaiian{ pixel_x = 3; pixel_y = 3 }, -/obj/item/clothing/suit/hawaiian, +/obj/item/clothing/suit/costume/hawaiian, /turf/open/floor/iron/sepia, /area/centcom/central_command_areas/holding) "ur" = ( @@ -13688,7 +13688,7 @@ /area/centcom/central_command_areas/admin) "Oe" = ( /obj/structure/closet/crate/bin, -/obj/item/clothing/suit/xenos, +/obj/item/clothing/suit/costume/xenos, /obj/item/clothing/head/xenos, /obj/item/xenos_claw, /obj/item/grown/log/bamboo, @@ -16068,7 +16068,7 @@ /obj/item/clothing/neck/stripedredscarf, /obj/item/clothing/neck/tie/red, /obj/item/clothing/head/helmet/space/beret, -/obj/item/clothing/suit/curator, +/obj/item/clothing/suit/jacket/curator, /obj/item/clothing/suit/space/officer, /obj/item/clothing/gloves/fingerless, /obj/item/clothing/gloves/color/black, diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index b86a7d401e1..faa81715869 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -5016,7 +5016,7 @@ /obj/structure/closet{ name = "Beekeeper Uniform" }, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /obj/item/melee/flyswatter, /obj/effect/turf_decal/trimline/green/filled/line, @@ -13222,8 +13222,8 @@ name = "Secure Medical Storage"; req_access = list("medical") }, -/obj/item/clothing/suit/straight_jacket, -/obj/item/clothing/suit/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, +/obj/item/clothing/suit/jacket/straight_jacket, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/glasses/blindfold, /obj/item/clothing/ears/earmuffs, @@ -17470,7 +17470,7 @@ /area/station/cargo/lobby) "ggv" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, /obj/item/geiger_counter, @@ -47812,7 +47812,7 @@ /area/station/engineering/atmos) "qzD" = ( /obj/structure/table/reinforced, -/obj/item/clothing/suit/radiation, +/obj/item/clothing/suit/utility/radiation, /obj/item/clothing/head/radiation, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index 65587558c95..ffd1442ffad 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -569,7 +569,7 @@ /area/shuttle/escape) "bl" = ( /obj/structure/rack, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, diff --git a/_maps/shuttles/emergency_medisim.dmm b/_maps/shuttles/emergency_medisim.dmm index c84f4083509..edf325c59a5 100644 --- a/_maps/shuttles/emergency_medisim.dmm +++ b/_maps/shuttles/emergency_medisim.dmm @@ -1088,7 +1088,7 @@ "RV" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/machinery/light/directional/west, diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index bcc237bd695..20648c904be 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -566,7 +566,7 @@ "bM" = ( /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/turf_decal/stripes/line{ diff --git a/_maps/shuttles/emergency_monastery.dmm b/_maps/shuttles/emergency_monastery.dmm index 9f008074fc6..848c78b9919 100644 --- a/_maps/shuttles/emergency_monastery.dmm +++ b/_maps/shuttles/emergency_monastery.dmm @@ -1727,9 +1727,9 @@ /obj/structure/closet{ name = "beekeeping wardrobe" }, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/suit/beekeeper_suit, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/head/beekeeper_head, diff --git a/_maps/shuttles/emergency_nature.dmm b/_maps/shuttles/emergency_nature.dmm index cbf6708e146..3b4d869aa69 100644 --- a/_maps/shuttles/emergency_nature.dmm +++ b/_maps/shuttles/emergency_nature.dmm @@ -1107,7 +1107,7 @@ dir = 6 }, /obj/structure/table/glass, -/obj/item/clothing/suit/monkeysuit{ +/obj/item/clothing/suit/costume/monkeysuit{ pixel_x = -2; pixel_y = 4 }, diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 1257373351f..0750aca3589 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -278,7 +278,7 @@ }, /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/decal/cleanable/dirt, @@ -1473,7 +1473,7 @@ }, /obj/structure/rack, /obj/item/tank/internals/oxygen/red, -/obj/item/clothing/suit/fire/firefighter, +/obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /turf/open/floor/iron/dark, diff --git a/_maps/shuttles/ruin_pirate_cutter.dmm b/_maps/shuttles/ruin_pirate_cutter.dmm index 8a4499c60f1..cd3e1f467cd 100644 --- a/_maps/shuttles/ruin_pirate_cutter.dmm +++ b/_maps/shuttles/ruin_pirate_cutter.dmm @@ -7,7 +7,7 @@ name = "pirate outfits" }, /obj/item/clothing/head/collectable/pirate, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/clothing/under/costume/pirate, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/bandana, @@ -240,7 +240,7 @@ name = "pirate outfits" }, /obj/item/clothing/head/collectable/pirate, -/obj/item/clothing/suit/pirate, +/obj/item/clothing/suit/costume/pirate, /obj/item/clothing/under/costume/pirate, /obj/item/clothing/shoes/jackboots, /obj/item/clothing/head/bandana, diff --git a/_maps/templates/holodeck_anthophillia.dmm b/_maps/templates/holodeck_anthophillia.dmm index c50ff32ebce..1ab367c976e 100644 --- a/_maps/templates/holodeck_anthophillia.dmm +++ b/_maps/templates/holodeck_anthophillia.dmm @@ -6,7 +6,7 @@ "v" = ( /obj/effect/holodeck_effect/mobspawner/bee, /obj/effect/decal/remains/human, -/obj/item/clothing/suit/beekeeper_suit, +/obj/item/clothing/suit/utility/beekeeper_suit, /turf/open/floor/holofloor/asteroid, /area/template_noop) "U" = ( diff --git a/_maps/templates/holodeck_chapelcourt.dmm b/_maps/templates/holodeck_chapelcourt.dmm index fcd98cb0b8a..925fe3da976 100644 --- a/_maps/templates/holodeck_chapelcourt.dmm +++ b/_maps/templates/holodeck_chapelcourt.dmm @@ -220,7 +220,7 @@ /turf/open/floor/holofloor/chapel/bottom_right, /area/template_noop) "F" = ( -/obj/item/clothing/suit/judgerobe, +/obj/item/clothing/suit/costume/judgerobe, /obj/item/clothing/head/powdered_wig, /obj/effect/turf_decal/tile/neutral, /obj/effect/turf_decal/tile/neutral{ diff --git a/code/__DEFINES/species_clothing_paths.dm b/code/__DEFINES/species_clothing_paths.dm index d1fb4f028aa..cd745ef4474 100644 --- a/code/__DEFINES/species_clothing_paths.dm +++ b/code/__DEFINES/species_clothing_paths.dm @@ -4,7 +4,7 @@ ///The dmi for humanoid shoes #define DEFAULT_SHOES_FILE 'icons/mob/clothing/feet.dmi' ///The dmi for humanoid oversuits -#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suit.dmi' +#define DEFAULT_SUIT_FILE 'icons/mob/clothing/suits/default.dmi' //DIGITIGRADE PATHS ///The dmi containing digitigrade uniforms diff --git a/code/_globalvars/phobias.dm b/code/_globalvars/phobias.dm index 73cd02df93c..6fa5d0f5143 100644 --- a/code/_globalvars/phobias.dm +++ b/code/_globalvars/phobias.dm @@ -396,7 +396,7 @@ GLOBAL_LIST_INIT(phobia_objs, list( /obj/item/clothing/mask/gas/owl_mask, /obj/item/clothing/mask/gas/plaguedoctor, /obj/item/clothing/shoes/griffin, - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/suit/space/freedom, /obj/item/clothing/suit/toggle/owlwings, /obj/item/clothing/under/costume/griffin, diff --git a/code/datums/components/crafting/tailoring.dm b/code/datums/components/crafting/tailoring.dm index 9e0022f18fb..77d7c43f380 100644 --- a/code/datums/components/crafting/tailoring.dm +++ b/code/datums/components/crafting/tailoring.dm @@ -124,7 +124,7 @@ /datum/crafting_recipe/ghostsheet name = "Ghost Sheet" - result = /obj/item/clothing/suit/ghost_sheet + result = /obj/item/clothing/suit/costume/ghost_sheet time = 0.5 SECONDS tool_behaviors = list(TOOL_WIRECUTTER) reqs = list(/obj/item/bedsheet = 1) diff --git a/code/datums/greyscale/config_types/greyscale_configs.dm b/code/datums/greyscale/config_types/greyscale_configs.dm index e77b42287da..d1e31ada1bb 100644 --- a/code/datums/greyscale/config_types/greyscale_configs.dm +++ b/code/datums/greyscale/config_types/greyscale_configs.dm @@ -327,7 +327,7 @@ /datum/greyscale_config/suspenders/worn name = "Worn Suspenders" - icon_file = 'icons/mob/clothing/suit.dmi' + icon_file = 'icons/mob/clothing/suits/utility.dmi' json_config = 'code/datums/greyscale/json_configs/suspenders_worn.json' /datum/greyscale_config/giftdeliverybox @@ -557,7 +557,7 @@ /datum/greyscale_config/heck_suit/worn name = "H.E.C.K. Suit Worn" - icon_file = 'icons/mob/clothing/suit.dmi' + icon_file = 'icons/mob/clothing/suits/armor.dmi' json_config = 'code/datums/greyscale/json_configs/heck_suit_worn.json' /datum/greyscale_config/heck_helmet diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 70d2df27f34..16174710afd 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -121,7 +121,7 @@ /obj/machinery/suit_storage_unit/radsuit name = "radiation suit storage unit" - suit_type = /obj/item/clothing/suit/radiation + suit_type = /obj/item/clothing/suit/utility/radiation helmet_type = /obj/item/clothing/head/radiation storage_type = /obj/item/geiger_counter diff --git a/code/game/objects/effects/spawners/costume.dm b/code/game/objects/effects/spawners/costume.dm index 4462aa5b2f5..1e8fb03f601 100644 --- a/code/game/objects/effects/spawners/costume.dm +++ b/code/game/objects/effects/spawners/costume.dm @@ -16,7 +16,7 @@ /obj/effect/spawner/costume/chicken name = "chicken costume spawner" items = list( - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/head/chicken, /obj/item/food/egg, ) @@ -137,7 +137,7 @@ name = "pirate costume spawner" items = list( /obj/item/clothing/under/costume/pirate, - /obj/item/clothing/suit/pirate, + /obj/item/clothing/suit/costume/pirate, /obj/effect/spawner/random/clothing/pirate_or_bandana, /obj/item/clothing/glasses/eyepatch, ) @@ -152,7 +152,7 @@ /obj/effect/spawner/costume/imperium_monk name = "imperium monk costume spawner" items = list( - /obj/item/clothing/suit/imperium_monk, + /obj/item/clothing/suit/costume/imperium_monk, /obj/effect/spawner/random/clothing/twentyfive_percent_cyborg_mask, ) diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index efb527225bd..86dec2e5436 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -84,10 +84,10 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/clothing/neck/tie/horrible, /obj/item/clothing/suit/jacket/leather, /obj/item/clothing/suit/jacket/leather/overcoat, - /obj/item/clothing/suit/poncho, - /obj/item/clothing/suit/poncho/green, - /obj/item/clothing/suit/poncho/red, - /obj/item/clothing/suit/snowman, + /obj/item/clothing/suit/costume/poncho, + /obj/item/clothing/suit/costume/poncho/green, + /obj/item/clothing/suit/costume/poncho/red, + /obj/item/clothing/suit/costume/snowman, /obj/item/clothing/head/snowman, /obj/item/stack/sheet/mineral/coal) diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm index 59c2f0341c3..e8088d46a39 100644 --- a/code/game/objects/items/holy_weapons.dm +++ b/code/game/objects/items/holy_weapons.dm @@ -1,130 +1,3 @@ -// CHAPLAIN CUSTOM ARMORS // - -/obj/item/clothing/head/helmet/chaplain/clock - name = "forgotten helmet" - desc = "It has the unyielding gaze of a god eternally forgotten." - icon_state = "clockwork_helmet" - inhand_icon_state = "clockwork_helmet_inhand" - armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 8 SECONDS - dog_fashion = null - -/obj/item/clothing/suit/armor/riot/chaplain/clock - name = "forgotten armour" - desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." - icon_state = "clockwork_cuirass" - inhand_icon_state = "clockwork_cuirass_inhand" - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - slowdown = 0 - clothing_flags = NONE - -/obj/item/clothing/head/helmet/chaplain - name = "crusader helmet" - desc = "Deus Vult." - icon_state = "knight_templar" - inhand_icon_state = "knight_templar" - armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) - flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT - flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH - strip_delay = 80 - dog_fashion = null - -/obj/item/clothing/suit/armor/riot/chaplain - name = "crusader armour" - desc = "God wills it!" - icon_state = "knight_templar" - inhand_icon_state = "knight_templar" - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - slowdown = 0 - clothing_flags = NONE - -/obj/item/clothing/suit/armor/riot/chaplain/studentuni - name = "student robe" - desc = "The uniform of a bygone institute of learning." - icon_state = "studentuni" - inhand_icon_state = "studentuni" - body_parts_covered = ARMS|CHEST - -/obj/item/clothing/head/helmet/chaplain/cage - name = "cage" - desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is." - flags_inv = NONE - icon_state = "cage" - inhand_icon_state = "cage" - worn_y_offset = 7 - -/obj/item/clothing/head/helmet/chaplain/ancient - name = "ancient helmet" - desc = "None may pass!" - icon_state = "knight_ancient" - inhand_icon_state = "knight_ancient" - -/obj/item/clothing/suit/armor/riot/chaplain/ancient - name = "ancient armour" - desc = "Defend the treasure..." - icon_state = "knight_ancient" - inhand_icon_state = "knight_ancient" - -/obj/item/clothing/suit/armor/riot/chaplain/witchhunter - name = "witchunter garb" - desc = "This worn outfit saw much use back in the day." - icon_state = "witchhunter" - inhand_icon_state = "witchhunter" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - -/obj/item/clothing/head/helmet/chaplain/witchunter_hat - name = "witchunter hat" - desc = "This hat saw much use back in the day." - icon_state = "witchhunterhat" - inhand_icon_state = "witchhunterhat" - flags_cover = HEADCOVERSEYES - flags_inv = HIDEEYES - -/obj/item/clothing/head/helmet/chaplain/adept - name = "adept hood" - desc = "Its only heretical when others do it." - icon_state = "crusader" - inhand_icon_state = "crusader" - flags_cover = HEADCOVERSEYES - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS - -/obj/item/clothing/suit/armor/riot/chaplain/adept - name = "adept robes" - desc = "The ideal outfit for burning the unfaithful." - icon_state = "crusader" - inhand_icon_state = "crusader" - -/obj/item/clothing/suit/hooded/chaplain_hoodie - name = "follower hoodie" - desc = "Hoodie made for acolytes of the chaplain." - icon_state = "chaplain_hoodie" - inhand_icon_state = "chaplain_hoodie" - body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) - hoodtype = /obj/item/clothing/head/hooded/chaplain_hood - -/obj/item/clothing/head/hooded/chaplain_hood - name = "follower hood" - desc = "Hood made for acolytes of the chaplain." - icon_state = "chaplain_hood" - body_parts_covered = HEAD - flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS - -/obj/item/clothing/suit/hooded/chaplain_hoodie/leader - name = "leader hoodie" - desc = "Now you're ready for some 50 dollar bling water." - icon_state = "chaplain_hoodie_leader" - inhand_icon_state = "chaplain_hoodie_leader" - hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/leader - -/obj/item/clothing/head/hooded/chaplain_hood/leader - name = "leader hood" - desc = "I mean, you don't /have/ to seek bling water. I just think you should." - icon_state = "chaplain_hood_leader" - - // CHAPLAIN NULLROD AND CUSTOM WEAPONS // /obj/item/nullrod diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm index 2541d737bee..836a684f74e 100644 --- a/code/game/objects/items/religion.dm +++ b/code/game/objects/items/religion.dm @@ -267,20 +267,6 @@ icon_state = "bannerpack-blue" //this is all part of one item set -/obj/item/clothing/suit/armor/plate/crusader - name = "Crusader's Armour" - desc = "Armour that's comprised of metal and cloth." - icon_state = "crusader" - w_class = WEIGHT_CLASS_BULKY - slowdown = 2.0 //gotta pretend we're balanced. - body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS - armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 60, BIO = 0, FIRE = 60, ACID = 60) - -/obj/item/clothing/suit/armor/plate/crusader/red - icon_state = "crusader-red" - -/obj/item/clothing/suit/armor/plate/crusader/blue - icon_state = "crusader-blue" /obj/item/clothing/head/helmet/plate/crusader name = "Crusader's Hood" @@ -368,33 +354,24 @@ heat_protection = FEET max_heat_protection_temperature = SHOES_MAX_TEMP_PROTECT - /obj/item/clothing/shoes/plate/red icon_state = "crusader-red" /obj/item/clothing/shoes/plate/blue icon_state = "crusader-blue" - -/obj/item/storage/box/itemset/crusader - name = "Crusader's Armour Set" //i can't into ck2 references - desc = "This armour is said to be based on the armor of kings on another world thousands of years ago, who tended to assassinate, conspire, and plot against everyone who tried to do the same to them. Some things never change." - - /obj/item/storage/box/itemset/crusader/blue/PopulateContents() - new /obj/item/clothing/suit/armor/plate/crusader/blue(src) + new /obj/item/clothing/suit/chaplainsuit/armor/crusader/blue(src) new /obj/item/clothing/head/helmet/plate/crusader/blue(src) new /obj/item/clothing/gloves/plate/blue(src) new /obj/item/clothing/shoes/plate/blue(src) - /obj/item/storage/box/itemset/crusader/red/PopulateContents() - new /obj/item/clothing/suit/armor/plate/crusader/red(src) + new /obj/item/clothing/suit/chaplainsuit/armor/crusader/red(src) new /obj/item/clothing/head/helmet/plate/crusader/red(src) new /obj/item/clothing/gloves/plate/red(src) new /obj/item/clothing/shoes/plate/red(src) - /obj/item/claymore/weak desc = "This one is rusted." force = 30 diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm index cb28aeed081..66f00f94754 100644 --- a/code/game/objects/items/stacks/sheets/leather.dm +++ b/code/game/objects/items/stacks/sheets/leather.dm @@ -80,7 +80,7 @@ GLOBAL_LIST_INIT(corgi_recipes, list ( \ GLOBAL_LIST_INIT(monkey_recipes, list ( \ new/datum/stack_recipe("monkey mask", /obj/item/clothing/mask/gas/monkeymask, 1), \ - new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/monkeysuit, 2), \ + new/datum/stack_recipe("monkey suit", /obj/item/clothing/suit/costume/monkeysuit, 2), \ )) /obj/item/stack/sheet/animalhide/monkey/get_main_recipes() @@ -105,7 +105,7 @@ GLOBAL_LIST_INIT(monkey_recipes, list ( \ GLOBAL_LIST_INIT(xeno_recipes, list ( \ new/datum/stack_recipe("alien helmet", /obj/item/clothing/head/xenos, 1), \ - new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/xenos, 2), \ + new/datum/stack_recipe("alien suit", /obj/item/clothing/suit/costume/xenos, 2), \ )) /obj/item/stack/sheet/animalhide/xeno/get_main_recipes() diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 31d4779be75..19d58f5d459 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -468,7 +468,7 @@ GLOBAL_LIST_INIT(durathread_recipes, list ( \ */ GLOBAL_LIST_INIT(cardboard_recipes, list ( \ new/datum/stack_recipe("box", /obj/item/storage/box), \ - new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \ + new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/costume/cardborg, 3), \ new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/cardborg), \ new/datum/stack_recipe("large box", /obj/structure/closet/cardboard, 4, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("cardboard cutout", /obj/item/cardboard_cutout, 5), \ @@ -578,7 +578,7 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \ new/datum/stack_recipe("bronze pinion airlock assembly", /obj/structure/door_assembly/door_assembly_bronze/seethru, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE), \ new/datum/stack_recipe("bronze floor tile", /obj/item/stack/tile/bronze, 1, 4, 20), \ new/datum/stack_recipe("bronze hat", /obj/item/clothing/head/bronze), \ - new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \ + new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/costume/bronze), \ new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \ null, new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 3fb47ba9496..d6b3cefa34a 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -56,7 +56,7 @@ /obj/item/storage/backpack/holding/Initialize() . = ..() - + create_storage(max_specific_storage = WEIGHT_CLASS_GIGANTIC, max_total_storage = 35, max_slots = 30, type = /datum/storage/bag_of_holding) atom_storage.allow_big_nesting = TRUE @@ -523,7 +523,7 @@ new /obj/item/surgicaldrill(src) new /obj/item/cautery(src) new /obj/item/surgical_drapes(src) - new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/jacket/straight_jacket(src) new /obj/item/clothing/mask/muzzle(src) new /obj/item/mmi/syndie(src) new /obj/item/blood_filter(src) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 0a7f518daca..c1a9f210cf5 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -1584,7 +1584,7 @@ /obj/item/storage/box/hero/PopulateContents() new /obj/item/clothing/head/fedora/curator(src) - new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/suit/jacket/curator(src) new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/melee/curator_whip(src) @@ -1638,41 +1638,41 @@ /obj/item/storage/box/holy/clock/PopulateContents() new /obj/item/clothing/head/helmet/chaplain/clock(src) - new /obj/item/clothing/suit/armor/riot/chaplain/clock(src) + new /obj/item/clothing/suit/chaplainsuit/armor/clock(src) /obj/item/storage/box/holy name = "Templar Kit" /obj/item/storage/box/holy/PopulateContents() new /obj/item/clothing/head/helmet/chaplain(src) - new /obj/item/clothing/suit/armor/riot/chaplain(src) + new /obj/item/clothing/suit/chaplainsuit/armor/templar(src) /obj/item/storage/box/holy/student name = "Profane Scholar Kit" /obj/item/storage/box/holy/student/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/studentuni(src) + new /obj/item/clothing/suit/chaplainsuit/armor/studentuni(src) new /obj/item/clothing/head/helmet/chaplain/cage(src) /obj/item/storage/box/holy/sentinel name = "Stone Sentinel Kit" /obj/item/storage/box/holy/sentinel/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/ancient(src) + new /obj/item/clothing/suit/chaplainsuit/armor/ancient(src) new /obj/item/clothing/head/helmet/chaplain/ancient(src) /obj/item/storage/box/holy/witchhunter name = "Witchhunter Kit" /obj/item/storage/box/holy/witchhunter/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/witchhunter(src) + new /obj/item/clothing/suit/chaplainsuit/armor/witchhunter(src) new /obj/item/clothing/head/helmet/chaplain/witchunter_hat(src) /obj/item/storage/box/holy/adept name = "Divine Adept Kit" /obj/item/storage/box/holy/adept/PopulateContents() - new /obj/item/clothing/suit/armor/riot/chaplain/adept(src) + new /obj/item/clothing/suit/chaplainsuit/armor/adept(src) new /obj/item/clothing/head/helmet/chaplain/adept(src) /obj/item/storage/box/holy/follower diff --git a/code/game/objects/items/storage/garment.dm b/code/game/objects/items/storage/garment.dm index 74cde69244b..5de3d487004 100644 --- a/code/game/objects/items/storage/garment.dm +++ b/code/game/objects/items/storage/garment.dm @@ -47,7 +47,7 @@ new /obj/item/clothing/under/rank/captain/parade(src) new /obj/item/clothing/suit/armor/vest/capcarapace(src) new /obj/item/clothing/suit/armor/vest/capcarapace/captains_formal(src) - new /obj/item/clothing/suit/capjacket(src) + new /obj/item/clothing/suit/jacket/capjacket(src) new /obj/item/clothing/glasses/sunglasses/gar/giga(src) new /obj/item/clothing/gloves/color/captain(src) new /obj/item/clothing/head/caphat(src) diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm index 1afee53eb3d..2bdf0038917 100644 --- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm @@ -310,7 +310,7 @@ /obj/structure/closet/wardrobe/curator/PopulateContents() new /obj/item/clothing/head/fedora/curator(src) - new /obj/item/clothing/suit/curator(src) + new /obj/item/clothing/suit/jacket/curator(src) new /obj/item/clothing/under/rank/civilian/curator/treasure_hunter(src) new /obj/item/clothing/shoes/workboots/mining(src) new /obj/item/storage/backpack/satchel/explorer(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm index 122c6900557..955d65d9b84 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/cargo.dm @@ -11,7 +11,7 @@ new /obj/item/clothing/under/rank/cargo/qm/skirt(src) new /obj/item/clothing/shoes/sneakers/brown(src) new /obj/item/radio/headset/heads/qm(src) - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/gloves/fingerless(src) new /obj/item/megaphone/cargo(src) new /obj/item/tank/internals/emergency_oxygen(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm index 4db2b863d4e..edabcd43c06 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/engineering.dm @@ -80,7 +80,7 @@ new /obj/item/tank/internals/emergency_oxygen/engi(src) new /obj/item/holosign_creator/atmos(src) new /obj/item/watertank/atmos(src) - new /obj/item/clothing/suit/fire/atmos(src) + new /obj/item/clothing/suit/utility/fire/atmos(src) new /obj/item/clothing/mask/gas/atmos(src) new /obj/item/clothing/head/hardhat/atmos(src) new /obj/item/clothing/glasses/meson/engine/tray(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 05f0f036c9f..5e4f32c444e 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -62,7 +62,7 @@ new /obj/item/storage/backpack/medic(src) new /obj/item/radio/headset/headset_srvmed(src) new /obj/item/clipboard(src) - new /obj/item/clothing/suit/straight_jacket(src) + new /obj/item/clothing/suit/jacket/straight_jacket(src) new /obj/item/clothing/ears/earmuffs(src) new /obj/item/clothing/mask/muzzle(src) new /obj/item/clothing/glasses/blindfold(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index e0e6d16203b..8fbfae1240c 100755 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -246,7 +246,7 @@ for(var/i in 1 to 3) new /obj/item/paper/fluff/jobs/security/court_judgement (src) new /obj/item/pen (src) - new /obj/item/clothing/suit/judgerobe (src) + new /obj/item/clothing/suit/costume/judgerobe (src) new /obj/item/clothing/head/powdered_wig (src) new /obj/item/storage/briefcase(src) diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index 3c814a447b3..d88c3a4872c 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -64,7 +64,7 @@ /obj/structure/closet/firecloset/PopulateContents() ..() - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/tank/internals/oxygen/red(src) new /obj/item/extinguisher(src) @@ -72,7 +72,7 @@ new /obj/item/crowbar/large/emergency(src) /obj/structure/closet/firecloset/full/PopulateContents() - new /obj/item/clothing/suit/fire/firefighter(src) + new /obj/item/clothing/suit/utility/fire/firefighter(src) new /obj/item/clothing/mask/gas(src) new /obj/item/flashlight(src) new /obj/item/tank/internals/oxygen/red(src) @@ -135,7 +135,7 @@ /obj/structure/closet/radiation/PopulateContents() ..() new /obj/item/geiger_counter(src) - new /obj/item/clothing/suit/radiation(src) + new /obj/item/clothing/suit/utility/radiation(src) new /obj/item/clothing/head/radiation(src) /* @@ -148,19 +148,19 @@ /obj/structure/closet/bombcloset/PopulateContents() ..() - new /obj/item/clothing/suit/bomb_suit(src) + new /obj/item/clothing/suit/utility/bomb_suit(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/head/bomb_hood(src) /obj/structure/closet/bombcloset/security/PopulateContents() - new /obj/item/clothing/suit/bomb_suit/security(src) + new /obj/item/clothing/suit/utility/bomb_suit/security(src) new /obj/item/clothing/under/rank/security/officer(src) new /obj/item/clothing/shoes/jackboots(src) new /obj/item/clothing/head/bomb_hood/security(src) /obj/structure/closet/bombcloset/white/PopulateContents() - new /obj/item/clothing/suit/bomb_suit/white(src) + new /obj/item/clothing/suit/utility/bomb_suit/white(src) new /obj/item/clothing/under/color/black(src) new /obj/item/clothing/shoes/sneakers/black(src) new /obj/item/clothing/head/bomb_hood/white(src) diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 35988b27e32..c2875e42b03 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -341,6 +341,7 @@ Striking a noncultist, however, will tear their flesh."} name = "ancient cultist robes" desc = "A ragged, dusty set of robes. Strange letters line the inside." icon_state = "cultrobes" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) @@ -387,6 +388,7 @@ Striking a noncultist, however, will tear their flesh."} name = "magus robes" desc = "A set of armored robes worn by the followers of Nar'Sie." icon_state = "magusred" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "magusred" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/tome, /obj/item/melee/cultblade) diff --git a/code/modules/antagonists/fugitive/fugitive_outfits.dm b/code/modules/antagonists/fugitive/fugitive_outfits.dm index 3d176a9d39b..e49aa041507 100644 --- a/code/modules/antagonists/fugitive/fugitive_outfits.dm +++ b/code/modules/antagonists/fugitive/fugitive_outfits.dm @@ -24,7 +24,7 @@ /datum/outfit/waldo name = "Waldo" uniform = /obj/item/clothing/under/pants/jeans - suit = /obj/item/clothing/suit/striped_sweater + suit = /obj/item/clothing/suit/costume/striped_sweater head = /obj/item/clothing/head/beanie/waldo shoes = /obj/item/clothing/shoes/sneakers/brown ears = /obj/item/radio/headset diff --git a/code/modules/antagonists/gang/gang.dm b/code/modules/antagonists/gang/gang.dm index 4a094184cd4..a270c857bd5 100644 --- a/code/modules/antagonists/gang/gang.dm +++ b/code/modules/antagonists/gang/gang.dm @@ -374,10 +374,10 @@ /obj/item/clothing/head/beanie/yellow, /obj/item/clothing/mask/bandana/gold, /obj/item/clothing/head/hardhat, - /obj/item/clothing/suit/yakuza) + /obj/item/clothing/suit/costume/yakuza) free_clothes = list(/obj/item/clothing/under/costume/yakuza, /obj/item/clothing/shoes/yakuza, - /obj/item/clothing/suit/yakuza, + /obj/item/clothing/suit/costume/yakuza, /obj/item/clothing/head/hardhat, /obj/item/toy/crayon/spraycan) antag_hud_name = "Tojo" @@ -426,12 +426,12 @@ gang_id = "VDL" acceptable_clothes = list(/obj/item/clothing/head/soft/black, /obj/item/clothing/under/costume/dutch, - /obj/item/clothing/suit/dutch, + /obj/item/clothing/suit/costume/dutch, /obj/item/clothing/head/bowler, /obj/item/clothing/mask/bandana/black) free_clothes = list(/obj/item/clothing/under/costume/dutch, /obj/item/clothing/head/bowler, - /obj/item/clothing/suit/dutch, + /obj/item/clothing/suit/costume/dutch, /obj/item/toy/crayon/spraycan) antag_hud_name = "Dutch" gang_team_type = /datum/team/gang/dutch @@ -451,10 +451,10 @@ roundend_category = "IRS Agents" gang_name = "Internal Revenue Service" gang_id = "IRS" - acceptable_clothes = list(/obj/item/clothing/suit/irs, + acceptable_clothes = list(/obj/item/clothing/suit/costume/irs, /obj/item/clothing/under/costume/irs, /obj/item/clothing/head/irs) - free_clothes = list(/obj/item/clothing/suit/irs, + free_clothes = list(/obj/item/clothing/suit/costume/irs, /obj/item/clothing/under/costume/irs, /obj/item/clothing/head/irs, /obj/item/toy/crayon/spraycan) @@ -475,10 +475,10 @@ roundend_category = "O.S.I. Agents" gang_name = "Office of Secret Intelligence" gang_id = "OSI" - acceptable_clothes = list(/obj/item/clothing/suit/osi, + acceptable_clothes = list(/obj/item/clothing/suit/costume/osi, /obj/item/clothing/under/costume/osi, /obj/item/clothing/glasses/osi) - free_clothes = list(/obj/item/clothing/suit/osi, + free_clothes = list(/obj/item/clothing/suit/costume/osi, /obj/item/clothing/under/costume/osi, /obj/item/clothing/glasses/osi, /obj/item/toy/crayon/spraycan) @@ -499,10 +499,10 @@ roundend_category = "Lost M.C. Bikers" gang_name = "The Lost M.C." gang_id = "TMC" - acceptable_clothes = list(/obj/item/clothing/suit/tmc, + acceptable_clothes = list(/obj/item/clothing/suit/costume/tmc, /obj/item/clothing/under/costume/tmc, /obj/item/clothing/head/tmc) - free_clothes = list(/obj/item/clothing/suit/tmc, + free_clothes = list(/obj/item/clothing/suit/costume/tmc, /obj/item/clothing/under/costume/tmc, /obj/item/clothing/head/tmc, /obj/item/toy/crayon/spraycan) @@ -523,10 +523,10 @@ roundend_category = "Powder Gangers" gang_name = "Powder Gangers" gang_id = "PG" - acceptable_clothes = list(/obj/item/clothing/suit/pg, + acceptable_clothes = list(/obj/item/clothing/suit/costume/pg, /obj/item/clothing/under/costume/pg, /obj/item/clothing/head/pg) - free_clothes = list(/obj/item/clothing/suit/pg, + free_clothes = list(/obj/item/clothing/suit/costume/pg, /obj/item/clothing/under/costume/pg, /obj/item/clothing/head/pg, /obj/item/toy/crayon/spraycan) @@ -548,11 +548,11 @@ roundend_category = "O'Driscoll's Gangsters" gang_name = "O'Driscoll's Gang" gang_id = "DB" - acceptable_clothes = list(/obj/item/clothing/suit/driscoll, + acceptable_clothes = list(/obj/item/clothing/suit/costume/driscoll, /obj/item/clothing/under/costume/driscoll, /obj/item/clothing/mask/gas/driscoll, /obj/item/clothing/shoes/cowboy) - free_clothes = list(/obj/item/clothing/suit/driscoll, + free_clothes = list(/obj/item/clothing/suit/costume/driscoll, /obj/item/clothing/under/costume/driscoll, /obj/item/clothing/mask/gas/driscoll, /obj/item/clothing/shoes/cowboy, @@ -574,11 +574,11 @@ roundend_category = "Deckers" gang_name = "Deckers" gang_id = "DK" - acceptable_clothes = list(/obj/item/clothing/suit/deckers, + acceptable_clothes = list(/obj/item/clothing/suit/costume/deckers, /obj/item/clothing/under/costume/deckers, /obj/item/clothing/head/deckers, /obj/item/clothing/shoes/deckers) - free_clothes = list(/obj/item/clothing/suit/deckers, + free_clothes = list(/obj/item/clothing/suit/costume/deckers, /obj/item/clothing/under/costume/deckers, /obj/item/clothing/head/deckers, /obj/item/clothing/shoes/deckers, @@ -601,11 +601,11 @@ roundend_category = "Morningstar Member" gang_name = "Morningstar" gang_id = "MS" - acceptable_clothes = list(/obj/item/clothing/suit/morningstar, + acceptable_clothes = list(/obj/item/clothing/suit/costume/morningstar, /obj/item/clothing/under/costume/morningstar, /obj/item/clothing/head/morningstar, /obj/item/clothing/shoes/morningstar) - free_clothes = list(/obj/item/clothing/suit/morningstar, + free_clothes = list(/obj/item/clothing/suit/costume/morningstar, /obj/item/clothing/under/costume/morningstar, /obj/item/clothing/head/morningstar, /obj/item/clothing/shoes/morningstar, @@ -627,11 +627,11 @@ roundend_category = "Third Street Saints Gangsters" gang_name = "Third Street Saints" gang_id = "TSS" - acceptable_clothes = list(/obj/item/clothing/suit/saints, + acceptable_clothes = list(/obj/item/clothing/suit/costume/saints, /obj/item/clothing/under/costume/saints, /obj/item/clothing/head/saints, /obj/item/clothing/shoes/saints) - free_clothes = list(/obj/item/clothing/suit/saints, + free_clothes = list(/obj/item/clothing/suit/costume/saints, /obj/item/clothing/under/costume/saints, /obj/item/clothing/head/saints, /obj/item/clothing/shoes/saints, @@ -654,11 +654,11 @@ roundend_category = "Phantom Thieves" gang_name = "Phantom Thieves of Hearts" gang_id = "PT" - acceptable_clothes = list(/obj/item/clothing/suit/phantom, + acceptable_clothes = list(/obj/item/clothing/suit/costume/phantom, /obj/item/clothing/under/costume/phantom, /obj/item/clothing/glasses/phantom, /obj/item/clothing/shoes/phantom) - free_clothes = list(/obj/item/clothing/suit/phantom, + free_clothes = list(/obj/item/clothing/suit/costume/phantom, /obj/item/clothing/under/costume/phantom, /obj/item/clothing/glasses/phantom, /obj/item/clothing/shoes/phantom, @@ -680,7 +680,7 @@ roundend_category = "Allies" gang_name = "Allies" gang_id = "ALLIES" - free_clothes = list(/obj/item/clothing/suit/allies, + free_clothes = list(/obj/item/clothing/suit/costume/allies, /obj/item/clothing/under/costume/allies, /obj/item/clothing/head/allies, /obj/item/clothing/gloves/color/black, @@ -703,7 +703,7 @@ roundend_category = "Soviets" gang_name = "Soviets" gang_id = "SOV" - free_clothes = list(/obj/item/clothing/suit/soviet, + free_clothes = list(/obj/item/clothing/suit/costume/soviet, /obj/item/clothing/under/costume/soviet_families, /obj/item/clothing/head/ushanka/soviet, /obj/item/clothing/gloves/color/black, @@ -726,7 +726,7 @@ roundend_category = "Yuri's Army" gang_name = "Yuri's Army" gang_id = "YR" - free_clothes = list(/obj/item/clothing/suit/yuri, + free_clothes = list(/obj/item/clothing/suit/costume/yuri, /obj/item/clothing/under/costume/yuri, /obj/item/clothing/head/yuri, /obj/item/clothing/gloves/color/black, @@ -749,7 +749,7 @@ roundend_category = "Sybil Slickers" gang_name = "Sybil Slickers" gang_id = "SS" - free_clothes = list(/obj/item/clothing/suit/sybil_slickers, + free_clothes = list(/obj/item/clothing/suit/costume/sybil_slickers, /obj/item/clothing/under/costume/sybil_slickers, /obj/item/clothing/head/sybil_slickers, /obj/item/clothing/gloves/tackler/football, @@ -772,7 +772,7 @@ roundend_category = "Basil Boys" gang_name = "Basil Boys" gang_id = "BB" - free_clothes = list(/obj/item/clothing/suit/basil_boys, + free_clothes = list(/obj/item/clothing/suit/costume/basil_boys, /obj/item/clothing/under/costume/basil_boys, /obj/item/clothing/head/basil_boys, /obj/item/clothing/gloves/tackler/football, diff --git a/code/modules/cargo/exports/gear.dm b/code/modules/cargo/exports/gear.dm index 8a9d5aeed0a..e0e495c7507 100644 --- a/code/modules/cargo/exports/gear.dm +++ b/code/modules/cargo/exports/gear.dm @@ -60,7 +60,7 @@ /datum/export/gear/radsuit cost = CARGO_CRATE_VALUE * 0.2 unit_name = "radsuit" - export_types = list(/obj/item/clothing/suit/radiation) + export_types = list(/obj/item/clothing/suit/utility/radiation) /datum/export/gear/biohood cost = CARGO_CRATE_VALUE * 0.1 @@ -80,7 +80,7 @@ /datum/export/gear/bombsuit cost = CARGO_CRATE_VALUE * 0.2 unit_name = "bomb suit" - export_types = list(/obj/item/clothing/suit/bomb_suit) + export_types = list(/obj/item/clothing/suit/utility/bomb_suit) /datum/export/gear/lizardboots cost = CARGO_CRATE_VALUE * 0.7 diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm index 756fa529cd5..07986a990b4 100644 --- a/code/modules/cargo/packs.dm +++ b/code/modules/cargo/packs.dm @@ -140,7 +140,7 @@ desc = "Science gone bonkers? Beeping behind the airlock? Buy now and be the hero the station des... I mean needs! (time not included)" cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/bomb_hood, - /obj/item/clothing/suit/bomb_suit, + /obj/item/clothing/suit/utility/bomb_suit, /obj/item/clothing/mask/gas, /obj/item/screwdriver, /obj/item/wirecutters, @@ -151,8 +151,8 @@ name = "Firefighting Crate" desc = "Only you can prevent station fires. Partner up with two firefighter suits, gas masks, flashlights, large oxygen tanks, extinguishers, and hardhats!" cost = CARGO_CRATE_VALUE * 2 - contains = list(/obj/item/clothing/suit/fire/firefighter, - /obj/item/clothing/suit/fire/firefighter, + contains = list(/obj/item/clothing/suit/utility/fire/firefighter, + /obj/item/clothing/suit/utility/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/flashlight, @@ -232,8 +232,8 @@ cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/radiation, /obj/item/clothing/head/radiation, - /obj/item/clothing/suit/radiation, - /obj/item/clothing/suit/radiation, + /obj/item/clothing/suit/utility/radiation, + /obj/item/clothing/suit/utility/radiation, /obj/item/geiger_counter, /obj/item/geiger_counter, /obj/item/reagent_containers/food/drinks/bottle/vodka, @@ -385,15 +385,15 @@ access_view = ACCESS_SECURITY contains = list(/obj/item/clothing/under/rank/security/officer/formal, /obj/item/clothing/under/rank/security/officer/formal, - /obj/item/clothing/suit/security/officer, - /obj/item/clothing/suit/security/officer, + /obj/item/clothing/suit/jacket/officer/blue, + /obj/item/clothing/suit/jacket/officer/blue, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/head/beret/sec/navyofficer, /obj/item/clothing/under/rank/security/warden/formal, - /obj/item/clothing/suit/security/warden, + /obj/item/clothing/suit/jacket/warden/blue, /obj/item/clothing/head/beret/sec/navywarden, /obj/item/clothing/under/rank/security/head_of_security/formal, - /obj/item/clothing/suit/security/hos, + /obj/item/clothing/suit/jacket/hos/blue, /obj/item/clothing/head/hos/beret/navyhos) crate_name = "security clothing crate" @@ -1779,9 +1779,9 @@ desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear." cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit) + /obj/item/clothing/suit/utility/beekeeper_suit) crate_name = "beekeeper suits" crate_type = /obj/structure/closet/crate/hydroponics @@ -1795,7 +1795,7 @@ /obj/item/honey_frame, /obj/item/queen_bee/bought, /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/suit/utility/beekeeper_suit, /obj/item/melee/flyswatter) crate_name = "beekeeping starter crate" crate_type = /obj/structure/closet/crate/hydroponics @@ -2417,15 +2417,15 @@ desc = "Reenact Shakespearean plays with this assortment of outfits. Contains eight different costumes!" cost = CARGO_CRATE_VALUE * 2 contains = list(/obj/item/clothing/head/snowman, - /obj/item/clothing/suit/snowman, + /obj/item/clothing/suit/costume/snowman, /obj/item/clothing/head/chicken, - /obj/item/clothing/suit/chickensuit, + /obj/item/clothing/suit/costume/chickensuit, /obj/item/clothing/mask/gas/monkeymask, - /obj/item/clothing/suit/monkeysuit, + /obj/item/clothing/suit/costume/monkeysuit, /obj/item/clothing/head/cardborg, - /obj/item/clothing/suit/cardborg, + /obj/item/clothing/suit/costume/cardborg, /obj/item/clothing/head/xenos, - /obj/item/clothing/suit/xenos, + /obj/item/clothing/suit/costume/xenos, /obj/item/clothing/suit/hooded/ian_costume, /obj/item/clothing/suit/hooded/carp_costume, /obj/item/clothing/suit/hooded/bee_costume) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index 8aafde978f9..9b8541857b0 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -407,6 +407,7 @@ name = "armor" desc = "A slim armored vest that protects against most types of damage." icon_state = "armor" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "armor" blood_overlay_type = "armor" resistance_flags = NONE @@ -607,7 +608,7 @@ /obj/item/clothing/shoes/chameleon/Initialize(mapload) . = ..() - + create_storage(type = /datum/storage/pockets/shoes) chameleon_action = new(src) diff --git a/code/modules/clothing/head/costume.dm b/code/modules/clothing/head/costume.dm index 05b696183fe..ebbc4d5beab 100644 --- a/code/modules/clothing/head/costume.dm +++ b/code/modules/clothing/head/costume.dm @@ -111,8 +111,8 @@ ..() if(ishuman(user) && slot == ITEM_SLOT_HEAD) var/mob/living/carbon/human/H = user - if(istype(H.wear_suit, /obj/item/clothing/suit/cardborg)) - var/obj/item/clothing/suit/cardborg/CB = H.wear_suit + if(istype(H.wear_suit, /obj/item/clothing/suit/costume/cardborg)) + var/obj/item/clothing/suit/costume/cardborg/CB = H.wear_suit CB.disguise(user, src) /obj/item/clothing/head/cardborg/dropped(mob/living/user) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index bea204111c0..768e4b62d01 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -59,7 +59,7 @@ name = "tournament gangster" uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit glasses = /obj/item/clothing/glasses/thermal/monocle head = /obj/item/clothing/head/fedora/det_hat l_hand = /obj/item/gun/ballistic @@ -119,7 +119,7 @@ id = /obj/item/card/id/advanced id_trim = /datum/id_trim/pirate uniform = /obj/item/clothing/under/costume/pirate - suit = /obj/item/clothing/suit/pirate/armored + suit = /obj/item/clothing/suit/costume/pirate/armored ears = /obj/item/radio/headset/syndicate glasses = /obj/item/clothing/glasses/eyepatch head = /obj/item/clothing/head/bandana/armored @@ -372,7 +372,7 @@ id = /obj/item/card/id/advanced/centcom id_trim = /datum/id_trim/centcom/admiral uniform = /obj/item/clothing/under/costume/soviet - suit = /obj/item/clothing/suit/pirate/captain + suit = /obj/item/clothing/suit/costume/pirate/captain back = /obj/item/storage/backpack/satchel/leather belt = /obj/item/gun/ballistic/revolver/mateba ears = /obj/item/radio/headset/headset_cent diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index f21d6b94a9e..b72e8c08c1c 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -26,6 +26,7 @@ name = "space suit" desc = "A suit that protects against low pressure environments. Has a big 13 on the back." icon_state = "spaceold" + worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "s_suit" w_class = WEIGHT_CLASS_BULKY clothing_flags = STOPSPRESSUREDAMAGE | THICKMATERIAL diff --git a/code/modules/clothing/spacesuits/santa.dm b/code/modules/clothing/spacesuits/santa.dm index cc59cfdac4d..f824fc530d8 100644 --- a/code/modules/clothing/spacesuits/santa.dm +++ b/code/modules/clothing/spacesuits/santa.dm @@ -10,6 +10,7 @@ name = "Santa's suit" desc = "Festive!" icon_state = "santa" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "santa" slowdown = 0 allowed = list(/obj/item) //for stuffing exta special presents diff --git a/code/modules/clothing/suits/ablativecoat.dm b/code/modules/clothing/suits/ablativecoat.dm index 614878d47dd..4889291c206 100644 --- a/code/modules/clothing/suits/ablativecoat.dm +++ b/code/modules/clothing/suits/ablativecoat.dm @@ -16,6 +16,7 @@ name = "ablative trenchcoat" desc = "Experimental trenchcoat specially crafted to reflect and absorb laser and disabler shots. Don't expect it to do all that much against an axe or a shotgun, however." icon_state = "ablativecoat" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "ablativecoat" body_parts_covered = CHEST|GROIN|LEGS|ARMS armor = list(MELEE = 10, BULLET = 10, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, FIRE = 100, ACID = 100) diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 13e349d4560..465d840363c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -1,4 +1,5 @@ /obj/item/clothing/suit/armor + worn_icon = 'icons/mob/clothing/suits/armor.dmi' allowed = null body_parts_covered = CHEST cold_protection = CHEST|GROIN diff --git a/code/modules/clothing/suits/bio.dm b/code/modules/clothing/suits/bio.dm index cb95a78dbd5..0bfe3ab75aa 100644 --- a/code/modules/clothing/suits/bio.dm +++ b/code/modules/clothing/suits/bio.dm @@ -13,6 +13,7 @@ name = "bio suit" desc = "A suit that protects against biological contamination." icon_state = "bio" + worn_icon = 'icons/mob/clothing/suits/bio.dmi' inhand_icon_state = "bio_suit" w_class = WEIGHT_CLASS_BULKY clothing_flags = THICKMATERIAL diff --git a/code/modules/clothing/suits/chaplainsuits.dm b/code/modules/clothing/suits/chaplainsuits.dm index 07a61c2d458..b332dc00672 100644 --- a/code/modules/clothing/suits/chaplainsuits.dm +++ b/code/modules/clothing/suits/chaplainsuits.dm @@ -2,6 +2,16 @@ //If any new staple chaplain items get added, put them in these lists /obj/item/clothing/suit/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' + +/obj/item/clothing/suit/chaplainsuit/armor + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80, WOUND = 20) + clothing_flags = BLOCKS_SHOVE_KNOCKDOWN + strip_delay = 80 + equip_delay_other = 60 /obj/item/clothing/suit/hooded/chaplainsuit allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) @@ -31,14 +41,14 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/chaplainsuit/studentuni +/obj/item/clothing/suit/chaplainsuit/armor/studentuni name = "student robe" desc = "The uniform of a bygone institute of learning." icon_state = "studentuni" inhand_icon_state = "studentuni" body_parts_covered = ARMS|CHEST -/obj/item/clothing/suit/chaplainsuit/witchhunter +/obj/item/clothing/suit/chaplainsuit/armor/witchhunter name = "witchunter garb" desc = "This worn outfit saw much use back in the day." icon_state = "witchhunter" @@ -49,6 +59,7 @@ name = "monk's habit" desc = "A few steps above rended sackcloth." icon_state = "monkfrock" + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' inhand_icon_state = "monkfrock" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/monkhabit @@ -85,3 +96,129 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT allowed = list(/obj/item/megaphone/clown, /obj/item/soap, /obj/item/food/pie/cream, /obj/item/bikehorn, /obj/item/bikehorn/golden, /obj/item/bikehorn/airhorn, /obj/item/instrument/bikehorn, /obj/item/reagent_containers/food/drinks/soda_cans/canned_laughter, /obj/item/toy/crayon, /obj/item/toy/crayon/spraycan, /obj/item/toy/crayon/spraycan/lubecan, /obj/item/grown/bananapeel, /obj/item/food/grown/banana) + +/obj/item/clothing/head/helmet/chaplain/clock + name = "forgotten helmet" + desc = "It has the unyielding gaze of a god eternally forgotten." + icon_state = "clockwork_helmet" + inhand_icon_state = "clockwork_helmet_inhand" + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + strip_delay = 8 SECONDS + dog_fashion = null + +/obj/item/clothing/suit/chaplainsuit/armor/clock + name = "forgotten armour" + desc = "It sounds like hissing steam, ticking cogs, gone silent, It looks like a dead machine, trying to tick with life." + icon_state = "clockwork_cuirass" + inhand_icon_state = "clockwork_cuirass_inhand" + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + slowdown = 0 + clothing_flags = NONE + +/obj/item/clothing/head/helmet/chaplain + name = "crusader helmet" + desc = "Deus Vult." + icon_state = "knight_templar" + inhand_icon_state = "knight_templar" + armor = list(MELEE = 50, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 80, ACID = 80) + flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDESNOUT + flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH + strip_delay = 80 + dog_fashion = null + +/obj/item/clothing/suit/chaplainsuit/armor/templar + name = "crusader armour" + desc = "God wills it!" + icon_state = "knight_templar" + inhand_icon_state = "knight_templar" + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + slowdown = 0 + clothing_flags = NONE + +/obj/item/clothing/head/helmet/chaplain/cage + name = "cage" + desc = "A cage that restrains the will of the self, allowing one to see the profane world for what it is." + flags_inv = NONE + icon_state = "cage" + inhand_icon_state = "cage" + worn_y_offset = 7 + +/obj/item/clothing/head/helmet/chaplain/ancient + name = "ancient helmet" + desc = "None may pass!" + icon_state = "knight_ancient" + inhand_icon_state = "knight_ancient" + +/obj/item/clothing/suit/chaplainsuit/armor/ancient + name = "ancient armour" + desc = "Defend the treasure..." + icon_state = "knight_ancient" + inhand_icon_state = "knight_ancient" + +/obj/item/clothing/head/helmet/chaplain/witchunter_hat + name = "witchunter hat" + desc = "This hat saw much use back in the day." + icon_state = "witchhunterhat" + inhand_icon_state = "witchhunterhat" + flags_cover = HEADCOVERSEYES + flags_inv = HIDEEYES + +/obj/item/clothing/head/helmet/chaplain/adept + name = "adept hood" + desc = "Its only heretical when others do it." + icon_state = "crusader" + inhand_icon_state = "crusader" + flags_cover = HEADCOVERSEYES + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/suit/chaplainsuit/armor/adept + name = "adept robes" + desc = "The ideal outfit for burning the unfaithful." + icon_state = "crusader" + inhand_icon_state = "crusader" + +/obj/item/clothing/suit/chaplainsuit/armor/crusader + name = "Crusader's Armour" + desc = "Armour that's comprised of metal and cloth." + icon_state = "crusader" + w_class = WEIGHT_CLASS_BULKY + slowdown = 2.0 //gotta pretend we're balanced. + body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS + armor = list(MELEE = 50, BULLET = 50, LASER = 50, ENERGY = 50, BOMB = 60, BIO = 0, FIRE = 60, ACID = 60) + +/obj/item/clothing/suit/chaplainsuit/armor/crusader/red + icon_state = "crusader-red" + +/obj/item/clothing/suit/chaplainsuit/armor/crusader/blue + icon_state = "crusader-blue" + +/obj/item/clothing/suit/hooded/chaplain_hoodie + name = "follower hoodie" + desc = "Hoodie made for acolytes of the chaplain." + icon_state = "chaplain_hoodie" + worn_icon = 'icons/mob/clothing/suits/chaplain.dmi' + inhand_icon_state = "chaplain_hoodie" + body_parts_covered = CHEST|GROIN|LEGS|ARMS + allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman) + hoodtype = /obj/item/clothing/head/hooded/chaplain_hood + +/obj/item/clothing/head/hooded/chaplain_hood + name = "follower hood" + desc = "Hood made for acolytes of the chaplain." + icon_state = "chaplain_hood" + body_parts_covered = HEAD + flags_inv = HIDEHAIR|HIDEFACE|HIDEEARS + +/obj/item/clothing/suit/hooded/chaplain_hoodie/leader + name = "leader hoodie" + desc = "Now you're ready for some 50 dollar bling water." + icon_state = "chaplain_hoodie_leader" + inhand_icon_state = "chaplain_hoodie_leader" + hoodtype = /obj/item/clothing/head/hooded/chaplain_hood/leader + +/obj/item/clothing/head/hooded/chaplain_hood/leader + name = "leader hood" + desc = "I mean, you don't /have/ to seek bling water. I just think you should." + icon_state = "chaplain_hood_leader" diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 650a35484b7..d8411aa9c11 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -1,7 +1,11 @@ +/obj/item/clothing/suit/costume + worn_icon = 'icons/mob/clothing/suits/costume.dmi' + /obj/item/clothing/suit/hooded/flashsuit name = "flashy costume" desc = "What did you expect?" icon_state = "flashsuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "armor" body_parts_covered = CHEST|GROIN hoodtype = /obj/item/clothing/head/hooded/flashsuit @@ -13,7 +17,7 @@ body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS|HIDEFACIALHAIR|HIDEFACE|HIDEMASK|HIDESNOUT -/obj/item/clothing/suit/pirate +/obj/item/clothing/suit/costume/pirate name = "pirate coat" desc = "Yarr." icon_state = "pirate" @@ -22,25 +26,25 @@ allowed = list(/obj/item/melee/energy/sword/pirate, /obj/item/clothing/glasses/eyepatch, /obj/item/reagent_containers/food/drinks/bottle/rum) species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/pirate/armored +/obj/item/clothing/suit/costume/pirate/armored armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75) strip_delay = 40 equip_delay_other = 20 species_exception = null -/obj/item/clothing/suit/pirate/captain +/obj/item/clothing/suit/costume/pirate/captain name = "pirate captain coat" desc = "Yarr." icon_state = "hgpirate" inhand_icon_state = "hgpirate" -/obj/item/clothing/suit/pirate/captain/armored +/obj/item/clothing/suit/costume/pirate/armored armor = list(MELEE = 30, BULLET = 50, LASER = 30,ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 60, ACID = 75) strip_delay = 40 equip_delay_other = 20 species_exception = null -/obj/item/clothing/suit/cyborg_suit +/obj/item/clothing/suit/costume/cyborg_suit name = "cyborg suit" desc = "Suit for a cyborg costume." icon_state = "death" @@ -49,7 +53,7 @@ fire_resist = T0C+5200 flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/justice +/obj/item/clothing/suit/costume/justice name = "justice suit" desc = "this pretty much looks ridiculous" //Needs no fixing icon_state = "justice" @@ -58,7 +62,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT armor = list(MELEE = 35, BULLET = 30, LASER = 30, ENERGY = 40, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50) -/obj/item/clothing/suit/judgerobe +/obj/item/clothing/suit/costume/judgerobe name = "judge's robe" desc = "This robe commands authority." icon_state = "judge" @@ -85,6 +89,7 @@ /obj/item/clothing/suit/syndicatefake name = "black and red space suit replica" icon_state = "syndicate-black-red" + worn_icon = 'icons/mob/clothing/suits/spacesuit.dmi' inhand_icon_state = "syndicate-black-red" desc = "A plastic replica of the Syndicate space suit. You'll look just like a real murderous Syndicate agent in this! This is a toy, it is not made for use in space!" w_class = WEIGHT_CLASS_NORMAL @@ -92,7 +97,7 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT resistance_flags = NONE -/obj/item/clothing/suit/hastur +/obj/item/clothing/suit/costume/hastur name = "\improper Hastur's robe" desc = "Robes not meant to be worn by man." icon_state = "hastur" @@ -100,7 +105,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/imperium_monk +/obj/item/clothing/suit/costume/imperium_monk name = "\improper Imperium monk suit" desc = "Have YOU killed a xeno today?" icon_state = "imperium_monk" @@ -109,7 +114,7 @@ flags_inv = HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/storage/book/bible, /obj/item/nullrod, /obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/item/storage/fancy/candle_box, /obj/item/candle, /obj/item/tank/internals/emergency_oxygen) -/obj/item/clothing/suit/chickensuit +/obj/item/clothing/suit/costume/chickensuit name = "chicken suit" desc = "A suit made long ago by the ancient empire KFC." icon_state = "chickensuit" @@ -117,7 +122,7 @@ body_parts_covered = CHEST|ARMS|GROIN|LEGS|FEET flags_inv = HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/monkeysuit +/obj/item/clothing/suit/costume/monkeysuit name = "monkey suit" desc = "A suit that looks like a primate." icon_state = "monkeysuit" @@ -129,6 +134,7 @@ name = "owl cloak" desc = "A soft brown cloak made of synthetic feathers. Soft to the touch, stylish, and a 2 meter wing span that will drive the ladies mad." icon_state = "owl_wings" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "owl_wings" toggle_noun = "wings" body_parts_covered = ARMS|CHEST @@ -143,7 +149,7 @@ icon_state = "griffin_wings" inhand_icon_state = "griffin_wings" -/obj/item/clothing/suit/cardborg +/obj/item/clothing/suit/costume/cardborg name = "cardborg suit" desc = "An ordinary cardboard box with holes cut in the sides." icon_state = "cardborg" @@ -152,16 +158,16 @@ flags_inv = HIDEJUMPSUIT dog_fashion = /datum/dog_fashion/back -/obj/item/clothing/suit/cardborg/equipped(mob/living/user, slot) +/obj/item/clothing/suit/costume/cardborg/equipped(mob/living/user, slot) ..() if(slot == ITEM_SLOT_OCLOTHING) disguise(user) -/obj/item/clothing/suit/cardborg/dropped(mob/living/user) +/obj/item/clothing/suit/costume/cardborg/dropped(mob/living/user) ..() user.remove_alt_appearance("standard_borg_disguise") -/obj/item/clothing/suit/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/cardborg/borghead) +/obj/item/clothing/suit/costume/cardborg/proc/disguise(mob/living/carbon/human/H, obj/item/clothing/head/cardborg/borghead) if(istype(H)) if(!borghead) borghead = H.head @@ -171,7 +177,7 @@ I.add_overlay(mutable_appearance('icons/mob/robots.dmi', "robot_e")) //gotta look realistic add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/silicons, "standard_borg_disguise", I) //you look like a robot to robots! (including yourself because you're totally a robot) -/obj/item/clothing/suit/snowman +/obj/item/clothing/suit/costume/snowman name = "snowman outfit" desc = "Two white spheres covered in white glitter. 'Tis the season." icon_state = "snowman" @@ -179,36 +185,36 @@ body_parts_covered = CHEST|GROIN flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/poncho +/obj/item/clothing/suit/costume/poncho name = "poncho" desc = "Your classic, non-racist poncho." icon_state = "classicponcho" inhand_icon_state = "classicponcho" species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/poncho/green +/obj/item/clothing/suit/costume/poncho/green name = "green poncho" desc = "Your classic, non-racist poncho. This one is green." icon_state = "greenponcho" inhand_icon_state = "greenponcho" -/obj/item/clothing/suit/poncho/red +/obj/item/clothing/suit/costume/poncho/red name = "red poncho" desc = "Your classic, non-racist poncho. This one is red." icon_state = "redponcho" inhand_icon_state = "redponcho" -/obj/item/clothing/suit/poncho/ponchoshame +/obj/item/clothing/suit/costume/poncho/ponchoshame name = "poncho of shame" desc = "Forced to live on your shameful acting as a fake Mexican, you and your poncho have grown inseparable. Literally." icon_state = "ponchoshame" inhand_icon_state = "ponchoshame" -/obj/item/clothing/suit/poncho/ponchoshame/Initialize(mapload) +/obj/item/clothing/suit/costume/poncho/ponchoshame/Initialize(mapload) . = ..() ADD_TRAIT(src, TRAIT_NODROP, SHAMEBRERO_TRAIT) -/obj/item/clothing/suit/whitedress +/obj/item/clothing/suit/costume/whitedress name = "white dress" desc = "A fancy white dress." icon_state = "white_dress" @@ -220,6 +226,7 @@ name = "carp costume" desc = "A costume made from 'synthetic' carp scales, it smells." icon_state = "carp_casual" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS cold_protection = CHEST|GROIN|ARMS @@ -291,6 +298,7 @@ name = "corgi costume" desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs." icon_state = "ian" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS //cold_protection = CHEST|GROIN|ARMS @@ -312,6 +320,7 @@ name = "bee costume" desc = "Bee the true Queen!" icon_state = "bee" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS clothing_flags = THICKMATERIAL @@ -330,6 +339,7 @@ name = "bloated human suit" desc = "A horribly bloated suit made from human skins." icon_state = "lingspacesuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "labcoat" body_parts_covered = CHEST|GROIN|ARMS allowed = list() @@ -346,14 +356,7 @@ flags_cover = HEADCOVERSEYES flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT -/obj/item/clothing/suit/security/officer/russian - name = "\improper Russian officer's jacket" - desc = "This jacket is for those special occasions when a russian officer isn't required to wear their armor." - icon_state = "officertanjacket" - inhand_icon_state = "officertanjacket" - body_parts_covered = CHEST|ARMS - -/obj/item/clothing/suit/shrine_maiden +/obj/item/clothing/suit/costume/shrine_maiden name = "shrine maiden's outfit" desc = "Makes you want to exterminate some troublesome youkai." icon_state = "shrine_maiden" @@ -361,31 +364,31 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS flags_inv = HIDEJUMPSUIT -/obj/item/clothing/suit/striped_sweater +/obj/item/clothing/suit/costume/striped_sweater name = "striped sweater" desc = "Reminds you of someone, but you just can't put your finger on it..." icon_state = "waldo_shirt" inhand_icon_state = "waldo_shirt" -/obj/item/clothing/suit/dracula +/obj/item/clothing/suit/costume/dracula name = "dracula coat" desc = "Looks like this belongs in a very old movie set." icon_state = "draculacoat" inhand_icon_state = "draculacoat" -/obj/item/clothing/suit/drfreeze_coat +/obj/item/clothing/suit/costume/drfreeze_coat name = "doctor freeze's labcoat" desc = "A labcoat imbued with the power of features and freezes." icon_state = "drfreeze_coat" inhand_icon_state = "drfreeze_coat" -/obj/item/clothing/suit/gothcoat +/obj/item/clothing/suit/costume/gothcoat name = "gothic coat" desc = "Perfect for those who want to stalk around a corner of a bar." icon_state = "gothcoat" inhand_icon_state = "gothcoat" -/obj/item/clothing/suit/xenos +/obj/item/clothing/suit/costume/xenos name = "xenos suit" desc = "A suit made out of chitinous alien hide." icon_state = "xenos" @@ -394,42 +397,42 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT allowed = list(/obj/item/clothing/mask/facehugger/toy) -/obj/item/clothing/suit/nemes +/obj/item/clothing/suit/costume/nemes name = "pharoah tunic" desc = "Lavish space tomb not included." icon_state = "pharoah" inhand_icon_state = "pharoah" body_parts_covered = CHEST|GROIN -/obj/item/clothing/suit/changshan_red +/obj/item/clothing/suit/costume/changshan_red name = "red changshan" desc = "A gorgeously embroidered silk shirt." icon_state = "changshan_red" inhand_icon_state = "changshan_red" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/changshan_blue +/obj/item/clothing/suit/costume/changshan_blue name = "blue changshan" desc = "A gorgeously embroidered silk shirt." icon_state = "changshan_blue" inhand_icon_state = "changshan_blue" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/cheongsam_red +/obj/item/clothing/suit/costume/cheongsam_red name = "red cheongsam" desc = "A gorgeously embroidered silk dress." icon_state = "cheongsam_red" inhand_icon_state = "cheongsam_red" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/cheongsam_blue +/obj/item/clothing/suit/costume/cheongsam_blue name = "blue cheongsam" desc = "A gorgeously embroidered silk dress." icon_state = "cheongsam_blue" inhand_icon_state = "cheongsam_blue" body_parts_covered = CHEST|GROIN|ARMS|LEGS -/obj/item/clothing/suit/bronze +/obj/item/clothing/suit/costume/bronze name = "bronze suit" desc = "A big and clanky suit made of bronze that offers no protection and looks very unfashionable. Nice." icon = 'icons/obj/clothing/suits.dmi' @@ -440,6 +443,7 @@ name = "mystic's robe" desc = "Wearing this makes you feel more attuned with the nature of the universe... as well as a bit more irresponsible. " icon_state = "mysticrobe" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "mysticrobe" body_parts_covered = CHEST|GROIN|LEGS|ARMS allowed = list(/obj/item/spellbook, /obj/item/storage/book/bible) @@ -458,17 +462,18 @@ name = "coordinator jacket" desc = "A jacket for a party ooordinator, stylish!." icon_state = "capformal" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "capspacesuit" armor = list(MELEE = 25, BULLET = 15, LASER = 25, ENERGY = 35, BOMB = 25, BIO = 0, FIRE = 50, ACID = 50) -/obj/item/clothing/suit/hawaiian +/obj/item/clothing/suit/costume/hawaiian name = "hawaiian overshirt" desc = "A cool shirt for chilling on the beach." icon_state = "hawaiian_blue" inhand_icon_state = "hawaiian_blue" species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/yakuza +/obj/item/clothing/suit/costume/yakuza name = "tojo clan jacket" desc = "The jacket of a mad dog." icon_state = "MajimaJacket" @@ -476,7 +481,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/dutch +/obj/item/clothing/suit/costume/dutch name = "dutch's jacket" desc = "For those long nights on the beach in Tahiti." icon_state = "DutchJacket" @@ -485,7 +490,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/driscoll +/obj/item/clothing/suit/costume/driscoll name = "driscoll poncho" desc = "Keeping you warm in the harsh cold of space." icon_state = "driscoll_suit" @@ -493,7 +498,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/irs +/obj/item/clothing/suit/costume/irs name = "internal revenue service jacket" desc = "I'm crazy enough to take on The Owl, but the IRS? Nooo thank you!" icon_state = "irs_suit" @@ -501,7 +506,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/osi +/obj/item/clothing/suit/costume/osi name = "\improper O.S.I. body armor" desc = "You're beyond good and evil, super man. You work for the government. And you're a tool, boy, a tool! Built for a single purpose by the United States of shut your third fucking damn eye for a fucking reason! You can't teach a hammer to love nails, son. That dog don't hunt!" icon_state = "osi_suit" @@ -509,7 +514,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/tmc +/obj/item/clothing/suit/costume/tmc name = "\improper Lost M.C. cut" desc = "Making sure everyone knows you're in the best biker gang this side of Alderney." icon_state = "tmc_suit" @@ -517,7 +522,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/pg +/obj/item/clothing/suit/costume/pg name = "powder ganger jacket" desc = "Remind Security of their mistakes in giving prisoners blasting charges." icon_state = "pg_suit" @@ -525,7 +530,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/deckers +/obj/item/clothing/suit/costume/deckers name = "decker hoodie" desc = "Based? Based on what?" icon_state = "decker_suit" @@ -533,7 +538,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/morningstar +/obj/item/clothing/suit/costume/morningstar name = "morningstar coat" desc = "This coat costs more than you've ever made in your entire life." icon_state = "morningstar_suit" @@ -541,7 +546,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/saints +/obj/item/clothing/suit/costume/saints name = "Third Street Saints fur coat" desc = "Rated 10 out of 10 in Cosmo for best coat brand." icon_state = "saints_suit" @@ -551,7 +556,7 @@ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/phantom +/obj/item/clothing/suit/costume/phantom name = "phantom thief coat" desc = "Your foes will never see you coming in this stealthy yet stylish getup." icon_state = "phantom_suit" @@ -559,7 +564,7 @@ body_parts_covered = CHEST|GROIN|LEGS|ARMS supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/allies +/obj/item/clothing/suit/costume/allies name = "allies body armor" desc = "How 'bout some action!? Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "allies_armor" @@ -567,35 +572,35 @@ body_parts_covered = CHEST|GROIN supports_variations_flags = CLOTHING_DIGITIGRADE_VARIATION_NO_NEW_ICON -/obj/item/clothing/suit/soviet +/obj/item/clothing/suit/costume/soviet name = "soviet armored coat" desc = "Conscript reporting! Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "soviet_suit" inhand_icon_state = "soviet_suit" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/yuri +/obj/item/clothing/suit/costume/yuri name = "yuri initiate coat" desc = "Yuri is master! Sponsored by DonkSoft Co. for historical reenactment of the Third World War!" icon_state = "yuri_coat" inhand_icon_state = "yuri_coat" body_parts_covered = CHEST|GROIN|ARMS -/obj/item/clothing/suit/sybil_slickers +/obj/item/clothing/suit/costume/sybil_slickers name = "sybil slickers protective gear" desc = "Given to members of the Sybil Slickers football team!" icon_state = "football_armor_blue" inhand_icon_state = "football_armor_blue" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/basil_boys +/obj/item/clothing/suit/costume/basil_boys name = "basil boys protective gear" desc = "Given to members of the Basil Boys football team!" icon_state = "football_armor_red" inhand_icon_state = "football_armor_red" body_parts_covered = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/joker +/obj/item/clothing/suit/costume/joker name = "comedian coat" desc = "I mean, don’t you have to be funny to be a comedian?" icon_state = "joker_coat" diff --git a/code/modules/clothing/suits/ghostsheet.dm b/code/modules/clothing/suits/ghostsheet.dm index 901e823624c..a75734fe92d 100644 --- a/code/modules/clothing/suits/ghostsheet.dm +++ b/code/modules/clothing/suits/ghostsheet.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/ghost_sheet +/obj/item/clothing/suit/costume/ghost_sheet name = "ghost sheet" desc = "The hands float by themselves, so it's extra spooky." icon_state = "ghost_sheet" @@ -11,7 +11,7 @@ alternate_worn_layer = UNDER_HEAD_LAYER species_exception = list(/datum/species/golem) -/obj/item/clothing/suit/ghost_sheet/spooky +/obj/item/clothing/suit/costume/ghost_sheet/spooky name = "spooky ghost" desc = "This is obviously just a bedsheet, but maybe try it on?" user_vars_to_edit = list("name" = "Spooky Ghost", "real_name" = "Spooky Ghost" , "incorporeal_move" = INCORPOREAL_MOVE_BASIC, "appearance_flags" = KEEP_TOGETHER|TILE_BOUND, "alpha" = 150) diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index 80fe54c5918..6137b63440a 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -2,6 +2,7 @@ name = "bomber jacket" desc = "Aviators not included." icon_state = "bomberjacket" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "brownjsuit" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/radio) body_parts_covered = CHEST|GROIN|ARMS diff --git a/code/modules/clothing/suits/jobs.dm b/code/modules/clothing/suits/jobs.dm index 953cf3a0d36..1ac8911419c 100644 --- a/code/modules/clothing/suits/jobs.dm +++ b/code/modules/clothing/suits/jobs.dm @@ -7,6 +7,7 @@ name = "apron" desc = "A basic blue apron." icon_state = "apron" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "apron" blood_overlay_type = "armor" body_parts_covered = CHEST|GROIN @@ -22,7 +23,7 @@ body_parts_covered = CHEST|GROIN|LEGS //Captain -/obj/item/clothing/suit/capjacket +/obj/item/clothing/suit/jacket/capjacket name = "captain's parade jacket" desc = "Worn by a Captain to show their class." icon_state = "capjacket" @@ -35,6 +36,7 @@ name = "chef's apron" desc = "An apron-jacket used by a high class chef." icon_state = "chef" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "chef" armor = list(MELEE = 0, BULLET = 0, LASER = 0, ENERGY = 0, BOMB = 0, BIO = 50, FIRE = 0, ACID = 0) body_parts_covered = CHEST|GROIN|ARMS @@ -53,7 +55,7 @@ allowed = list(/obj/item/kitchen, /obj/item/knife/kitchen, /obj/item/storage/bag/tray) //Detective -/obj/item/clothing/suit/det_suit +/obj/item/clothing/suit/jacket/det_suit name = "trenchcoat" desc = "A 18th-century multi-purpose trenchcoat. Someone who wears this means serious business." icon_state = "detective" @@ -64,27 +66,40 @@ cold_protection = CHEST|GROIN|LEGS|ARMS heat_protection = CHEST|GROIN|LEGS|ARMS -/obj/item/clothing/suit/det_suit/Initialize(mapload) +/obj/item/clothing/suit/jacket/det_suit/Initialize(mapload) . = ..() allowed = GLOB.detective_vest_allowed -/obj/item/clothing/suit/det_suit/dark +/obj/item/clothing/suit/jacket/det_suit/dark name = "noir trenchcoat" desc = "A hard-boiled private investigator's dark trenchcoat." icon_state = "noirdet" inhand_icon_state = "greydet" -/obj/item/clothing/suit/det_suit/noir +/obj/item/clothing/suit/jacket/det_suit/noir name = "noir suit coat" desc = "A dapper private investigator's dark suit coat." icon_state = "detsuit" inhand_icon_state = "detsuit" +/obj/item/clothing/suit/jacket/det_suit/kim + name = "aerostatic bomber jacket" + desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses." + icon_state = "aerostatic_bomber_jacket" + inhand_icon_state = "aerostatic_bomber_jacket" + +/obj/item/clothing/suit/jacket/det_suit/disco + name = "disco ass blazer" + desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve." + icon_state = "jamrock_blazer" + inhand_icon_state = "jamrock_blazer" + //Engineering /obj/item/clothing/suit/hazardvest name = "hazard vest" desc = "A high-visibility vest used in work zones." icon_state = "hazard" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "hazard" blood_overlay_type = "armor" allowed = list(/obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/t_scanner, /obj/item/radio, /obj/item/storage/bag/construction) @@ -101,6 +116,7 @@ name = "blue suit jacket" desc = "A snappy dress jacket." icon_state = "suitjacket_blue" + worn_icon = 'icons/mob/clothing/suits/jacket.dmi' inhand_icon_state = "suitjacket_blue" blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS @@ -118,13 +134,13 @@ icon_state = "suitjacket_black" inhand_icon_state = "ro_suit" - //Mime /obj/item/clothing/suit/toggle/suspenders name = "suspenders" desc = "They suspend the illusion of the mime's play." icon = 'icons/obj/clothing/belts.dmi' icon_state = "suspenders" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' worn_icon_state = "suspenders" blood_overlay_type = "armor" //it's the less thing that I can put here toggle_noun = "straps" @@ -147,27 +163,48 @@ greyscale_colors = "#888888" //Security -/obj/item/clothing/suit/security/officer +/obj/item/clothing/suit/jacket/officer/blue name = "security officer's jacket" desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." icon_state = "officerbluejacket" inhand_icon_state = "officerbluejacket" body_parts_covered = CHEST|ARMS -/obj/item/clothing/suit/security/warden +/obj/item/clothing/suit/jacket/officer/tan + name = "security officer's jacket" + desc = "This jacket is for those special occasions when a security officer isn't required to wear their armor." + icon_state = "officertanjacket" + inhand_icon_state = "officertanjacket" + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/suit/jacket/warden/blue name = "warden's jacket" desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." icon_state = "wardenbluejacket" inhand_icon_state = "wardenbluejacket" body_parts_covered = CHEST|ARMS -/obj/item/clothing/suit/security/hos +/obj/item/clothing/suit/jacket/warden/tan + name = "warden's jacket" + desc = "Perfectly suited for the warden that wants to leave an impression of style on those who visit the brig." + icon_state = "wardentanjacket" + inhand_icon_state = "wardentanjacket" + body_parts_covered = CHEST|ARMS + +/obj/item/clothing/suit/jacket/hos/blue name = "head of security's jacket" desc = "This piece of clothing was specifically designed for asserting superior authority." icon_state = "hosbluejacket" inhand_icon_state = "hosbluejacket" body_parts_covered = CHEST|ARMS +/obj/item/clothing/suit/jacket/hos/tan + name = "head of security's jacket" + desc = "This piece of clothing was specifically designed for asserting superior authority." + icon_state = "hostanjacket" + inhand_icon_state = "hostanjacket" + body_parts_covered = CHEST|ARMS + //Surgeon /obj/item/clothing/suit/apron/surgical name = "surgical apron" @@ -192,7 +229,7 @@ ) //Curator -/obj/item/clothing/suit/curator +/obj/item/clothing/suit/jacket/curator name = "treasure hunter's coat" desc = "Both fashionable and lightly armoured, this jacket is favoured by treasure hunters the galaxy over." icon_state = "curator" @@ -204,13 +241,12 @@ cold_protection = CHEST|ARMS heat_protection = CHEST|ARMS - //Robotocist - /obj/item/clothing/suit/hooded/techpriest name = "techpriest robes" desc = "For those who REALLY love their toasters." icon_state = "techpriest" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "techpriest" body_parts_covered = CHEST|GROIN|LEGS|ARMS hoodtype = /obj/item/clothing/head/hooded/techpriest @@ -222,16 +258,3 @@ inhand_icon_state = "techpriesthood" body_parts_covered = HEAD flags_inv = HIDEHAIR|HIDEEARS - -/obj/item/clothing/suit/det_suit/kim - name = "aerostatic bomber jacket" - desc = "A jacket once worn by the revolutionary air brigades during the Antecentennial Revolution. There are quite a few pockets on the inside, mostly for storing notebooks and compasses." - icon_state = "aerostatic_bomber_jacket" - inhand_icon_state = "aerostatic_bomber_jacket" - -/obj/item/clothing/suit/det_suit/disco - name = "disco ass blazer" - desc = "Looks like someone skinned this blazer off some long extinct disco-animal. It has an enigmatic white rectangle on the back and the right sleeve." - icon_state = "jamrock_blazer" - inhand_icon_state = "jamrock_blazer" - diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index 482ef2e91f5..19b2a3a10ba 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -2,6 +2,7 @@ name = "labcoat" desc = "A suit that protects against minor chemical spills." icon_state = "labcoat" + worn_icon = 'icons/mob/clothing/suits/labcoat.dmi' inhand_icon_state = "labcoat" blood_overlay_type = "coat" body_parts_covered = CHEST|ARMS diff --git a/code/modules/clothing/suits/lasertag.dm b/code/modules/clothing/suits/lasertag.dm index e1b75b08c2e..95b281a776b 100644 --- a/code/modules/clothing/suits/lasertag.dm +++ b/code/modules/clothing/suits/lasertag.dm @@ -2,6 +2,7 @@ name = "blue laser tag armor" desc = "A piece of plastic armor. It has sensors that react to red light." //Lasers are concentrated light icon_state = "bluetag" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bluetag" blood_overlay_type = "armor" body_parts_covered = CHEST @@ -12,6 +13,7 @@ name = "red laser tag armor" desc = "A piece of plastic armor. It has sensors that react to blue light." icon_state = "redtag" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "redtag" blood_overlay_type = "armor" body_parts_covered = CHEST diff --git a/code/modules/clothing/suits/shirt.dm b/code/modules/clothing/suits/shirt.dm index eeea8e17a71..e034958bc95 100644 --- a/code/modules/clothing/suits/shirt.dm +++ b/code/modules/clothing/suits/shirt.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/ianshirt +/obj/item/clothing/suit/costume/ianshirt name = "worn shirt" desc = "A worn out, curiously comfortable t-shirt with a picture of Ian. You wouldn't go so far as to say it feels like being hugged when you wear it, but it's pretty close. Good for sleeping in." icon_state = "ianshirt" @@ -7,7 +7,7 @@ ///How many times has this shirt been washed? (In an ideal world this is just the determinant of the transform matrix.) var/wash_count = 0 -/obj/item/clothing/suit/ianshirt/machine_wash(obj/machinery/washing_machine/washer) +/obj/item/clothing/suit/costume/ianshirt/machine_wash(obj/machinery/washing_machine/washer) . = ..() if(wash_count <= 5) transform *= TRANSFORM_USING_VARIABLE(0.8, 1) @@ -17,7 +17,7 @@ washer.visible_message("[src] implodes due to repeated washing.") qdel(src) -/obj/item/clothing/suit/nerdshirt +/obj/item/clothing/suit/costume/nerdshirt name = "gamer shirt" desc = "A baggy shirt with vintage game character Phanic the Weasel. Why would anyone wear this?" icon_state = "nerdshirt" diff --git a/code/modules/clothing/suits/straightjacket.dm b/code/modules/clothing/suits/straightjacket.dm index eaafe60ade9..15abb01ebb4 100644 --- a/code/modules/clothing/suits/straightjacket.dm +++ b/code/modules/clothing/suits/straightjacket.dm @@ -1,4 +1,4 @@ -/obj/item/clothing/suit/straight_jacket +/obj/item/clothing/suit/jacket/straight_jacket name = "straight jacket" desc = "A suit that completely restrains the wearer. Manufactured by Antyphun Corp." //Straight jacket is antifun icon_state = "straight_jacket" diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 69d785942e7..ed07d5c0773 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -9,7 +9,10 @@ * Fire protection */ -/obj/item/clothing/suit/fire +/obj/item/clothing/suit/utility + worn_icon = 'icons/mob/clothing/suits/utility.dmi' + +/obj/item/clothing/suit/utility/fire name = "emergency firesuit" desc = "A suit that helps protect against fire and heat." icon_state = "fire" @@ -29,23 +32,23 @@ equip_delay_other = 60 resistance_flags = FIRE_PROOF -/obj/item/clothing/suit/fire/worn_overlays(mutable_appearance/standing, isinhands, icon_file) +/obj/item/clothing/suit/utility/fire/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha) -/obj/item/clothing/suit/fire/firefighter +/obj/item/clothing/suit/utility/fire/firefighter icon_state = "firesuit" inhand_icon_state = "firefighter" -/obj/item/clothing/suit/fire/heavy +/obj/item/clothing/suit/utility/fire/heavy name = "heavy firesuit" desc = "An old, bulky thermal protection suit." icon_state = "thermal" inhand_icon_state = "ro_suit" slowdown = 1.5 -/obj/item/clothing/suit/fire/atmos +/obj/item/clothing/suit/utility/fire/atmos name = "firesuit" desc = "An expensive firesuit that protects against even the most deadly of station fires. Designed to protect even if the wearer is set aflame." icon_state = "atmos_firesuit" @@ -73,7 +76,7 @@ resistance_flags = NONE -/obj/item/clothing/suit/bomb_suit +/obj/item/clothing/suit/utility/bomb_suit name = "bomb suit" desc = "A suit designed for safety when handling explosives." icon_state = "bombsuit" @@ -97,7 +100,7 @@ icon_state = "bombsuit_sec" inhand_icon_state = "bombsuit_sec" -/obj/item/clothing/suit/bomb_suit/security +/obj/item/clothing/suit/utility/bomb_suit/security icon_state = "bombsuit_sec" inhand_icon_state = "bombsuit_sec" allowed = list(/obj/item/gun/energy, /obj/item/melee/baton, /obj/item/restraints/handcuffs) @@ -107,7 +110,7 @@ icon_state = "bombsuit_white" inhand_icon_state = "bombsuit_white" -/obj/item/clothing/suit/bomb_suit/white +/obj/item/clothing/suit/utility/bomb_suit/white icon_state = "bombsuit_white" inhand_icon_state = "bombsuit_white" @@ -131,7 +134,7 @@ . = ..() AddElement(/datum/element/radiation_protected_clothing) -/obj/item/clothing/suit/radiation +/obj/item/clothing/suit/utility/radiation name = "radiation suit" desc = "A suit that protects against radiation. The label reads, 'Made with lead. Please do not consume insulation.'" icon_state = "rad" @@ -147,11 +150,11 @@ flags_inv = HIDEJUMPSUIT resistance_flags = NONE -/obj/item/clothing/suit/radiation/Initialize(mapload) +/obj/item/clothing/suit/utility/radiation/Initialize(mapload) . = ..() AddElement(/datum/element/radiation_protected_clothing) -/obj/item/clothing/suit/radiation/worn_overlays(mutable_appearance/standing, isinhands, icon_file) +/obj/item/clothing/suit/utility/radiation/worn_overlays(mutable_appearance/standing, isinhands, icon_file) . = ..() if(!isinhands) . += emissive_appearance(icon_file, "[icon_state]-emissive", alpha = src.alpha) diff --git a/code/modules/clothing/suits/wetfloor.dm b/code/modules/clothing/suits/wetfloor.dm index 9bccc903a32..3a04e90cec0 100644 --- a/code/modules/clothing/suits/wetfloor.dm +++ b/code/modules/clothing/suits/wetfloor.dm @@ -2,6 +2,7 @@ name = "wet floor sign" desc = "Caution! Wet Floor!" icon_state = "caution" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' lefthand_file = 'icons/mob/inhands/equipment/custodial_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/custodial_righthand.dmi' force = 1 diff --git a/code/modules/clothing/suits/wiz_robe.dm b/code/modules/clothing/suits/wiz_robe.dm index 0930f14eca4..5c4095d5ab3 100644 --- a/code/modules/clothing/suits/wiz_robe.dm +++ b/code/modules/clothing/suits/wiz_robe.dm @@ -59,6 +59,7 @@ name = "wizard robe" desc = "A magnificent, gem-lined robe that seems to radiate power." icon_state = "wizard" + worn_icon = 'icons/mob/clothing/suits/wizard.dmi' inhand_icon_state = "wizrobe" body_parts_covered = CHEST|GROIN|ARMS|LEGS armor = list(MELEE = 30, BULLET = 20, LASER = 20, ENERGY = 30, BOMB = 20, BIO = 100, FIRE = 100, ACID = 100, WOUND = 20) diff --git a/code/modules/holiday/easter.dm b/code/modules/holiday/easter.dm index 7c8b9c9cac7..3e1ab4d59a3 100644 --- a/code/modules/holiday/easter.dm +++ b/code/modules/holiday/easter.dm @@ -61,10 +61,11 @@ clothing_flags = THICKMATERIAL | SNUG_FIT flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT -/obj/item/clothing/suit/bunnysuit +/obj/item/clothing/suit/costume/bunnysuit name = "Easter Bunny Suit" desc = "Hop Hop Hop!" icon_state = "bunnysuit" + worn_icon = 'icons/mob/clothing/suits/costume.dmi' inhand_icon_state = "bunnysuit" slowdown = -0.3 clothing_flags = THICKMATERIAL @@ -97,7 +98,7 @@ /obj/item/surprise_egg/proc/dispensePrize(turf/where) var/static/list/prize_list = list(/obj/item/clothing/head/bunnyhead, - /obj/item/clothing/suit/bunnysuit, + /obj/item/clothing/suit/costume/bunnysuit, /obj/item/storage/backpack/satchel/bunnysatchel, /obj/item/food/grown/carrot, /obj/item/toy/balloon, diff --git a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm index ae1eba13f05..00b1a590cb5 100644 --- a/code/modules/hydroponics/beekeeping/beekeeper_suit.dm +++ b/code/modules/hydroponics/beekeeping/beekeeper_suit.dm @@ -7,7 +7,7 @@ clothing_flags = THICKMATERIAL | SNUG_FIT -/obj/item/clothing/suit/beekeeper_suit +/obj/item/clothing/suit/utility/beekeeper_suit name = "beekeeper suit" desc = "Keeps the lil buzzing buggers away from your squishy bits." icon_state = "beekeeper" diff --git a/code/modules/jobs/job_types/detective.dm b/code/modules/jobs/job_types/detective.dm index 785eb9e49e2..7b6e0c3ae38 100644 --- a/code/modules/jobs/job_types/detective.dm +++ b/code/modules/jobs/job_types/detective.dm @@ -50,7 +50,7 @@ id_trim = /datum/id_trim/job/detective uniform = /obj/item/clothing/under/rank/security/detective - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit backpack_contents = list( /obj/item/detective_scanner = 1, /obj/item/melee/baton = 1, diff --git a/code/modules/mafia/outfits.dm b/code/modules/mafia/outfits.dm index 94f4c178cde..5d239aca6c5 100644 --- a/code/modules/mafia/outfits.dm +++ b/code/modules/mafia/outfits.dm @@ -19,7 +19,7 @@ uniform = /obj/item/clothing/under/rank/security/detective neck = /obj/item/clothing/neck/tie/detective shoes = /obj/item/clothing/shoes/sneakers/brown - suit = /obj/item/clothing/suit/det_suit + suit = /obj/item/clothing/suit/jacket/det_suit gloves = /obj/item/clothing/gloves/color/black head = /obj/item/clothing/head/fedora/det_hat mask = /obj/item/clothing/mask/cigarette diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm index ec06b4a3330..bdaa7ca693e 100644 --- a/code/modules/mining/abandoned_crates.dm +++ b/code/modules/mining/abandoned_crates.dm @@ -180,7 +180,7 @@ if(63 to 64) new /obj/item/clothing/shoes/kindle_kicks(src) if(65 to 66) - new /obj/item/clothing/suit/ianshirt(src) + new /obj/item/clothing/suit/costume/ianshirt(src) new /obj/item/clothing/suit/hooded/ian_costume(src) if(67 to 68) new /obj/item/toy/plush/awakenedplushie(src) diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index 801c3cf7b3c..c1a54a3caba 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -3,6 +3,7 @@ name = "explorer suit" desc = "An armoured suit for exploring harsh environments." icon_state = "explorer" + worn_icon = 'icons/mob/clothing/suits/utility.dmi' inhand_icon_state = "explorer" body_parts_covered = CHEST|GROIN|LEGS|ARMS cold_protection = CHEST|GROIN|LEGS|ARMS @@ -68,6 +69,9 @@ . = ..() adjustmask() +/obj/item/clothing/suit/hooded/cloak + worn_icon = 'icons/mob/clothing/suits/armor.dmi' + /obj/item/clothing/suit/hooded/cloak/goliath name = "goliath cloak" icon_state = "goliath_cloak" diff --git a/code/modules/mining/lavaland/tendril_loot.dm b/code/modules/mining/lavaland/tendril_loot.dm index 6ee3f900a55..b142c0bf9c9 100644 --- a/code/modules/mining/lavaland/tendril_loot.dm +++ b/code/modules/mining/lavaland/tendril_loot.dm @@ -449,9 +449,9 @@ /obj/item/shared_storage/red/Initialize(mapload) . = ..() - + create_storage(max_total_storage = 15, max_slots = 21) - + new /obj/item/shared_storage/blue(drop_location(), src) /obj/item/shared_storage/blue/Initialize(mapload, atom/master) @@ -594,6 +594,7 @@ name = "berserker armor" desc = "Voices echo from the armor, driving the user insane. Is not space-proof." icon_state = "berserker" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' hoodtype = /obj/item/clothing/head/hooded/berserker armor = list(MELEE = 30, BULLET = 30, LASER = 10, ENERGY = 20, BOMB = 50, BIO = 0, FIRE = 100, ACID = 100) cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS diff --git a/code/modules/mob/living/simple_animal/hostile/skeleton.dm b/code/modules/mob/living/simple_animal/hostile/skeleton.dm index e0241f672c7..01f944e7048 100644 --- a/code/modules/mob/living/simple_animal/hostile/skeleton.dm +++ b/code/modules/mob/living/simple_animal/hostile/skeleton.dm @@ -73,7 +73,7 @@ melee_damage_upper = 30 deathmessage = "collapses into a pile of bones, its gear clanging as it hits the ground!" loot = list(/obj/effect/decal/remains/human, - /obj/item/clothing/suit/armor/riot/chaplain, + /obj/item/clothing/suit/chaplainsuit/armor/templar, /obj/item/clothing/head/helmet/chaplain, /obj/item/claymore/weak{name = "holy sword"}) diff --git a/code/modules/mob_spawn/corpses/mob_corpses.dm b/code/modules/mob_spawn/corpses/mob_corpses.dm index ce7809e87a4..7e0fd1efd6d 100644 --- a/code/modules/mob_spawn/corpses/mob_corpses.dm +++ b/code/modules/mob_spawn/corpses/mob_corpses.dm @@ -86,7 +86,7 @@ /datum/outfit/piratecorpse/ranged name = "Pirate Gunner Corpse" - suit = /obj/item/clothing/suit/pirate + suit = /obj/item/clothing/suit/costume/pirate head = /obj/item/clothing/head/pirate @@ -135,7 +135,7 @@ /datum/outfit/russiancorpse/officer name = "Russian Officer Corpse" uniform = /obj/item/clothing/under/costume/russian_officer - suit = /obj/item/clothing/suit/security/officer/russian + suit = /obj/item/clothing/suit/jacket/officer/tan shoes = /obj/item/clothing/shoes/combat ears = /obj/item/radio/headset head = /obj/item/clothing/head/ushanka diff --git a/code/modules/research/xenobiology/crossbreeding/_clothing.dm b/code/modules/research/xenobiology/crossbreeding/_clothing.dm index 0c3d45eee82..30b305a7bab 100644 --- a/code/modules/research/xenobiology/crossbreeding/_clothing.dm +++ b/code/modules/research/xenobiology/crossbreeding/_clothing.dm @@ -129,6 +129,7 @@ Slimecrossing Armor name = "adamantine armor" desc = "A full suit of adamantine plate armor. Impressively resistant to damage, but weighs about as much as you do." icon_state = "adamsuit" + worn_icon = 'icons/mob/clothing/suits/armor.dmi' inhand_icon_state = "adamsuit" flags_inv = NONE obj_flags = IMMUTABLE_SLOW diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm index f0c8a097ba4..726f34f738b 100644 --- a/code/modules/vending/autodrobe.dm +++ b/code/modules/vending/autodrobe.dm @@ -8,7 +8,7 @@ product_slogans = "Dress for success!;Suited and booted!;It's show time!;Why leave style up to fate? Use AutoDrobe!" vend_reply = "Thank you for using AutoDrobe!" products = list( - /obj/item/clothing/suit/chickensuit = 1, + /obj/item/clothing/suit/costume/chickensuit = 1, /obj/item/clothing/head/chicken = 1, /obj/item/clothing/under/rank/civilian/clown/blue = 1, /obj/item/clothing/under/rank/civilian/clown/green = 1, @@ -55,13 +55,13 @@ /obj/item/clothing/under/suit/waiter = 1, /obj/item/clothing/suit/jacket/miljacket = 1, /obj/item/clothing/under/costume/pirate = 1, - /obj/item/clothing/suit/pirate = 1, + /obj/item/clothing/suit/costume/pirate = 1, /obj/item/clothing/head/pirate = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/under/costume/soviet = 1, /obj/item/clothing/head/ushanka = 1, - /obj/item/clothing/suit/imperium_monk = 1, + /obj/item/clothing/suit/costume/imperium_monk = 1, /obj/item/clothing/mask/gas/cyborg = 1, /obj/item/clothing/suit/chaplainsuit/holidaypriest = 1, /obj/item/clothing/suit/chaplainsuit/whiterobe = 1, @@ -98,9 +98,9 @@ /obj/item/clothing/head/cowboy_hat_black =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, - /obj/item/clothing/suit/poncho = 1, - /obj/item/clothing/suit/poncho/green = 1, - /obj/item/clothing/suit/poncho/red = 1, + /obj/item/clothing/suit/costume/poncho = 1, + /obj/item/clothing/suit/costume/poncho/green = 1, + /obj/item/clothing/suit/costume/poncho/red = 1, /obj/item/clothing/head/maidheadband = 1, /obj/item/clothing/under/costume/maid = 1, /obj/item/clothing/gloves/maid = 1, @@ -108,7 +108,7 @@ /obj/item/clothing/under/rank/civilian/janitor/maid = 1, /obj/item/clothing/glasses/cold=1, /obj/item/clothing/glasses/heat=1, - /obj/item/clothing/suit/whitedress = 1, + /obj/item/clothing/suit/costume/whitedress = 1, /obj/item/clothing/under/rank/civilian/clown/jester = 1, /obj/item/clothing/head/jester = 1, /obj/item/clothing/under/costume/villain = 1, @@ -119,9 +119,9 @@ /obj/item/clothing/suit/hooded/carp_costume = 1, /obj/item/clothing/suit/hooded/ian_costume = 1, /obj/item/clothing/suit/hooded/bee_costume = 1, - /obj/item/clothing/suit/snowman = 1, + /obj/item/clothing/suit/costume/snowman = 1, /obj/item/clothing/head/snowman = 1, - /obj/item/clothing/suit/joker = 1, + /obj/item/clothing/suit/costume/joker = 1, /obj/item/clothing/under/costume/joker = 1, /obj/item/clothing/mask/joy = 1, /obj/item/clothing/head/cueball = 1, @@ -132,18 +132,18 @@ /obj/item/clothing/head/delinquent = 1, /obj/item/clothing/head/wig/random = 3, /obj/item/clothing/head/shrine_wig = 1, - /obj/item/clothing/suit/shrine_maiden = 1, - /obj/item/clothing/suit/changshan_red = 1, - /obj/item/clothing/suit/changshan_blue = 1, - /obj/item/clothing/suit/cheongsam_red = 1, - /obj/item/clothing/suit/cheongsam_blue = 1, + /obj/item/clothing/suit/costume/shrine_maiden = 1, + /obj/item/clothing/suit/costume/changshan_red = 1, + /obj/item/clothing/suit/costume/changshan_blue = 1, + /obj/item/clothing/suit/costume/cheongsam_red = 1, + /obj/item/clothing/suit/costume/cheongsam_blue = 1, /obj/item/gohei = 1, /obj/item/clothing/under/rank/medical/doctor/nurse = 1, /obj/item/clothing/mask/gas/prop = 4, /obj/item/clothing/mask/gas/atmosprop = 3, ) contraband = list( - /obj/item/clothing/suit/judgerobe = 1, + /obj/item/clothing/suit/costume/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand/nothing = 2, /obj/item/clothing/glasses/sunglasses/gar = 2, @@ -151,7 +151,7 @@ /obj/item/clothing/mask/muzzle = 2, ) premium = list( - /obj/item/clothing/suit/pirate/captain = 2, + /obj/item/clothing/suit/costume/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/under/rank/civilian/clown/rainbow = 1, /obj/item/clothing/head/helmet/roman/fake = 1, diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm index 2079845a7d9..c8d42d9aced 100644 --- a/code/modules/vending/clothesmate.dm +++ b/code/modules/vending/clothesmate.dm @@ -97,14 +97,14 @@ /obj/item/clothing/head/cowboy_hat_grey = 1, /obj/item/clothing/glasses/monocle = 1, /obj/item/clothing/head/sombrero = 1, - /obj/item/clothing/suit/poncho = 1, + /obj/item/clothing/suit/costume/poncho = 1, /obj/item/clothing/under/costume/kilt = 1, /obj/item/clothing/under/dress/sundress = 1, /obj/item/clothing/under/dress/striped = 1, /obj/item/clothing/under/dress/sailor = 1, /obj/item/clothing/under/dress/redeveninggown = 1, /obj/item/clothing/under/dress/blacktango = 1, - /obj/item/clothing/suit/ianshirt = 1, + /obj/item/clothing/suit/costume/ianshirt = 1, /obj/item/clothing/shoes/laceup = 2, /obj/item/clothing/shoes/sandal = 2, /obj/item/clothing/shoes/winterboots = 2, @@ -120,59 +120,59 @@ /obj/item/clothing/under/suit/henchmen = 20, /obj/item/clothing/under/costume/yakuza = 20, /obj/item/clothing/shoes/yakuza = 20, - /obj/item/clothing/suit/yakuza = 20, + /obj/item/clothing/suit/costume/yakuza = 20, /obj/item/clothing/under/costume/jackbros = 20, /obj/item/clothing/shoes/jackbros = 20, /obj/item/clothing/head/jackbros = 20, /obj/item/clothing/under/costume/dutch = 20, /obj/item/clothing/head/bowler = 20, - /obj/item/clothing/suit/dutch = 20, + /obj/item/clothing/suit/costume/dutch = 20, /obj/item/clothing/shoes/cowboy = 20, - /obj/item/clothing/suit/irs = 20, + /obj/item/clothing/suit/costume/irs = 20, /obj/item/clothing/under/costume/irs = 20, /obj/item/clothing/head/irs = 20, - /obj/item/clothing/suit/osi = 20, + /obj/item/clothing/suit/costume/osi = 20, /obj/item/clothing/under/costume/osi = 20, /obj/item/clothing/glasses/osi = 20, - /obj/item/clothing/suit/tmc = 20, + /obj/item/clothing/suit/costume/tmc = 20, /obj/item/clothing/under/costume/tmc = 20, /obj/item/clothing/head/tmc = 20, - /obj/item/clothing/suit/pg = 20, + /obj/item/clothing/suit/costume/pg = 20, /obj/item/clothing/under/costume/pg = 20, /obj/item/clothing/head/pg = 20, - /obj/item/clothing/suit/driscoll = 20, + /obj/item/clothing/suit/costume/driscoll = 20, /obj/item/clothing/under/costume/driscoll = 20, /obj/item/clothing/mask/gas/driscoll = 20, - /obj/item/clothing/suit/deckers = 20, + /obj/item/clothing/suit/costume/deckers = 20, /obj/item/clothing/under/costume/deckers = 20, /obj/item/clothing/head/deckers = 20, /obj/item/clothing/shoes/deckers = 20, - /obj/item/clothing/suit/morningstar = 20, + /obj/item/clothing/suit/costume/morningstar = 20, /obj/item/clothing/under/costume/morningstar = 20, /obj/item/clothing/head/morningstar = 20, /obj/item/clothing/shoes/morningstar = 20, - /obj/item/clothing/suit/saints = 20, + /obj/item/clothing/suit/costume/saints = 20, /obj/item/clothing/under/costume/saints = 20, /obj/item/clothing/head/saints = 20, /obj/item/clothing/shoes/saints = 20, - /obj/item/clothing/suit/phantom = 20, + /obj/item/clothing/suit/costume/phantom = 20, /obj/item/clothing/under/costume/phantom = 20, /obj/item/clothing/glasses/phantom = 20, /obj/item/clothing/shoes/phantom = 20, - /obj/item/clothing/suit/allies = 20, + /obj/item/clothing/suit/costume/allies = 20, /obj/item/clothing/under/costume/allies = 20, /obj/item/clothing/head/allies = 20, - /obj/item/clothing/suit/soviet = 20, + /obj/item/clothing/suit/costume/soviet = 20, /obj/item/clothing/under/costume/soviet_families = 20, /obj/item/clothing/head/ushanka/soviet = 20, - /obj/item/clothing/suit/yuri = 20, + /obj/item/clothing/suit/costume/yuri = 20, /obj/item/clothing/under/costume/yuri = 20, /obj/item/clothing/head/yuri = 20, - /obj/item/clothing/suit/sybil_slickers = 20, + /obj/item/clothing/suit/costume/sybil_slickers = 20, /obj/item/clothing/under/costume/sybil_slickers = 20, /obj/item/clothing/head/sybil_slickers = 20, /obj/item/clothing/shoes/sybil_slickers = 20, - /obj/item/clothing/suit/basil_boys = 20, + /obj/item/clothing/suit/costume/basil_boys = 20, /obj/item/clothing/under/costume/basil_boys = 20, /obj/item/clothing/head/basil_boys = 20, /obj/item/clothing/shoes/basil_boys = 20, diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm index baedc8203fb..54d203a4f61 100644 --- a/code/modules/vending/engineering.dm +++ b/code/modules/vending/engineering.dm @@ -24,7 +24,7 @@ /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, /obj/item/light/tube = 10, - /obj/item/clothing/suit/fire = 4, + /obj/item/clothing/suit/utility/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 2f92ef97822..73f46dcfddb 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -33,7 +33,7 @@ ) premium = list( /obj/item/clothing/under/rank/security/officer/formal = 3, - /obj/item/clothing/suit/security/officer = 3, + /obj/item/clothing/suit/jacket/officer/blue = 3, /obj/item/clothing/head/beret/sec/navyofficer = 3, ) refill_canister = /obj/item/vending_refill/wardrobe/sec_wardrobe @@ -530,23 +530,23 @@ /obj/item/clothing/under/rank/security/detective = 2, /obj/item/clothing/under/rank/security/detective/skirt = 2, /obj/item/clothing/shoes/sneakers/brown = 2, - /obj/item/clothing/suit/det_suit = 2, + /obj/item/clothing/suit/jacket/det_suit = 2, /obj/item/clothing/head/fedora/det_hat = 2, /obj/item/clothing/under/rank/security/detective/noir = 2, /obj/item/clothing/under/rank/security/detective/noir/skirt = 2, /obj/item/clothing/accessory/waistcoat = 2, /obj/item/clothing/shoes/laceup = 2, - /obj/item/clothing/suit/det_suit/dark = 1, - /obj/item/clothing/suit/det_suit/noir = 1, + /obj/item/clothing/suit/jacket/det_suit/dark = 1, + /obj/item/clothing/suit/jacket/det_suit/noir = 1, /obj/item/clothing/head/fedora = 2, /obj/item/clothing/gloves/color/black = 2, /obj/item/clothing/gloves/color/latex = 2, /obj/item/clothing/under/rank/security/detective/disco = 1, - /obj/item/clothing/suit/det_suit/disco = 1, + /obj/item/clothing/suit/jacket/det_suit/disco = 1, /obj/item/clothing/shoes/discoshoes = 1, /obj/item/clothing/neck/tie/disco = 1, /obj/item/clothing/under/rank/security/detective/kim = 1, - /obj/item/clothing/suit/det_suit/kim = 1, + /obj/item/clothing/suit/jacket/det_suit/kim = 1, /obj/item/clothing/shoes/kim = 1, /obj/item/clothing/gloves/kim = 1, /obj/item/clothing/glasses/regular/kim = 1, diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi deleted file mode 100644 index ed5f5a55277..00000000000 Binary files a/icons/mob/clothing/suit.dmi and /dev/null differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi new file mode 100644 index 00000000000..648b56f2bbc Binary files /dev/null and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/bio.dmi b/icons/mob/clothing/suits/bio.dmi new file mode 100644 index 00000000000..94740791e66 Binary files /dev/null and b/icons/mob/clothing/suits/bio.dmi differ diff --git a/icons/mob/clothing/suits/chaplain.dmi b/icons/mob/clothing/suits/chaplain.dmi new file mode 100644 index 00000000000..3585b6cd66c Binary files /dev/null and b/icons/mob/clothing/suits/chaplain.dmi differ diff --git a/icons/mob/clothing/suits/costume.dmi b/icons/mob/clothing/suits/costume.dmi new file mode 100644 index 00000000000..da598ab1e15 Binary files /dev/null and b/icons/mob/clothing/suits/costume.dmi differ diff --git a/icons/mob/clothing/suits/default.dmi b/icons/mob/clothing/suits/default.dmi new file mode 100644 index 00000000000..94e1b3d1352 Binary files /dev/null and b/icons/mob/clothing/suits/default.dmi differ diff --git a/icons/mob/clothing/suits/jacket.dmi b/icons/mob/clothing/suits/jacket.dmi new file mode 100644 index 00000000000..30a97025df7 Binary files /dev/null and b/icons/mob/clothing/suits/jacket.dmi differ diff --git a/icons/mob/clothing/suits/labcoat.dmi b/icons/mob/clothing/suits/labcoat.dmi new file mode 100644 index 00000000000..8510d62d63f Binary files /dev/null and b/icons/mob/clothing/suits/labcoat.dmi differ diff --git a/icons/mob/clothing/suits/spacesuit.dmi b/icons/mob/clothing/suits/spacesuit.dmi new file mode 100644 index 00000000000..b969ab91556 Binary files /dev/null and b/icons/mob/clothing/suits/spacesuit.dmi differ diff --git a/icons/mob/clothing/suits/utility.dmi b/icons/mob/clothing/suits/utility.dmi new file mode 100644 index 00000000000..7e5bce03658 Binary files /dev/null and b/icons/mob/clothing/suits/utility.dmi differ diff --git a/icons/mob/clothing/suits/wizard.dmi b/icons/mob/clothing/suits/wizard.dmi new file mode 100644 index 00000000000..e8ac43bb6ca Binary files /dev/null and b/icons/mob/clothing/suits/wizard.dmi differ diff --git a/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt b/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt new file mode 100644 index 00000000000..c09dee8d0e1 --- /dev/null +++ b/tools/UpdatePaths/Scripts/68417_mob_suit_repath.txt @@ -0,0 +1,76 @@ +#comment This replaces all mob icon suit paths https://github.com/tgstation/tgstation/pull/68417 + +/obj/item/clothing/suit/bronze : /obj/item/clothing/suit/costume/bronze {@OLD} +/obj/item/clothing/suit/hawaiian : /obj/item/clothing/suit/costume/hawaiian {@OLD} +/obj/item/clothing/suit/ianshirt : /obj/item/clothing/suit/costume/ianshirt {@OLD} +/obj/item/clothing/suit/curator : /obj/item/clothing/suit/jacket/curator {@OLD} +/obj/item/clothing/suit/beekeeper_suit : /obj/item/clothing/suit/utility/beekeeper_suit {@OLD} +/obj/item/clothing/suit/radiation : /obj/item/clothing/suit/utility/radiation {@OLD} +/obj/item/clothing/suit/snowman : /obj/item/clothing/suit/costume/snowman {@OLD} +/obj/item/clothing/suit/pirate : /obj/item/clothing/suit/costume/pirate {@OLD} +/obj/item/clothing/suit/cardborg : /obj/item/clothing/suit/costume/cardborg {@OLD} +/obj/item/clothing/suit/fire/firefighter : /obj/item/clothing/suit/utility/fire/firefighter {@OLD} +/obj/item/clothing/suit/det_suit : /obj/item/clothing/suit/jacket/det_suit {@OLD} +/obj/item/clothing/suit/justice : /obj/item/clothing/suit/costume/justice {@OLD} +/obj/item/clothing/suit/straight_jacket : /obj/item/clothing/suit/jacket/straight_jacket {@OLD} +/obj/item/clothing/suit/cyborg_suit : /obj/item/clothing/suit/costume/cyborg_suit {@OLD} +/obj/item/clothing/suit/security/officer : /obj/item/clothing/suit/jacket/officer/blue {@OLD} +/obj/item/clothing/suit/security/warden : /obj/item/clothing/suit/jacket/warden/blue {@OLD} +/obj/item/clothing/suit/security/hos : /obj/item/clothing/suit/jacket/hos/blue {@OLD} +/obj/item/clothing/suit/nerdshirt : /obj/item/clothing/suit/costume/nerdshirt {@OLD} +/obj/item/clothing/suit/xenos : /obj/item/clothing/suit/costume/xenos {@OLD} +/obj/item/clothing/suit/monkeysuit : /obj/item/clothing/suit/costume/monkeysuit {@OLD} +/obj/item/clothing/suit/judgerobe : /obj/item/clothing/suit/costume/judgerobe {@OLD} +/obj/item/clothing/suit/chickensuit : /obj/item/clothing/suit/costume/chickensuit {@OLD} +/obj/item/clothing/suit/ghost_sheet : /obj/item/clothing/suit/costume/ghost_sheet {@OLD} +/obj/item/clothing/suit/imperium_monk : /obj/item/clothing/suit/costume/imperium_monk {@OLD} +/obj/item/clothing/suit/poncho : /obj/item/clothing/suit/costume/poncho {@OLD} +/obj/item/clothing/suit/poncho/green : /obj/item/clothing/suit/costume/poncho/green {@OLD} +/obj/item/clothing/suit/poncho/red : /obj/item/clothing/suit/costume/poncho/red {@OLD} +/obj/item/clothing/suit/armor/plate/crusader : /obj/item/clothing/suit/chaplainsuit/armor/crusader {@OLD} +/obj/item/clothing/suit/armor/plate/crusader/red : /obj/item/clothing/suit/chaplainsuit/armor/crusader/red {@OLD} +/obj/item/clothing/suit/armor/plate/crusader/blue : /obj/item/clothing/suit/chaplainsuit/armor/crusader/blue {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/clock : /obj/item/clothing/suit/chaplainsuit/armor/clock {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain : /obj/item/clothing/suit/chaplainsuit/armor/templar {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/studentuni : /obj/item/clothing/suit/chaplainsuit/armor/studentuni {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/ancient : /obj/item/clothing/suit/chaplainsuit/armor/ancient {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/witchhunter : /obj/item/clothing/suit/chaplainsuit/armor/witchhunter {@OLD} +/obj/item/clothing/suit/armor/riot/chaplain/adept : /obj/item/clothing/suit/chaplainsuit/armor/adept {@OLD} +/obj/item/clothing/suit/capjacket : /obj/item/clothing/suit/jacket/capjacket {@OLD} +/obj/item/clothing/suit/fire/atmos : /obj/item/clothing/suit/utility/fire/atmos {@OLD} +/obj/item/clothing/suit/bomb_suit : /obj/item/clothing/suit/utility/bomb_suit {@OLD} +/obj/item/clothing/suit/bomb_suit/security : /obj/item/clothing/suit/utility/bomb_suit/security {@OLD} +/obj/item/clothing/suit/bomb_suit/white : /obj/item/clothing/suit/utility/bomb_suit/white {@OLD} +/obj/item/clothing/suit/striped_sweater : /obj/item/clothing/suit/costume/striped_sweater {@OLD} +/obj/item/clothing/suit/yakuza : /obj/item/clothing/suit/costume/yakuza {@OLD} +/obj/item/clothing/suit/dutch : /obj/item/clothing/suit/costume/dutch {@OLD} +/obj/item/clothing/suit/irs : /obj/item/clothing/suit/costume/irs {@OLD} +/obj/item/clothing/suit/osi : /obj/item/clothing/suit/costume/osi {@OLD} +/obj/item/clothing/suit/tmc : /obj/item/clothing/suit/costume/tmc {@OLD} +/obj/item/clothing/suit/pg : /obj/item/clothing/suit/costume/pg {@OLD} +/obj/item/clothing/suit/driscoll : /obj/item/clothing/suit/costume/driscoll {@OLD} +/obj/item/clothing/suit/deckers : /obj/item/clothing/suit/costume/deckers {@OLD} +/obj/item/clothing/suit/morningstar : /obj/item/clothing/suit/costume/morningstar {@OLD} +/obj/item/clothing/suit/saints : /obj/item/clothing/suit/costume/saints {@OLD} +/obj/item/clothing/suit/phantom : /obj/item/clothing/suit/costume/phantom {@OLD} +/obj/item/clothing/suit/allies : /obj/item/clothing/suit/costume/allies {@OLD} +/obj/item/clothing/suit/soviet : /obj/item/clothing/suit/costume/soviet {@OLD} +/obj/item/clothing/suit/yuri : /obj/item/clothing/suit/costume/yuri {@OLD} +/obj/item/clothing/suit/sybil_slickers : /obj/item/clothing/suit/costume/sybil_slickers {@OLD} +/obj/item/clothing/suit/basil_boys : /obj/item/clothing/suit/costume/basil_boys {@OLD} +/obj/item/clothing/suit/pirate/armored : /obj/item/clothing/suit/costume/pirate/armored {@OLD} +/obj/item/clothing/suit/pirate/captain : /obj/item/clothing/suit/costume/pirate/captain {@OLD} +/obj/item/clothing/suit/ghost_sheet/spooky : /obj/item/clothing/suit/costume/ghost_sheet/spooky {@OLD} +/obj/item/clothing/suit/det_suit/dark : /obj/item/clothing/suit/jacket/det_suit/dark {@OLD} +/obj/item/clothing/suit/det_suit/noir : /obj/item/clothing/suit/jacket/det_suit/noir {@OLD} +/obj/item/clothing/suit/det_suit/kim : /obj/item/clothing/suit/jacket/det_suit/kim {@OLD} +/obj/item/clothing/suit/det_suit/disco : /obj/item/clothing/suit/jacket/det_suit/disco {@OLD} +/obj/item/clothing/suit/bunnysuit : /obj/item/clothing/suit/costume/bunnysuit {@OLD} +/obj/item/clothing/suit/security/officer/russian : /obj/item/clothing/suit/jacket/officer/tan {@OLD} +/obj/item/clothing/suit/whitedress : /obj/item/clothing/suit/costume/whitedress {@OLD} +/obj/item/clothing/suit/shrine_maiden : /obj/item/clothing/suit/costume/shrine_maiden {@OLD} +/obj/item/clothing/suit/changshan_red : /obj/item/clothing/suit/costume/changshan_red {@OLD} +/obj/item/clothing/suit/changshan_blue : /obj/item/clothing/suit/costume/changshan_blue {@OLD} +/obj/item/clothing/suit/cheongsam_red : /obj/item/clothing/suit/costume/cheongsam_red {@OLD} +/obj/item/clothing/suit/cheongsam_blue : /obj/item/clothing/suit/costume/cheongsam_blue {@OLD} +/obj/item/clothing/suit/joker : /obj/item/clothing/suit/costume/joker {@OLD}