diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 4f32fe1d2d3d..6fe9ec2a653f 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -9,7 +9,6 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_PURPLE = /obj/item/clothing/under/color/lightpurple, DYE_BLACK = /obj/item/clothing/under/color/black, DYE_WHITE = /obj/item/clothing/under/color/white, - DYE_RAINBOW = /obj/item/clothing/under/color/rainbow, DYE_MIME = /obj/item/clothing/under/rank/civilian/mime, DYE_CLOWN = /obj/item/clothing/under/rank/civilian/clown, DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain, @@ -33,7 +32,6 @@ GLOBAL_LIST_INIT(dye_registry, list( DYE_PURPLE = /obj/item/clothing/under/color/jumpskirt/lightpurple, DYE_BLACK = /obj/item/clothing/under/color/jumpskirt/black, DYE_WHITE = /obj/item/clothing/under/color/jumpskirt/white, - DYE_RAINBOW = /obj/item/clothing/under/color/jumpskirt/rainbow, DYE_MIME = /obj/item/clothing/under/rank/civilian/mime/skirt, DYE_CHAP = /obj/item/clothing/under/rank/civilian/chaplain/skirt, DYE_QM = /obj/item/clothing/under/rank/cargo/qm/skirt, diff --git a/code/game/objects/items/miscellaneous.dm b/code/game/objects/items/miscellaneous.dm index 3c8f3ead8709..03f3797c4c49 100644 --- a/code/game/objects/items/miscellaneous.dm +++ b/code/game/objects/items/miscellaneous.dm @@ -119,7 +119,6 @@ new /obj/item/storage/belt/fannypack/bustin(src) new /obj/item/clothing/gloves/color/black(src) new /obj/item/clothing/shoes/jackboots(src) - new /obj/item/clothing/under/color/khaki/buster(src) new /obj/item/grenade/chem_grenade/ghostbuster(src) new /obj/item/grenade/chem_grenade/ghostbuster(src) new /obj/item/grenade/chem_grenade/ghostbuster(src) diff --git a/code/modules/client/loadout/loadout_uniform.dm b/code/modules/client/loadout/loadout_uniform.dm index 96b4088b65bd..162b6718ca6f 100644 --- a/code/modules/client/loadout/loadout_uniform.dm +++ b/code/modules/client/loadout/loadout_uniform.dm @@ -53,10 +53,6 @@ display_name = "jumpsuit, random" path = /obj/item/clothing/under/color/random //literally useless if grey assistants is off -/datum/gear/uniform/color/rainbow - display_name = "jumpsuit, rainbow" - path = /obj/item/clothing/under/color/rainbow - //Shorts /datum/gear/uniform/athshortsred diff --git a/code/modules/clothing/outfits/factions/independent.dm b/code/modules/clothing/outfits/factions/independent.dm index ba883d59f4dd..30017e9eb545 100644 --- a/code/modules/clothing/outfits/factions/independent.dm +++ b/code/modules/clothing/outfits/factions/independent.dm @@ -441,7 +441,7 @@ job_icon = "cargotechnician" ears = /obj/item/radio/headset/headset_cargo - uniform = /obj/item/clothing/under/color/khaki + uniform = /obj/item/clothing/under/color/lightbrown dcoat = /obj/item/clothing/suit/hooded/wintercoat/cargo backpack_contents = list(/obj/item/modular_computer/tablet/preset/cargo=1) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index a6f3bfa7cf9d..7ac32c9c1295 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -11,7 +11,7 @@ /obj/item/clothing/under/color/random icon_state = "random_jumpsuit" - mob_overlay_state = "rainbow" // if you somehow equip it like that + mob_overlay_state = "white" // if you somehow equip it like that /obj/item/clothing/under/color/random/Initialize() ..() @@ -25,7 +25,7 @@ /obj/item/clothing/under/color/jumpskirt/random icon_state = "random_jumpsuit" //Skirt variant needed - mob_overlay_state = "rainbow" + mob_overlay_state = "white" /obj/item/clothing/under/color/jumpskirt/random/Initialize() ..() @@ -186,15 +186,6 @@ icon_state = "lightbrown_skirt" item_state = "lb_suit" -/obj/item/clothing/under/color/khaki - name = "khaki jumpsuit" - icon_state = "khakij" - item_state = "lb_suit" - -/obj/item/clothing/under/color/khaki/buster - name = "buster jumpsuit" - desc = "There seems to be a large stain in the left pocket. Someone must have squashed a really big twinkie." - /obj/item/clothing/under/color/brown name = "brown jumpsuit" icon_state = "brown" @@ -214,17 +205,3 @@ name = "maroon jumpskirt" icon_state = "maroon_skirt" item_state = "r_suit" - -/obj/item/clothing/under/color/rainbow - name = "rainbow jumpsuit" - desc = "A multi-colored jumpsuit!" - icon_state = "rainbow" - item_state = "rainbow" - can_adjust = FALSE - -/obj/item/clothing/under/color/jumpskirt/rainbow - name = "rainbow jumpskirt" - desc = "A multi-colored jumpskirt!" - icon_state = "rainbow_skirt" - item_state = "rainbow" - can_adjust = FALSE diff --git a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm index ed356764271f..eccb38bee5bd 100644 --- a/code/modules/mob/living/simple_animal/hostile/human/survivors.dm +++ b/code/modules/mob/living/simple_animal/hostile/human/survivors.dm @@ -202,7 +202,6 @@ /obj/item/clothing/under/rank/cargo/miner/lavaland = 10, /obj/item/clothing/under/rank/prisoner = 10, /obj/item/clothing/under/rank/cargo/miner/lavaland/old = 5, - /obj/item/clothing/under/color/khaki/buster = 5, /obj/item/clothing/under/rank/cargo/miner = 5 ) ) diff --git a/icons/mob/clothing/under/color.dmi b/icons/mob/clothing/under/color.dmi index 8bda1f9c7d6c..d87321f4f018 100644 Binary files a/icons/mob/clothing/under/color.dmi and b/icons/mob/clothing/under/color.dmi differ diff --git a/icons/mob/species/misc/digitigrade.dmi b/icons/mob/species/misc/digitigrade.dmi index 8736b8057f14..7153add0965d 100644 Binary files a/icons/mob/species/misc/digitigrade.dmi and b/icons/mob/species/misc/digitigrade.dmi differ diff --git a/icons/obj/clothing/under/color.dmi b/icons/obj/clothing/under/color.dmi index 7a616f4c3362..173056cbbf43 100644 Binary files a/icons/obj/clothing/under/color.dmi and b/icons/obj/clothing/under/color.dmi differ