diff --git a/code/datums/outfits/outfit_antag.dm b/code/datums/outfits/outfit_antag.dm index 1a91b74fcd6..ad856abdd1c 100644 --- a/code/datums/outfits/outfit_antag.dm +++ b/code/datums/outfits/outfit_antag.dm @@ -190,7 +190,7 @@ uniform = list( /obj/item/clothing/under/serviceoveralls, /obj/item/clothing/under/det/zavod, - /obj/item/clothing/under/brown, + /obj/item/clothing/under/color/brown, /obj/item/clothing/under/syndicate/tracksuit, /obj/item/clothing/under/captainformal, /obj/item/clothing/under/dominia, diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index cb44d2f1eb6..9ef54fc2f1b 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -762,17 +762,17 @@ /obj/item/clothing/under/color/red, /obj/item/clothing/under/color/white, /obj/item/clothing/under/color/yellow, - /obj/item/clothing/under/lightblue, - /obj/item/clothing/under/aqua, - /obj/item/clothing/under/purple, - /obj/item/clothing/under/lightpurple, - /obj/item/clothing/under/lightgreen, - /obj/item/clothing/under/lightbrown, - /obj/item/clothing/under/brown, - /obj/item/clothing/under/yellowgreen, - /obj/item/clothing/under/darkblue, - /obj/item/clothing/under/lightred, - /obj/item/clothing/under/darkred + /obj/item/clothing/under/color/lightblue, + /obj/item/clothing/under/color/aqua, + /obj/item/clothing/under/color/purple, + /obj/item/clothing/under/color/lightpurple, + /obj/item/clothing/under/color/lightgreen, + /obj/item/clothing/under/color/lightbrown, + /obj/item/clothing/under/color/brown, + /obj/item/clothing/under/color/yellowgreen, + /obj/item/clothing/under/color/darkblue, + /obj/item/clothing/under/color/lightred, + /obj/item/clothing/under/color/darkred ) /obj/random/loot @@ -833,7 +833,6 @@ /obj/item/clothing/suit/storage/vest = 0.2, /obj/item/clothing/suit/syndicatefake = 0.6, /obj/item/clothing/under/overalls = 1, - /obj/item/clothing/under/rainbow = 0.9, /obj/item/clothing/under/syndicate/tacticool = 0.4, /obj/item/clothing/under/syndicate/tracksuit = 0.2, /obj/item/device/firing_pin = 0.3, diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index e86fca80cd4..d882ffbac75 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -18,26 +18,26 @@ /datum/gear/uniform/jumpsuit/New() ..() var/list/jumpsuit = list() - jumpsuit["grey jumpsuit"] = /obj/item/clothing/under/color/grey jumpsuit["black jumpsuit"] = /obj/item/clothing/under/color/black - jumpsuit["blue jumpsuit"] = /obj/item/clothing/under/color/blue - jumpsuit["green jumpsuit"] = /obj/item/clothing/under/color/green - jumpsuit["orange jumpsuit"] = /obj/item/clothing/under/color/orange - jumpsuit["pink jumpsuit"] = /obj/item/clothing/under/color/pink - jumpsuit["red jumpsuit"] = /obj/item/clothing/under/color/red + jumpsuit["grey jumpsuit"] = /obj/item/clothing/under/color/grey jumpsuit["white jumpsuit"] = /obj/item/clothing/under/color/white + jumpsuit["dark red jumpsuit"] = /obj/item/clothing/under/color/darkred + jumpsuit["red jumpsuit"] = /obj/item/clothing/under/color/red + jumpsuit["light red jumpsuit"] = /obj/item/clothing/under/color/lightred + jumpsuit["light brown jumpsuit"] = /obj/item/clothing/under/color/lightbrown + jumpsuit["brown jumpsuit"] = /obj/item/clothing/under/color/brown jumpsuit["yellow jumpsuit"] = /obj/item/clothing/under/color/yellow - jumpsuit["light blue jumpsuit"] = /obj/item/clothing/under/lightblue - jumpsuit["aqua jumpsuit"] = /obj/item/clothing/under/aqua - jumpsuit["purple jumpsuit"] = /obj/item/clothing/under/purple - jumpsuit["light purple jumpsuit"] = /obj/item/clothing/under/lightpurple - jumpsuit["light green jumpsuit"] = /obj/item/clothing/under/lightgreen - jumpsuit["brown jumpsuit"] = /obj/item/clothing/under/brown - jumpsuit["light brown jumpsuit"] = /obj/item/clothing/under/lightbrown - jumpsuit["yellow green jumpsuit"] = /obj/item/clothing/under/yellowgreen - jumpsuit["light red jumpsuit"] = /obj/item/clothing/under/lightred - jumpsuit["dark red jumpsuit"] = /obj/item/clothing/under/darkred - jumpsuit["rainbow jumpsuit"] = /obj/item/clothing/under/rainbow + jumpsuit["yellow green jumpsuit"] = /obj/item/clothing/under/color/yellowgreen + jumpsuit["light green jumpsuit"] = /obj/item/clothing/under/color/lightgreen + jumpsuit["green jumpsuit"] = /obj/item/clothing/under/color/green + jumpsuit["aqua jumpsuit"] = /obj/item/clothing/under/color/aqua + jumpsuit["light blue jumpsuit"] = /obj/item/clothing/under/color/lightblue + jumpsuit["blue jumpsuit"] = /obj/item/clothing/under/color/blue + jumpsuit["dark blue jumpsuit"] = /obj/item/clothing/under/color/darkblue + jumpsuit["purple jumpsuit"] = /obj/item/clothing/under/color/purple + jumpsuit["light purple jumpsuit"] = /obj/item/clothing/under/color/lightpurple + jumpsuit["pink jumpsuit"] = /obj/item/clothing/under/color/pink + jumpsuit["orange jumpsuit"] = /obj/item/clothing/under/color/orange gear_tweaks += new /datum/gear_tweak/path(jumpsuit) /datum/gear/uniform/colorjumpsuit diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 0e122c6013c..6b75ad5fed1 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -1,33 +1,25 @@ -/obj/item/clothing/under/color/black - name = "black jumpsuit" - icon_state = "black" - item_state = "bl_suit" - worn_state = "black" - -/obj/item/clothing/under/color/blue - name = "blue jumpsuit" - icon_state = "blue" - item_state = "b_suit" - worn_state = "blue" - -/obj/item/clothing/under/color/green - name = "green jumpsuit" - icon_state = "green" - item_state = "g_suit" - worn_state = "green" - -/obj/item/clothing/under/color/grey +/obj/item/clothing/under/color name = "grey jumpsuit" + desc = "A basic jumpsuit." + desc_info = "Jumpsuits can have their sleeves rolled up/down via the Roll Up/Down Sleeves verb, and also have their upper body part be up/down via the \ + the Rolled Up/Down verb." + icon = 'icons/clothing/under/uniforms/jumpsuits.dmi' icon_state = "grey" - item_state = "gy_suit" - worn_state = "grey" + item_state = "grey" + item_icons = null + contained_sprite = TRUE + +/obj/item/clothing/under/color/colorable + name = "colorable jumpsuit" + desc = "A colorable non-descript jumpsuit." + icon_state = "colorable" + item_state = "colorable" /obj/item/clothing/under/color/orange name = "orange jumpsuit" desc = "It's standardised prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position." icon_state = "orange" - item_state = "o_suit" - worn_state = "orange" + item_state = "orange" has_sensor = 2 sensor_mode = 3 var/id @@ -48,124 +40,117 @@ desc = "It's standardised SCC prisoner-wear. Its suit sensors are stuck in the \"Fully On\" position.\nThis one has \"Cell 4\" marked on it." id = "Cell 4" -/obj/item/clothing/under/color/pink - name = "pink jumpsuit" - icon_state = "pink" - item_state = "p_suit" - worn_state = "pink" +/obj/item/clothing/under/color/black + name = "black jumpsuit" + desc = "A black jumpsuit." + icon_state = "black" + item_state = "black" -/obj/item/clothing/under/color/red - name = "red jumpsuit" - icon_state = "red" - item_state = "r_suit" - worn_state = "red" +/obj/item/clothing/under/color/grey + name = "grey jumpsuit" + desc = "A grey jumpsuit." + icon_state = "grey" + item_state = "grey" /obj/item/clothing/under/color/white name = "white jumpsuit" + desc = "A white jumpsuit." icon_state = "white" - item_state = "w_suit" - worn_state = "white" + item_state = "white" + +/obj/item/clothing/under/color/darkred + name = "darkred jumpsuit" + desc = "A dark red jumpsuit." + icon_state = "darkred" + item_state = "darkred" + +/obj/item/clothing/under/color/red + name = "red jumpsuit" + desc = "A red jumpsuit." + icon_state = "red" + item_state = "red" + +/obj/item/clothing/under/color/lightred + name = "lightred jumpsuit" + desc = "A light red jumpsuit." + icon_state = "lightred" + item_state = "lightred" + +/obj/item/clothing/under/color/lightbrown + name = "lightbrown jumpsuit" + desc = "A light brown jumpsuit." + icon_state = "lightbrown" + item_state = "lightbrown" + +/obj/item/clothing/under/color/brown + name = "brown jumpsuit" + desc = "A brown jumpsuit." + icon_state = "brown" + item_state = "brown" /obj/item/clothing/under/color/yellow name = "yellow jumpsuit" + desc = "A yellow jumpsuit." icon_state = "yellow" - item_state = "y_suit" - worn_state = "yellow" + item_state = "yellow" -/obj/item/clothing/under/psyche - name = "psychedelic jumpsuit" - desc = "Groovy!" - icon_state = "psyche" - item_state = "psyche" - worn_state = "psyche" - -/obj/item/clothing/under/rainbow - name = "rainbow" - desc = "rainbow" - icon_state = "rainbow" - item_state = "rainbow" - worn_state = "rainbow" - -/obj/item/clothing/under/lightblue - name = "lightblue jumpsuit" - desc = "lightblue" - icon_state = "lightblue" - item_state = "b_suit" - worn_state = "lightblue" - -/obj/item/clothing/under/aqua - name = "aqua jumpsuit" - desc = "aqua" - icon_state = "aqua" - item_state = "b_suit" - worn_state = "aqua" - -/obj/item/clothing/under/purple - name = "purple jumpsuit" - desc = "purple" - icon_state = "purple" - item_state = "p_suit" - worn_state = "purple" - -/obj/item/clothing/under/lightpurple - name = "lightpurple jumpsuit" - desc = "lightpurple" - icon_state = "lightpurple" - item_state = "p_suit" - worn_state = "lightpurple" - -/obj/item/clothing/under/lightgreen - name = "lightgreen jumpsuit" - desc = "lightgreen" - icon_state = "lightgreen" - item_state = "g_suit" - worn_state = "lightgreen" - -/obj/item/clothing/under/lightbrown - name = "lightbrown jumpsuit" - desc = "lightbrown" - icon_state = "lightbrown" - item_state = "lb_suit" - worn_state = "lightbrown" - -/obj/item/clothing/under/brown - name = "brown jumpsuit" - desc = "brown" - icon_state = "brown" - item_state = "lb_suit" - worn_state = "brown" - -/obj/item/clothing/under/yellowgreen +/obj/item/clothing/under/color/yellowgreen name = "yellowgreen jumpsuit" - desc = "yellowgreen" + desc = "A yellow green jumpsuit." icon_state = "yellowgreen" - item_state = "y_suit" - worn_state = "yellowgreen" + item_state = "yellowgreen" -/obj/item/clothing/under/darkblue +/obj/item/clothing/under/color/lightgreen + name = "lightgreen jumpsuit" + desc = "A light green jumpsuit." + icon_state = "lightgreen" + item_state = "lightgreen" + +/obj/item/clothing/under/color/green + name = "green jumpsuit" + desc = "A green jumpsuit." + icon_state = "green" + item_state = "green" + +/obj/item/clothing/under/color/aqua + name = "aqua jumpsuit" + desc = "An aqua jumpsuit." + icon_state = "aqua" + item_state = "aqua" + +/obj/item/clothing/under/color/lightblue + name = "lightblue jumpsuit" + desc = "A light blue jumpsuit." + icon_state = "lightblue" + item_state = "lightblue" + +/obj/item/clothing/under/color/blue + name = "blue jumpsuit" + desc = "A blue jumpsuit." + icon_state = "blue" + item_state = "blue" + +/obj/item/clothing/under/color/darkblue name = "darkblue jumpsuit" - desc = "darkblue" + desc = "A dark blue jumpsuit." icon_state = "darkblue" - item_state = "b_suit" - worn_state = "darkblue" + item_state = "darkblue" -/obj/item/clothing/under/lightred - name = "lightred jumpsuit" - desc = "lightred" - icon_state = "lightred" - item_state = "r_suit" - worn_state = "lightred" +/obj/item/clothing/under/color/purple + name = "purple jumpsuit" + desc = "A purple jumpsuit." + icon_state = "purple" + item_state = "purple" -/obj/item/clothing/under/darkred - name = "darkred jumpsuit" - desc = "darkred" - icon_state = "darkred" - item_state = "r_suit" - worn_state = "darkred" +/obj/item/clothing/under/color/lightpurple + name = "lightpurple jumpsuit" + desc = "A light purple jumpsuit." + icon_state = "lightpurple" + item_state = "lightpurple" + +/obj/item/clothing/under/color/pink + name = "pink jumpsuit" + desc = "A pink jumpsuit." + icon_state = "pink" + item_state = "pink" -/obj/item/clothing/under/color/colorable - name = "colorable jumpsuit" - desc = "A non-descript jumpsuit in 167,777,216 designer colors." - icon_state = "white" - item_state = "w_suit" - worn_state = "colorable" diff --git a/html/changelogs/cm_jumpsuits.yml b/html/changelogs/cm_jumpsuits.yml new file mode 100644 index 00000000000..1bfe4c43dfc --- /dev/null +++ b/html/changelogs/cm_jumpsuits.yml @@ -0,0 +1,8 @@ +author: Vrow + +delete-after: True + +changes: + - rscdel: "Completely removes the Rainbow and the Psychodelic jumpsuits." + - imagedel: "Removes old Jumpsuits sprites." + - imageadd: "Ported and tweaked most of CM's Redone Bay Colored Jumpsuit sprites! Details on the tweaks can be found in the GitHub PR, and they're all Bulwark friendly as well!" diff --git a/icons/clothing/under/uniforms/jumpsuits.dmi b/icons/clothing/under/uniforms/jumpsuits.dmi new file mode 100644 index 00000000000..5b7b1ec052d Binary files /dev/null and b/icons/clothing/under/uniforms/jumpsuits.dmi differ diff --git a/icons/mob/items/clothing/lefthand_uniforms.dmi b/icons/mob/items/clothing/lefthand_uniforms.dmi index 149d44fd8bc..73264e9ed99 100644 Binary files a/icons/mob/items/clothing/lefthand_uniforms.dmi and b/icons/mob/items/clothing/lefthand_uniforms.dmi differ diff --git a/icons/mob/items/clothing/righthand_uniforms.dmi b/icons/mob/items/clothing/righthand_uniforms.dmi index d2f85292778..587f46bacfc 100644 Binary files a/icons/mob/items/clothing/righthand_uniforms.dmi and b/icons/mob/items/clothing/righthand_uniforms.dmi differ diff --git a/icons/mob/species/bulwark/uniform.dmi b/icons/mob/species/bulwark/uniform.dmi index 384539bf16b..dbdca46c854 100644 Binary files a/icons/mob/species/bulwark/uniform.dmi and b/icons/mob/species/bulwark/uniform.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index d664d4ecdf2..a2b8e45fa49 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index 424f0255429..e94e915141e 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -4383,7 +4383,6 @@ /area/beach) "aDk" = ( /obj/structure/table/standard, -/obj/item/clothing/under/rainbow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/collectable/petehat{ pixel_y = 5 diff --git a/maps/event/odin_departure/odin_depature-1.dmm b/maps/event/odin_departure/odin_depature-1.dmm index d227e7d38c9..3fc7dc0fb47 100644 --- a/maps/event/odin_departure/odin_depature-1.dmm +++ b/maps/event/odin_departure/odin_depature-1.dmm @@ -4416,7 +4416,6 @@ /area/beach) "aDk" = ( /obj/structure/table/standard, -/obj/item/clothing/under/rainbow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/collectable/petehat{ pixel_y = 5 diff --git a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm index 8529ebd366f..c9ecd9eb129 100644 --- a/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm +++ b/maps/sccv_horizon/backup/placeholder-4_centcomm.dmm @@ -11948,7 +11948,6 @@ /area/beach) "aDk" = ( /obj/structure/table/standard, -/obj/item/clothing/under/rainbow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/collectable/petehat{ pixel_y = 5 diff --git a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm index 0226b04bb6c..9225d6b303d 100644 --- a/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm +++ b/maps/sccv_horizon/sccv_horizon-4_centcomm.dmm @@ -36496,7 +36496,6 @@ /area/beach) "bLE" = ( /obj/structure/table/standard, -/obj/item/clothing/under/rainbow, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/head/collectable/petehat{ pixel_y = 5