diff --git a/code/game/antagonist/outsider/raider.dm b/code/game/antagonist/outsider/raider.dm index bcc89a0295..0a68becfd6 100644 --- a/code/game/antagonist/outsider/raider.dm +++ b/code/game/antagonist/outsider/raider.dm @@ -27,7 +27,7 @@ var/datum/antagonist/raider/raiders /obj/item/clothing/under/serviceoveralls, /obj/item/clothing/under/captain_fly, /obj/item/clothing/under/det, - /obj/item/clothing/under/brown, + /obj/item/clothing/under/color/brown, ) var/list/raider_shoes = list( diff --git a/code/game/antagonist/outsider/wizard.dm b/code/game/antagonist/outsider/wizard.dm index f6741cafa0..ac8c0ef44d 100644 --- a/code/game/antagonist/outsider/wizard.dm +++ b/code/game/antagonist/outsider/wizard.dm @@ -76,7 +76,7 @@ var/datum/antagonist/wizard/wizards return 0 wizard_mob.equip_to_slot_or_del(new /obj/item/device/radio/headset(wizard_mob), slot_l_ear) - wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(wizard_mob), slot_w_uniform) + wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(wizard_mob), slot_w_uniform) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(wizard_mob), slot_shoes) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) diff --git a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm index ba9da6c917..83b94e39aa 100644 --- a/code/game/objects/structures/crates_lockers/closets/wardrobe.dm +++ b/code/game/objects/structures/crates_lockers/closets/wardrobe.dm @@ -521,7 +521,7 @@ new /obj/item/clothing/under/pants/black(src) new /obj/item/clothing/under/pants/tan(src) new /obj/item/clothing/under/pants/track(src) - new /obj/item/clothing/under/pants/jeans(src) + new /obj/item/clothing/under/pants(src) new /obj/item/clothing/under/pants/khaki(src) new /obj/item/clothing/mask/bandana/blue(src) new /obj/item/clothing/mask/bandana/blue(src) diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm index 57deed42a2..b21abd7e30 100644 --- a/code/modules/admin/verbs/debug.dm +++ b/code/modules/admin/verbs/debug.dm @@ -732,7 +732,7 @@ M.equip_to_slot_or_del(W, slot_wear_id) if("blue wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) @@ -744,7 +744,7 @@ M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("red wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/red(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) @@ -756,7 +756,7 @@ M.equip_to_slot_or_del(new /obj/item/weapon/storage/box(M), slot_in_backpack) if("marisa wizard") - M.equip_to_slot_or_del(new /obj/item/clothing/under/lightpurple(M), slot_w_uniform) + M.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe/marisa(M), slot_wear_suit) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/marisa(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear) diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 997520a1c7..440786f679 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -59,48 +59,16 @@ path = /obj/item/clothing/suit/storage/hazardvest /datum/gear/suit/hoodie - display_name = "hoodie, grey" + display_name = "hoodie" path = /obj/item/clothing/suit/storage/toggle/hoodie -/datum/gear/suit/hoodie/red - display_name = "hoodie, red" - path = /obj/item/clothing/suit/storage/toggle/hoodie/red - -/datum/gear/suit/hoodie/blue - display_name = "hoodie, blue" - path = /obj/item/clothing/suit/storage/toggle/hoodie/blue - -/datum/gear/suit/hoodie/yellow - display_name = "hoodie, yellow" - path = /obj/item/clothing/suit/storage/toggle/hoodie/yellow - -/datum/gear/suit/hoodie/green - display_name = "hoodie, green" - path = /obj/item/clothing/suit/storage/toggle/hoodie/green - -/datum/gear/suit/hoodie/orange - display_name = "hoodie, orange" - path = /obj/item/clothing/suit/storage/toggle/hoodie/orange - -/datum/gear/suit/hoodie/black - display_name = "hoodie, black" - path = /obj/item/clothing/suit/storage/toggle/hoodie/black - -/datum/gear/suit/hoodie/cti - display_name = "hoodie, CTI" - path = /obj/item/clothing/suit/storage/toggle/hoodie/cti - -/datum/gear/suit/hoodie/mu - display_name = "hoodie, MU" - path = /obj/item/clothing/suit/storage/toggle/hoodie/mu - -/datum/gear/suit/hoodie/nt - display_name = "hoodie, NT" - path = /obj/item/clothing/suit/storage/toggle/hoodie/nt - -/datum/gear/suit/hoodie/smw - display_name = "hoodie, Space Mountain Wind" - path = /obj/item/clothing/suit/storage/toggle/hoodie/smw +/datum/gear/suit/hoodie/New() + ..() + var/list/hoodies = list() + for(var/hoodie_style in typesof(/obj/item/clothing/suit/storage/toggle/hoodie)) + var/obj/item/clothing/suit/storage/toggle/hoodie/hoodie = hoodie_style + hoodies[initial(hoodie.name)] = hoodie + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(hoodies)) /datum/gear/suit/labcoat display_name = "labcoat" @@ -145,29 +113,18 @@ cost = 1 /datum/gear/suit/poncho - display_name = "poncho, tan" + display_name = "poncho" path = /obj/item/clothing/suit/poncho cost = 1 -/datum/gear/suit/poncho/blue - display_name = "poncho, blue" - path = /obj/item/clothing/suit/poncho/blue +/datum/gear/suit/poncho/New() + ..() + var/list/ponchos = list() + for(var/poncho_style in typesof(/obj/item/clothing/suit/poncho)) + var/obj/item/clothing/suit/storage/toggle/hoodie/poncho = poncho_style + ponchos[initial(poncho.name)] = poncho + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(ponchos)) -/datum/gear/suit/poncho/green - display_name = "poncho, green" - path = /obj/item/clothing/suit/poncho/green - -/datum/gear/suit/poncho/purple - display_name = "poncho, purple" - path = /obj/item/clothing/suit/poncho/purple - -/datum/gear/suit/poncho/red - display_name = "poncho, red" - path = /obj/item/clothing/suit/poncho/red - -/datum/gear/suit/poncho/security - display_name = "poncho, security" - path = /obj/item/clothing/suit/poncho/security /datum/gear/suit/unathi_robe display_name = "roughspun robe" diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 261f048d3b..f4eb1c0f78 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -33,93 +33,17 @@ display_name = "cut top, red" path = /obj/item/clothing/under/cuttop/red -/datum/gear/uniform/jumpskirt - display_name = "jumpskirt, black" - path = /obj/item/clothing/under/blackjumpskirt - /datum/gear/uniform/jumpsuit - display_name = "jumpsuit, rainbow" - path = /obj/item/clothing/under/rainbow - -/datum/gear/uniform/jumpsuit/black - display_name = "jumpsuit, black" - path = /obj/item/clothing/under/color/black - -/datum/gear/uniform/jumpsuit/blackfemale - display_name = "jumpsuit, female-black" - path = /obj/item/clothing/under/color/blackf - -/datum/gear/uniform/jumpsuit/blue - display_name = "jumpsuit, blue" - path = /obj/item/clothing/under/color/blue - -/datum/gear/uniform/jumpsuit/green - display_name = "jumpsuit, green" - path = /obj/item/clothing/under/color/green - -/datum/gear/uniform/jumpsuit/grey - display_name = "jumpsuit, grey" + display_name = "generic jumpclothes" path = /obj/item/clothing/under/color/grey -/datum/gear/uniform/jumpsuit/pink - display_name = "jumpsuit, pink" - path = /obj/item/clothing/under/color/pink - -/datum/gear/uniform/jumpsuit/white - display_name = "jumpsuit, white" - path = /obj/item/clothing/under/color/white - -/datum/gear/uniform/jumpsuit/yellow - display_name = "jumpsuit, yellow" - path = /obj/item/clothing/under/color/yellow - -/datum/gear/uniform/jumpsuit/lightblue - display_name = "jumpsuit, lightblue" - path = /obj/item/clothing/under/lightblue - -/datum/gear/uniform/jumpsuit/red - display_name = "jumpsuit, red" - path = /obj/item/clothing/under/color/red - -/datum/gear/uniform/jumpsuit/aqua - display_name = "jumpsuit, aqua" - path = /obj/item/clothing/under/aqua - -/datum/gear/uniform/jumpsuit/purple - display_name = "jumpsuit, purple" - path = /obj/item/clothing/under/purple - -/datum/gear/uniform/jumpsuit/lightpurple - display_name = "jumpsuit, lightpurple" - path = /obj/item/clothing/under/lightpurple - -/datum/gear/uniform/jumpsuit/lightgreen - display_name = "jumpsuit, lightgreen" - path = /obj/item/clothing/under/lightgreen - -/datum/gear/uniform/jumpsuit/lightbrown - display_name = "jumpsuit, lightbrown" - path = /obj/item/clothing/under/lightbrown - -/datum/gear/uniform/jumpsuit/brown - display_name = "jumpsuit, brown" - path = /obj/item/clothing/under/brown - -/datum/gear/uniform/jumpsuit/yellowgreen - display_name = "jumpsuit, yellowgreen" - path = /obj/item/clothing/under/yellowgreen - -/datum/gear/uniform/jumpsuit/darkblue - display_name = "jumpsuit, darkblue" - path = /obj/item/clothing/under/darkblue - -/datum/gear/uniform/jumpsuit/lightred - display_name = "jumpsuit, lightred" - path = /obj/item/clothing/under/lightred - -/datum/gear/uniform/jumpsuit/darkred - display_name = "jumpsuit, darkred" - path = /obj/item/clothing/under/darkred +/datum/gear/uniform/jumpsuit/New() + ..() + var/list/jumpclothes = list() + for(var/jump in typesof(/obj/item/clothing/under/color)) + var/obj/item/clothing/under/color/jumps = jump + jumpclothes[initial(jumps.name)] = jumps + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(jumpclothes)) /datum/gear/uniform/skirt display_name = "plaid skirt, blue" @@ -228,112 +152,28 @@ allowed_roles = list("Quartermaster","Cargo Technician") /datum/gear/uniform/pants - display_name = "pants, white" + display_name = "pants" path = /obj/item/clothing/under/pants/white -/datum/gear/uniform/pants/red - display_name = "pants, red" - path = /obj/item/clothing/under/pants/red +/datum/gear/uniform/pants/New() + ..() + var/list/pants = list() + for(var/pant in typesof(/obj/item/clothing/under/pants)) + var/obj/item/clothing/under/pants/pant_type = pant + pants[initial(pant_type.name)] = pant_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(pants)) -/datum/gear/uniform/pants/black - display_name = "pants, black" - path = /obj/item/clothing/under/pants/black - -/datum/gear/uniform/pants/tan - display_name = "pants, tan" - path = /obj/item/clothing/under/pants/tan - -/datum/gear/uniform/pants/track - display_name = "pants, track" - path = /obj/item/clothing/under/pants/track - -/datum/gear/uniform/pants/khaki - display_name = "pants, khaki" - path = /obj/item/clothing/under/pants/khaki - -/datum/gear/uniform/pants/camo - display_name = "pants, camo" - path = /obj/item/clothing/under/pants/camo - -/datum/gear/uniform/pants/jeans - display_name = "pants, jeans" - path = /obj/item/clothing/under/pants/jeans - -/datum/gear/uniform/pants/jeans/classic - display_name = "pants, classic jeans" - path = /obj/item/clothing/under/pants/classicjeans - -/datum/gear/uniform/pants/jeans/mustang - display_name = "pants, mustang jeans" - path = /obj/item/clothing/under/pants/mustangjeans - -/datum/gear/uniform/pants/jeans/black - display_name = "pants, black jeans" - path = /obj/item/clothing/under/pants/blackjeans - -/datum/gear/uniform/pants/jeans/grey - display_name = "pants, grey jeans" - path = /obj/item/clothing/under/pants/greyjeans - -/datum/gear/uniform/pants/jeans/youngfolks - display_name = "pants, young folks jeans" - path = /obj/item/clothing/under/pants/youngfolksjeans - -/datum/gear/uniform/jeans - display_name = "shorts, jeans" +/datum/gear/uniform/shorts + display_name = "shorts" path = /obj/item/clothing/under/shorts/jeans -/datum/gear/uniform/jeans/classic - display_name = "shorts, classic jeans" - path = /obj/item/clothing/under/shorts/jeans/classic - -/datum/gear/uniform/jeans/mustang - display_name = "shorts, mustang jeans" - path = /obj/item/clothing/under/shorts/jeans/mustang - -/datum/gear/uniform/jeans/youngfolks - display_name = "shorts, young folks jeans" - path = /obj/item/clothing/under/shorts/jeans/youngfolks - -/datum/gear/uniform/jeans/black - display_name = "shorts, black jeans" - path = /obj/item/clothing/under/shorts/jeans/black - -/datum/gear/uniform/jeans/grey - display_name = "shorts, grey jeans" - path = /obj/item/clothing/under/shorts/jeans/grey - -/datum/gear/uniform/jeans/female - display_name = "shorts, female, jeans" - path = /obj/item/clothing/under/shorts/jeans/female - -/datum/gear/uniform/jeans/classic/female - display_name = "shorts, female, classic jeans" - path = /obj/item/clothing/under/shorts/jeans/classic/female - -/datum/gear/uniform/jeans/mustang/female - display_name = "shorts, female, mustang jeans" - path = /obj/item/clothing/under/shorts/jeans/mustang/female - -/datum/gear/uniform/jeans/youngfolks/female - display_name = "shorts, female, young folks jeans" - path = /obj/item/clothing/under/shorts/jeans/youngfolks/female - -/datum/gear/uniform/jeans/black/female - display_name = "shorts, female, black jeans" - path = /obj/item/clothing/under/shorts/jeans/black/female - -/datum/gear/uniform/jeans/grey/female - display_name = "shorts, female, grey jeans" - path = /obj/item/clothing/under/shorts/jeans/grey/female - -/datum/gear/uniform/khaki - display_name = "shorts, khaki" - path = /obj/item/clothing/under/shorts/khaki - -/datum/gear/uniform/khaki/female - display_name = "shorts, female, khaki" - path = /obj/item/clothing/under/shorts/khaki/female +/datum/gear/uniform/shorts/New() + ..() + var/list/shorts = list() + for(var/short in typesof(/obj/item/clothing/under/shorts)) + var/obj/item/clothing/under/pants/short_type = short + shorts[initial(short_type.name)] = short_type + gear_tweaks += new/datum/gear_tweak/path(sortAssoc(shorts)) /datum/gear/uniform/suit //amish display_name = "suit, amish" diff --git a/code/modules/client/preference_setup/occupation/occupation.dm b/code/modules/client/preference_setup/occupation/occupation.dm index 92c6320c64..62c3fc206d 100644 --- a/code/modules/client/preference_setup/occupation/occupation.dm +++ b/code/modules/client/preference_setup/occupation/occupation.dm @@ -44,7 +44,7 @@ pref.job_engsec_high = sanitize_integer(pref.job_engsec_high, 0, 65535, initial(pref.job_engsec_high)) pref.job_engsec_med = sanitize_integer(pref.job_engsec_med, 0, 65535, initial(pref.job_engsec_med)) pref.job_engsec_low = sanitize_integer(pref.job_engsec_low, 0, 65535, initial(pref.job_engsec_low)) - if(!pref.player_alt_titles) pref.player_alt_titles = new() + if(!(pref.player_alt_titles)) pref.player_alt_titles = new() if(!job_master) return diff --git a/code/modules/clothing/under/color.dm b/code/modules/clothing/under/color.dm index 97092d59d8..1add4cf595 100644 --- a/code/modules/clothing/under/color.dm +++ b/code/modules/clothing/under/color.dm @@ -78,7 +78,7 @@ item_state = "psyche" worn_state = "psyche" -/obj/item/clothing/under/lightblue +/obj/item/clothing/under/color/lightblue name = "lightblue jumpsuit" desc = "A light blue jumpsuit." icon_state = "lightblue" @@ -86,7 +86,7 @@ worn_state = "lightblue" rolled_sleeves = 0 -/obj/item/clothing/under/aqua +/obj/item/clothing/under/color/aqua name = "aqua jumpsuit" desc = "An aqua jumpsuit." icon_state = "aqua" @@ -94,7 +94,7 @@ worn_state = "aqua" rolled_sleeves = 0 -/obj/item/clothing/under/purple +/obj/item/clothing/under/color name = "purple jumpsuit" desc = "A purple jumpsuit." icon_state = "purple" @@ -102,7 +102,7 @@ worn_state = "purple" rolled_sleeves = 0 -/obj/item/clothing/under/lightpurple +/obj/item/clothing/under/color/lightpurple name = "lightpurple jumpsuit" desc = "A light purple jumpsuit." icon_state = "lightpurple" @@ -110,7 +110,7 @@ worn_state = "lightpurple" rolled_sleeves = 0 -/obj/item/clothing/under/lightgreen +/obj/item/clothing/under/color/lightgreen name = "lightgreen jumpsuit" desc = "A light green jumpsuit." icon_state = "lightgreen" @@ -118,7 +118,7 @@ worn_state = "lightgreen" rolled_sleeves = 0 -/obj/item/clothing/under/lightbrown +/obj/item/clothing/under/color/lightbrown name = "lightbrown jumpsuit" desc = "A light brown jumpsuit." icon_state = "lightbrown" @@ -126,7 +126,7 @@ worn_state = "lightbrown" rolled_sleeves = 0 -/obj/item/clothing/under/brown +/obj/item/clothing/under/color/brown name = "brown jumpsuit" desc = "A brown jumpsuit." icon_state = "brown" @@ -134,7 +134,7 @@ worn_state = "brown" rolled_sleeves = 0 -/obj/item/clothing/under/yellowgreen +/obj/item/clothing/under/color/yellowgreen name = "yellowgreen jumpsuit" desc = "A... yellow green jumpsuit?" icon_state = "yellowgreen" @@ -142,7 +142,7 @@ worn_state = "yellowgreen" rolled_sleeves = 0 -/obj/item/clothing/under/darkblue +/obj/item/clothing/under/color/darkblue name = "darkblue jumpsuit" desc = "A dark blue jumpsuit." icon_state = "darkblue" @@ -150,7 +150,7 @@ worn_state = "darkblue" rolled_sleeves = 0 -/obj/item/clothing/under/lightred +/obj/item/clothing/under/color/lightred name = "lightred jumpsuit" desc = "A light red jumpsuit." icon_state = "lightred" @@ -158,7 +158,7 @@ worn_state = "lightred" rolled_sleeves = 0 -/obj/item/clothing/under/darkred +/obj/item/clothing/under/color/darkred name = "darkred jumpsuit" desc = "A dark red jumpsuit." icon_state = "darkred" diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm index a710c7d299..a33ee63a2b 100644 --- a/code/modules/clothing/under/miscellaneous.dm +++ b/code/modules/clothing/under/miscellaneous.dm @@ -140,7 +140,7 @@ worn_state = "johnny" item_state = "johnny" -/obj/item/clothing/under/rainbow +/obj/item/clothing/under/color/rainbow name = "rainbow jumpsuit" desc = "A multi-colored jumpsuit." icon_state = "rainbow" diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm index 3571ddbbc3..f3c38cc433 100644 --- a/code/modules/clothing/under/pants.dm +++ b/code/modules/clothing/under/pants.dm @@ -1,4 +1,7 @@ /obj/item/clothing/under/pants + name = "jeans" + desc = "A nondescript pair of tough blue jeans." + icon_state = "jeans" gender = PLURAL body_parts_covered = LOWER_TORSO|LEGS @@ -52,11 +55,6 @@ desc = "A pair of track pants, for the athletic." icon_state = "trackpants" -/obj/item/clothing/under/pants/jeans - name = "jeans" - desc = "A nondescript pair of tough blue jeans." - icon_state = "jeans" - /obj/item/clothing/under/pants/khaki name = "khaki pants" desc = "A pair of dust beige khaki pants." diff --git a/maps/polaris-1.dmm b/maps/polaris-1.dmm index 7c7ccfba4b..7d8be00f2a 100644 --- a/maps/polaris-1.dmm +++ b/maps/polaris-1.dmm @@ -694,7 +694,7 @@ "anr" = (/turf/simulated/wall,/area/hallway/secondary/escape/fore_escape_pod_hallway) "ans" = (/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) "ant" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/tiled,/area/hallway/secondary/escape/fore_escape_pod_hallway) -"anu" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/rainbow,/obj/item/weapon/bedsheet/rainbow,/obj/item/weapon/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/library) +"anu" = (/obj/item/clothing/gloves/rainbow,/obj/item/clothing/head/soft/rainbow,/obj/item/clothing/shoes/rainbow,/obj/item/clothing/under/color/rainbow,/obj/item/weapon/bedsheet/rainbow,/obj/item/weapon/pen/crayon/rainbow,/turf/simulated/floor,/area/maintenance/library) "anv" = (/obj/item/stack/material/glass,/turf/simulated/floor,/area/vacant/vacant_site) "anw" = (/turf/simulated/floor,/area/vacant/vacant_site) "anx" = (/obj/structure/table/reinforced,/obj/item/weapon/broken_bottle,/turf/simulated/floor,/area/vacant/vacant_site) diff --git a/maps/polaris-2.dmm b/maps/polaris-2.dmm index 8a8a806422..1e9865c83b 100644 --- a/maps/polaris-2.dmm +++ b/maps/polaris-2.dmm @@ -1970,7 +1970,7 @@ "LY" = (/turf/simulated/shuttle/wall{icon_state = "swall_s"; dir = 2},/area/centcom/evac) "LZ" = (/turf/simulated/shuttle/wall{icon_state = "swall_straight"; dir = 4},/area/centcom/evac) "Ma" = (/obj/structure/table/standard,/obj,/obj,/obj,/obj,/obj,/obj,/obj,/turf/unsimulated/beach/sand,/area/beach) -"Mb" = (/obj/structure/table/standard,/obj/item/clothing/under/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) +"Mb" = (/obj/structure/table/standard,/obj/item/clothing/under/color/rainbow,/obj/item/clothing/glasses/sunglasses,/obj/item/clothing/head/collectable/petehat{pixel_y = 5},/turf/unsimulated/beach/sand,/area/beach) "Mc" = (/turf/simulated/shuttle/wall{tag = "icon-swall_s (EAST)"; icon_state = "swall_s"; dir = 4},/area/centcom/evac) "Md" = (/turf/simulated/shuttle/wall{icon_state = "swall_t"; dir = 1},/area/centcom/evac) "Me" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/centcom/evac)