diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index bf489a05ec4..3e1adb953bd 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -2858,7 +2858,7 @@ "ib" = ( /obj/structure/closet, /obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/clothing/under/color/purple, +/obj/item/clothing/under/color/lightpurple, /obj/item/weapon/poster/contraband, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index 489defcdf07..d4d6d2d71e7 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -57,7 +57,7 @@ /obj/structure/closet/wardrobe/green/New() ..() contents = list() - for(var/i in 1 to 3) + for(var/i in 1 to 3) new /obj/item/clothing/under/color/green(src) for(var/i in 1 to 3) new /obj/item/clothing/shoes/sneakers/black(src) @@ -174,14 +174,10 @@ new /obj/item/clothing/under/color/orange(src) new /obj/item/clothing/under/color/pink(src) new /obj/item/clothing/under/color/red(src) - new /obj/item/clothing/under/color/lightblue(src) - new /obj/item/clothing/under/color/aqua(src) - new /obj/item/clothing/under/color/purple(src) - new /obj/item/clothing/under/color/lightpurple(src) - new /obj/item/clothing/under/color/lightgreen(src) new /obj/item/clothing/under/color/darkblue(src) - new /obj/item/clothing/under/color/darkred(src) - new /obj/item/clothing/under/color/lightred(src) + new /obj/item/clothing/under/color/teal(src) + new /obj/item/clothing/under/color/lightpurple(src) + new /obj/item/clothing/under/color/green(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/red(src) new /obj/item/clothing/mask/bandana/blue(src) diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 68b1fc784f2..aa87429f9ad 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -75,35 +75,29 @@ item_state = "y_suit" item_color = "yellow" -/obj/item/clothing/under/color/lightblue - name = "lightblue jumpsuit" - icon_state = "lightblue" +/obj/item/clothing/under/color/darkblue + name = "darkblue jumpsuit" + icon_state = "darkblue" item_state = "b_suit" - item_color = "lightblue" + item_color = "darkblue" -/obj/item/clothing/under/color/aqua - name = "aqua jumpsuit" - icon_state = "aqua" +/obj/item/clothing/under/color/teal + name = "teal jumpsuit" + icon_state = "teal" item_state = "b_suit" - item_color = "aqua" - -/obj/item/clothing/under/color/purple - name = "purple jumpsuit" - icon_state = "purple" - item_state = "p_suit" - item_color = "purple" + item_color = "teal" /obj/item/clothing/under/color/lightpurple - name = "lightpurple jumpsuit" + name = "purple jumpsuit" icon_state = "lightpurple" item_state = "p_suit" item_color = "lightpurple" -/obj/item/clothing/under/color/lightgreen - name = "lightgreen jumpsuit" - icon_state = "lightgreen" +/obj/item/clothing/under/color/darkgreen + name = "darkgreen jumpsuit" + icon_state = "darkgreen" item_state = "g_suit" - item_color = "lightgreen" + item_color = "darkgreen" /obj/item/clothing/under/color/lightbrown name = "lightbrown jumpsuit" @@ -117,30 +111,6 @@ item_state = "lb_suit" item_color = "brown" -/obj/item/clothing/under/color/yellowgreen - name = "yellowgreen jumpsuit" - icon_state = "yellowgreen" - item_state = "y_suit" - item_color = "yellowgreen" - -/obj/item/clothing/under/color/darkblue - name = "darkblue jumpsuit" - icon_state = "darkblue" - item_state = "b_suit" - item_color = "darkblue" - -/obj/item/clothing/under/color/lightred - name = "lightred jumpsuit" - icon_state = "lightred" - item_state = "r_suit" - item_color = "lightred" - -/obj/item/clothing/under/color/darkred - name = "darkred jumpsuit" - icon_state = "darkred" - item_state = "r_suit" - item_color = "darkred" - /obj/item/clothing/under/color/maroon name = "maroon jumpsuit" icon_state = "maroon" diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 8a48c84c2f6..00b5d59e8a0 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 765f967625e..f65d2a03ee6 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ