diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm index 63297b88dfa..b693667b128 100644 --- a/_maps/map_files/Delta/delta.dmm +++ b/_maps/map_files/Delta/delta.dmm @@ -90112,12 +90112,14 @@ /area/atmos) "imS" = ( /obj/structure/table/wood, -/obj/item/clothing/under/soldieruniform, /obj/machinery/light_switch{ dir = 1; name = "south bump"; pixel_y = -24 }, +/obj/item/clothing/suit/soldiercoat, +/obj/item/clothing/under/soldieruniform, +/obj/item/clothing/head/stalhelm, /turf/simulated/floor/wood, /area/clownoffice) "inx" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm index 47f11dfe3ff..21ef6984c12 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/ussp.dmm @@ -2,7 +2,7 @@ "aa" = ( /obj/effect/landmark/burnturf, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="cautionfull"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -631,7 +631,7 @@ /area/ruin/space/derelict/bridge) "bE" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "dark"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="dark"); icon_state = "4-i" }, /area/ruin/space/derelict/arrival) @@ -1600,13 +1600,13 @@ /obj/item/clothing/shoes/jackboots, /obj/item/clothing/shoes/jackboots, /obj/effect/decal/cleanable/dirt, -/obj/item/clothing/head/panzer{ - desc = "An oldschool military softcap."; - name = "old military cap" +/obj/item/clothing/head/foragecap{ + desc = "The softcap worn by mech pilots."; + name = "forage cap" }, -/obj/item/clothing/head/panzer{ - desc = "An oldschool military softcap."; - name = "old military cap" +/obj/item/clothing/head/foragecap{ + desc = "The softcap worn by mech pilots."; + name = "forage cap" }, /turf/simulated/floor/plasteel, /area/ruin/space/derelict/crew_quarters) @@ -2007,7 +2007,7 @@ }) "eM" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "purplefull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="purplefull"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -2146,7 +2146,7 @@ }) "eZ" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "cautionfull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="cautionfull"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -3177,7 +3177,7 @@ dir = 1 }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="whiteredfull"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -3796,7 +3796,7 @@ }) "iD" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "engine"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="engine"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -6116,7 +6116,7 @@ dir = 8 }, /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "whiteredfull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="whiteredfull"); icon_state = "4-i" }, /area/ruin/space/derelict/eva{ @@ -6310,7 +6310,7 @@ }) "nU" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "hydrofloor"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="hydrofloor"); icon_state = "4-i" }, /area/ruin/space/derelict/crew_quarters) @@ -6861,7 +6861,7 @@ /area/ruin/space/derelict/crew_quarters) "pj" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "orangefull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="orangefull"); icon_state = "4-i" }, /area/ruin/space/derelict/crew_quarters) @@ -7241,7 +7241,7 @@ /area/ruin/space/derelict/arrival) "qk" = ( /turf/simulated/wall/mineral/titanium/nodecon/tileblend{ - fixed_underlay = list("icon" = 'icons/turf/floors.dmi', "icon_state" = "redfull"); + fixed_underlay = list("icon"='icons/turf/floors.dmi',"icon_state"="redfull"); icon_state = "4-i" }, /area/ruin/space/derelict/arrival) @@ -7432,7 +7432,7 @@ /obj/item/trash/tapetrash, /obj/item/trash/pistachios, /obj/item/reagent_containers/syringe/charcoal{ - list_reagents = list("charcoal" = 13, "salmonella" = 2) + list_reagents = list("charcoal"=13,"salmonella"=2) }, /turf/simulated/floor/plasteel{ icon_state = "redfull" diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm index 108fed4b460..0c197942cb6 100644 --- a/_maps/map_files/cyberiad/cyberiad.dmm +++ b/_maps/map_files/cyberiad/cyberiad.dmm @@ -16556,7 +16556,8 @@ /turf/simulated/floor/plating, /area/crew_quarters/dorms) "aOi" = ( -/obj/item/clothing/head/naziofficer, +/obj/item/clothing/suit/officercoat, +/obj/item/clothing/head/armyofficer, /turf/simulated/floor/plating, /area/maintenance/fsmaint) "aOj" = ( @@ -25288,12 +25289,14 @@ /area/clownoffice) "bhj" = ( /obj/structure/table/wood, -/obj/item/clothing/under/soldieruniform, /obj/machinery/firealarm{ dir = 4; name = "east bump"; pixel_x = 24 }, +/obj/item/clothing/suit/soldiercoat, +/obj/item/clothing/under/soldieruniform, +/obj/item/clothing/head/stalhelm, /turf/simulated/floor/wood, /area/clownoffice) "bhk" = ( diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm index ef3732988a7..474f66d46be 100644 --- a/code/modules/awaymissions/corpse.dm +++ b/code/modules/awaymissions/corpse.dm @@ -439,7 +439,7 @@ mask = /obj/item/clothing/mask/gas/clown_hat l_pocket = /obj/item/bikehorn back = /obj/item/storage/backpack/clown - head = /obj/item/clothing/head/naziofficer + head = /obj/item/clothing/head/armyofficer /obj/effect/mob_spawn/human/mime name = "Mime" diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 5d44d924000..835da40d83f 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -332,7 +332,7 @@ "Vox" = 'icons/mob/clothing/species/vox/head.dmi' ) -/obj/item/clothing/head/stalhelm //Why do these exist +/obj/item/clothing/head/stalhelm //Why do these exist - Because they aren't specifically Nazi Germany name = "clown stalhelm" desc = "The typical clown soldier's helmet." icon_state = "stalhelm" @@ -340,18 +340,18 @@ flags = BLOCKHAIR flags_inv = HIDEEARS -/obj/item/clothing/head/panzer //Why +/obj/item/clothing/head/foragecap name = "clown HONKMech cap" desc = "The softcap worn by HONK Mech pilots." - icon_state = "panzercap" - item_state = "panzercap" + icon_state = "foragecap" + item_state = "foragecap" flags = BLOCKHAIR -/obj/item/clothing/head/naziofficer //Ah, come on +/obj/item/clothing/head/armyofficer name = "clown officer cap" - desc = "The peaked clown officer's cap, disturbingly similar to the warden's." - icon_state = "officercap" - item_state = "officercap" + desc = "The peaked clown officer's cap." + icon_state = "armyofficer" + item_state = "armyofficer" flags = BLOCKHAIR flags_inv = HIDEEARS diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm index f970d675eb5..cd5cfccfb51 100644 --- a/code/modules/clothing/suits/miscellaneous.dm +++ b/code/modules/clothing/suits/miscellaneous.dm @@ -81,13 +81,6 @@ flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT -/obj/item/clothing/suit/greatcoat - name = "great coat" - desc = "A Nazi great coat." //A what - icon_state = "nazi" - item_state = "nazi" - - /obj/item/clothing/suit/johnny_coat name = "johnny~~ coat" desc = "Johnny~~" @@ -851,7 +844,7 @@ /obj/item/clothing/suit/officercoat name = "clown officer's coat" - desc = "A classy clown officer's overcoat, also designed by Hugo Boss." //What and why + desc = "An overcoat for the clown officer, to keep him warm during those cold winter nights on the front." icon_state = "officersuit" item_state = "officersuit" ignore_suitadjust = 0 diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index 6da70fa990a..3ce1d20ff3e 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -658,7 +658,7 @@ /obj/item/clothing/under/officeruniform name = "clown officer's uniform" - desc = "For Clown officers, this uniform was designed by the great clown designer Hugo Boss." + desc = "For the officers of the Clown army." icon_state = "officeruniform" item_color = "officeruniform" body_parts_covered = UPPER_TORSO|LOWER_TORSO diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index 526c237b96a..4ae40dd517e 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi index 3bf65b0bc43..e80f27e803d 100644 Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi index f7fdd5a5eba..d37489e2dd8 100644 Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi index 517b7b16159..0f2c771b519 100644 Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi index 2c63f320bdb..336e415b9fa 100644 Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 9433e5399a3..e510002b63e 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b63979848b7..9e985c49b55 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index a0341248cb7..0f32e3bb400 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ