Merge branch 'master' into master

code/__DEFINES/subsystems.dm

@@ -81,7 +81,7 @@
 #define INIT_ORDER_STICKY_BAN		-10
 #define INIT_ORDER_LIGHTING			-20
 #define INIT_ORDER_SHUTTLE			-21
-#define INIT_ORDER_SQUEAK			-40
+#define INIT_ORDER_MINOR_MAPPING	-40
 #define INIT_ORDER_PATH				-50
 #define INIT_ORDER_PERSISTENCE		-100
 

code/__HELPERS/global_lists.dm

@@ -8,11 +8,11 @@
 	//facial hair
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/facial_hair, GLOB.facial_hair_styles_list, GLOB.facial_hair_styles_male_list, GLOB.facial_hair_styles_female_list)
 	//underwear
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/bottom, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
 	//undershirt
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/top, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
 	//socks
-	init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
+	init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
 	//bodypart accessories (blizzard intensifies)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/body_markings, GLOB.body_markings_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/lizard, GLOB.tails_list_lizard)

code/__HELPERS/mobs.dm

@@ -20,35 +20,34 @@
 		else
 			return "000"
 
-/proc/random_underwear(gender)//Cit change - makes random underwear always return nude
+#define UNDIE_COLORABLE(U) (U?.has_color)
+
+/proc/random_underwear(gender)
 	if(!GLOB.underwear_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
-	return "Nude"
-	/*switch(gender)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/bottom, GLOB.underwear_list, GLOB.underwear_m, GLOB.underwear_f)
+	switch(gender)
 		if(MALE)
 			return pick(GLOB.underwear_m)
 		if(FEMALE)
 			return pick(GLOB.underwear_f)
 		else
-			return pick(GLOB.underwear_list)*/
+			return pick(GLOB.underwear_list)
 
-/proc/random_undershirt(gender)//Cit change - makes random undershirts always return nude
+/proc/random_undershirt(gender)
 	if(!GLOB.undershirt_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/undershirt, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
-	return "Nude"
-	/*switch(gender)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/top, GLOB.undershirt_list, GLOB.undershirt_m, GLOB.undershirt_f)
+	switch(gender)
 		if(MALE)
 			return pick(GLOB.undershirt_m)
 		if(FEMALE)
 			return pick(GLOB.undershirt_f)
 		else
-			return pick(GLOB.undershirt_list)*/
+			return pick(GLOB.undershirt_list)
 
-/proc/random_socks()//Cit change - makes random socks always return nude
+/proc/random_socks()
 	if(!GLOB.socks_list.len)
-		init_sprite_accessory_subtypes(/datum/sprite_accessory/socks, GLOB.socks_list)
-	return "Nude"
-	//return pick(GLOB.socks_list)
+		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
+	return pick(GLOB.socks_list)
 
 /proc/random_features()
 	if(!GLOB.tails_list_human.len)

code/_globalvars/lists/flavor_misc.dm

@@ -7,15 +7,15 @@ GLOBAL_LIST_EMPTY(facial_hair_styles_list)	//stores /datum/sprite_accessory/faci
 GLOBAL_LIST_EMPTY(facial_hair_styles_male_list)	//stores only hair names
 GLOBAL_LIST_EMPTY(facial_hair_styles_female_list)	//stores only hair names
 	//Underwear
-GLOBAL_LIST_EMPTY(underwear_list)		//stores /datum/sprite_accessory/underwear indexed by name
+GLOBAL_LIST_EMPTY(underwear_list)		//stores /datum/sprite_accessory/underwear/bottom indexed by name
 GLOBAL_LIST_EMPTY(underwear_m)	//stores only underwear name
 GLOBAL_LIST_EMPTY(underwear_f)	//stores only underwear name
 	//Undershirts
-GLOBAL_LIST_EMPTY(undershirt_list) 	//stores /datum/sprite_accessory/undershirt indexed by name
+GLOBAL_LIST_EMPTY(undershirt_list) 	//stores /datum/sprite_accessory/underwear/top indexed by name
 GLOBAL_LIST_EMPTY(undershirt_m)	 //stores only undershirt name
 GLOBAL_LIST_EMPTY(undershirt_f)	 //stores only undershirt name
 	//Socks
-GLOBAL_LIST_EMPTY(socks_list)		//stores /datum/sprite_accessory/socks indexed by name
+GLOBAL_LIST_EMPTY(socks_list)		//stores /datum/sprite_accessory/underwear/socks indexed by name
 	//Lizard Bits (all datum lists indexed by name)
 GLOBAL_LIST_EMPTY(body_markings_list)
 GLOBAL_LIST_EMPTY(tails_list_lizard)

code/controllers/subsystem/minor_mapping.dm

@@ -1,22 +1,14 @@
-// The Squeak
-// because this is about placement of mice mobs, and nothing to do with
-// mice - the computer peripheral
-
-SUBSYSTEM_DEF(squeak)
-	name = "Squeak"
-	init_order = INIT_ORDER_SQUEAK
+SUBSYSTEM_DEF(minor_mapping)
+	name = "Minor Mapping"
+	init_order = INIT_ORDER_MINOR_MAPPING
 	flags = SS_NO_FIRE
 
-	var/list/exposed_wires = list()
-
-/datum/controller/subsystem/squeak/Initialize(timeofday)
+/datum/controller/subsystem/minor_mapping/Initialize(timeofday)
 	trigger_migration(CONFIG_GET(number/mice_roundstart))
 	return ..()
 
-/datum/controller/subsystem/squeak/proc/trigger_migration(num_mice=10)
-	if(!num_mice)
-		return
-	find_exposed_wires()
+/datum/controller/subsystem/minor_mapping/proc/trigger_migration(num_mice=10)
+	var/list/exposed_wires = find_exposed_wires()
 
 	var/mob/living/simple_animal/mouse/M
 	var/turf/proposed_turf
@@ -31,7 +23,8 @@ SUBSYSTEM_DEF(squeak)
 			num_mice -= 1
 			M = null
 
-/datum/controller/subsystem/squeak/proc/find_exposed_wires()
+/proc/find_exposed_wires()
+	var/list/exposed_wires = list()
 	exposed_wires.Cut()
 	var/list/all_turfs
 	for (var/z in SSmapping.levels_by_trait(ZTRAIT_STATION))
@@ -41,3 +34,5 @@ SUBSYSTEM_DEF(squeak)
 			continue
 		if(locate(/obj/structure/cable) in T)
 			exposed_wires += T
+
+	return shuffle(exposed_wires)

code/game/gamemodes/changeling/changeling.dm

@@ -86,8 +86,11 @@ GLOBAL_VAR(changeling_team_objective_type) //If this is not null, we hand our th
 	var/datum/dna/chosen_dna = chosen_prof.dna
 	user.real_name = chosen_prof.name
 	user.underwear = chosen_prof.underwear
+	user.undie_color = chosen_prof.undie_color
 	user.undershirt = chosen_prof.undershirt
+	user.shirt_color =chosen_prof.shirt_color
 	user.socks = chosen_prof.socks
+	user.socks_color =chosen_prof.socks_color
 
 	chosen_dna.transfer_identity(user, 1)
 	user.updateappearance(mutcolor_update=1)

code/game/machinery/computer/arcade/minesweeper.dm

@@ -250,11 +250,11 @@
 						itemname = "a syndicate bomb beacon"
 						new /obj/item/sbeacondrop/bomb(loc)
 					if(2)
-						itemname = "a rocket launcher"
-						new /obj/item/gun/ballistic/rocketlauncher/unrestricted(loc)
-						new /obj/item/ammo_casing/caseless/rocket(loc)
-						new /obj/item/ammo_casing/caseless/rocket(loc)
-						new /obj/item/ammo_casing/caseless/rocket(loc)
+						itemname = "a grenade launcher"
+						new /obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
+						new /obj/item/ammo_casing/a40mm(loc)
 					if(3)
 						itemname = "two bags of c4"
 						new /obj/item/storage/backpack/duffelbag/syndie/c4(loc)

code/game/objects/items/RPD.dm

@@ -233,6 +233,10 @@ GLOBAL_LIST_INIT(transit_tube_recipes, list(
 	playsound(get_turf(user), 'sound/items/deconstruct.ogg', 50, 1)
 	return(BRUTELOSS)
 
+/obj/item/pipe_dispenser/ui_base_html(html)
+	var/datum/asset/spritesheet/assets = get_asset_datum(/datum/asset/spritesheet/pipes)
+	. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())
+
 /obj/item/pipe_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)

code/game/objects/structures/dresser.dm

@@ -21,35 +21,62 @@
 
 /obj/structure/dresser/attack_hand(mob/user)
 	. = ..()
-	if(.)
+	if(. || !ishuman(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
 		return
-	if(!Adjacent(user))//no tele-grooming
+	var/mob/living/carbon/human/H = user
+
+	if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits))
+		to_chat(H, "<span class='warning'>You are not capable of wearing underwear.</span>")
 		return
-	if(ishuman(user))
-		var/mob/living/carbon/human/H = user
 
-		if(H.dna && H.dna.species && (NO_UNDERWEAR in H.dna.species.species_traits))
-			to_chat(user, "<span class='warning'>You are not capable of wearing underwear.</span>")
-			return
+	var/list/undergarment_choices = list("Underwear", "Underwear Color", "Undershirt", "Undershirt Color", "Socks", "Socks Color")
+	if(!UNDIE_COLORABLE(GLOB.underwear_list[H.underwear]))
+		undergarment_choices -= "Underwear Color"
+	if(!UNDIE_COLORABLE(GLOB.undershirt_list[H.undershirt]))
+		undergarment_choices -= "Undershirt Color"
+	if(!UNDIE_COLORABLE(GLOB.socks_list[H.socks]))
+		undergarment_choices -= "Socks Color"
 
-		var/choice = input(user, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in list("Underwear","Undershirt","Socks")
+	var/choice = input(H, "Underwear, Undershirt, or Socks?", "Changing") as null|anything in undergarment_choices
+	if(!H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return
+	var/dye_undie = FALSE
+	var/dye_shirt = FALSE
+	var/dye_socks = FALSE
+	switch(choice)
+		if("Underwear")
+			var/new_undies = input(H, "Select your underwear", "Changing") as null|anything in GLOB.underwear_list
+			if(H.underwear)
+				H.underwear = new_undies
+				H.saved_underwear = new_undies
+				var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[new_undies]
+				dye_undie = B?.has_color
+		if("Undershirt")
+			var/new_undershirt = input(H, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
+			if(new_undershirt)
+				H.undershirt = new_undershirt
+				H.saved_undershirt = new_undershirt
+				var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[new_undershirt]
+				dye_shirt = T?.has_color
+		if("Socks")
+			var/new_socks = input(H, "Select your socks", "Changing") as null|anything in GLOB.socks_list
+			if(new_socks)
+				H.socks = new_socks
+				H.saved_socks = new_socks
+				var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[new_socks]
+				dye_socks = S?.has_color
+	if(dye_undie || choice == "Underwear Color")
+		H.undie_color = recolor_undergarment(H, "underwear", H.undie_color)
+	if(dye_shirt || choice == "Undershirt Color")
+		H.shirt_color = recolor_undergarment(H, "undershirt", H.shirt_color)
+	if(dye_socks || choice == "Socks Color")
+		H.socks_color = recolor_undergarment(H, "socks", H.socks_color)
 
-		if(!Adjacent(user))
-			return
-		switch(choice)
-			if("Underwear")
-				var/new_undies = input(user, "Select your underwear", "Changing")  as null|anything in GLOB.underwear_list
-				if(new_undies)
-					H.underwear = new_undies
+	add_fingerprint(H)
+	H.update_body()
 
-			if("Undershirt")
-				var/new_undershirt = input(user, "Select your undershirt", "Changing") as null|anything in GLOB.undershirt_list
-				if(new_undershirt)
-					H.undershirt = new_undershirt
-			if("Socks")
-				var/new_socks = input(user, "Select your socks", "Changing") as null|anything in GLOB.socks_list
-				if(new_socks)
-					H.socks= new_socks
-
-		add_fingerprint(H)
-		H.update_body()
+/obj/structure/dresser/proc/recolor_undergarment(mob/living/carbon/human/H, garment_type = "underwear", default_color)
+	var/n_color = input(H, "Choose your [garment_type]'\s color.", "Character Preference", default_color) as color|null
+	if(!n_color || !H.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
+		return default_color
+	return n_color

code/modules/VR/vr_sleeper.dm

@@ -164,8 +164,11 @@
 		vr_human.name = H.name
 		vr_human.real_name = H.real_name
 		vr_human.socks = H.socks
+		vr_human.socks_color = H.socks_color
 		vr_human.undershirt = H.undershirt
+		vr_human.shirt_color = H.shirt_color
 		vr_human.underwear = H.underwear
+		vr_human.undie_color = H.undie_color
 		vr_human.updateappearance(TRUE, TRUE, TRUE)
 		vr_human.give_genitals(TRUE) //CITADEL ADD
 		if(outfit)

code/modules/admin/create_mob.dm

@@ -15,6 +15,9 @@
 	H.real_name = random_unique_name(H.gender)
 	H.name = H.real_name
 	H.underwear = random_underwear(H.gender)
+	H.undie_color = random_color()
+	H.undershirt = random_undershirt(H.gender)
+	H.shirt_color = random_color()
 	H.skin_tone = random_skin_tone()
 	H.hair_style = random_hair_style(H.gender)
 	H.facial_hair_style = random_facial_hair_style(H.gender)
@@ -26,8 +29,8 @@
 	// Mutant randomizing, doesn't affect the mob appearance unless it's the specific mutant.
 	H.dna.features["mcolor"] = random_short_color()
 	H.dna.features["tail_lizard"] = pick(GLOB.tails_list_lizard)
-	H.dna.features["snout"] = pick(GLOB.snouts_list) 
-	H.dna.features["horns"] = pick(GLOB.horns_list) 
+	H.dna.features["snout"] = pick(GLOB.snouts_list)
+	H.dna.features["horns"] = pick(GLOB.horns_list)
 	H.dna.features["frills"] = pick(GLOB.frills_list)
 	H.dna.features["spines"] = pick(GLOB.spines_list)
 	H.dna.features["body_markings"] = pick(GLOB.body_markings_list)

code/modules/antagonists/changeling/changeling.dm

@@ -269,8 +269,11 @@
 	prof.protected = protect
 
 	prof.underwear = H.underwear
+	prof.undie_color = H.undie_color
 	prof.undershirt = H.undershirt
+	prof.shirt_color = H.shirt_color
 	prof.socks = H.socks
+	prof.socks_color = H.socks_color
 
 	var/list/slots = list("head", "wear_mask", "back", "wear_suit", "w_uniform", "shoes", "belt", "gloves", "glasses", "ears", "wear_id", "s_store")
 	for(var/slot in slots)
@@ -503,8 +506,11 @@
 	var/list/item_state_list = list()
 
 	var/underwear
+	var/undie_color
 	var/undershirt
+	var/shirt_color
 	var/socks
+	var/socks_color
 
 /datum/changelingprofile/Destroy()
 	qdel(dna)

code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm

@@ -21,17 +21,17 @@
 
 /obj/item/clothing/head/helmet/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
-		armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
 		clothing_flags |= STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else if(GLOB.ratvar_approaches)
-		armor = list("melee" = 70, "bullet" = 80, "laser" = -15, "energy" = 25, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 70, bullet = 80, laser = -15, energy = 25, bomb = 70, bio = 0, rad = 0, fire = 100, acid = 100)
 		clothing_flags |= STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
-		armor = list("melee" = 60, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 60, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
 		clothing_flags &= ~STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)
@@ -82,17 +82,17 @@
 
 /obj/item/clothing/suit/armor/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
-		armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
 		clothing_flags |= STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else if(GLOB.ratvar_approaches)
-		armor = list("melee" = 70, "bullet" = 80, "laser" = -15, "energy" = 25, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 70, bullet = 80, laser = -15, energy = 25, bomb = 70, bio = 0, rad = 0, fire = 100, acid = 100)
 		clothing_flags |= STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
-		armor = list("melee" = 60, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 60, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
 		clothing_flags &= ~STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)
@@ -148,12 +148,12 @@
 
 /obj/item/clothing/gloves/clockwork/ratvar_act()
 	if(GLOB.ratvar_awakens)
-		armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 100, bio = 100, rad = 100, fire = 100, acid = 100)
 		clothing_flags |= STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 		min_cold_protection_temperature = SPACE_HELM_MIN_TEMP_PROTECT
 	else
-		armor = list("melee" = 80, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+		armor = getArmor(melee = 80, bullet = 70, laser = -25, energy = 0, bomb = 60, bio = 0, rad = 0, fire = 100, acid = 100)
 		clothing_flags &= ~STOPSPRESSUREDAMAGE
 		max_heat_protection_temperature = initial(max_heat_protection_temperature)
 		min_cold_protection_temperature = initial(min_cold_protection_temperature)

code/modules/client/asset_cache.dm

@@ -470,19 +470,46 @@ GLOBAL_LIST_EMPTY(asset_datums)
 /datum/asset/spritesheet/simple/minesweeper
 	name = "minesweeper"
 	assets = list(
-		"1" = 'icons/misc/minesweeper_tiles/one.png',
-		"2" = 'icons/misc/minesweeper_tiles/two.png',
-		"3" = 'icons/misc/minesweeper_tiles/three.png',
-		"4" = 'icons/misc/minesweeper_tiles/four.png',
-		"5" = 'icons/misc/minesweeper_tiles/five.png',
-		"6" = 'icons/misc/minesweeper_tiles/six.png',
-		"7" = 'icons/misc/minesweeper_tiles/seven.png',
-		"8" = 'icons/misc/minesweeper_tiles/eight.png',
-		"empty" = 'icons/misc/minesweeper_tiles/empty.png',
-		"flag" = 'icons/misc/minesweeper_tiles/flag.png',
-		"hidden" = 'icons/misc/minesweeper_tiles/hidden.png',
-		"mine" = 'icons/misc/minesweeper_tiles/mine.png',
-		"minehit" = 'icons/misc/minesweeper_tiles/minehit.png'
+		"1" = 'icons/UI_Icons/minesweeper_tiles/one.png',
+		"2" = 'icons/UI_Icons/minesweeper_tiles/two.png',
+		"3" = 'icons/UI_Icons/minesweeper_tiles/three.png',
+		"4" = 'icons/UI_Icons/minesweeper_tiles/four.png',
+		"5" = 'icons/UI_Icons/minesweeper_tiles/five.png',
+		"6" = 'icons/UI_Icons/minesweeper_tiles/six.png',
+		"7" = 'icons/UI_Icons/minesweeper_tiles/seven.png',
+		"8" = 'icons/UI_Icons/minesweeper_tiles/eight.png',
+		"empty" = 'icons/UI_Icons/minesweeper_tiles/empty.png',
+		"flag" = 'icons/UI_Icons/minesweeper_tiles/flag.png',
+		"hidden" = 'icons/UI_Icons/minesweeper_tiles/hidden.png',
+		"mine" = 'icons/UI_Icons/minesweeper_tiles/mine.png',
+		"minehit" = 'icons/UI_Icons/minesweeper_tiles/minehit.png'
+	)
+
+/datum/asset/spritesheet/simple/pills
+	name = "pills"
+	assets = list(
+		"pill1" = 'icons/UI_Icons/Pills/pill1.png',
+		"pill2" = 'icons/UI_Icons/Pills/pill2.png',
+		"pill3" = 'icons/UI_Icons/Pills/pill3.png',
+		"pill4" = 'icons/UI_Icons/Pills/pill4.png',
+		"pill5" = 'icons/UI_Icons/Pills/pill5.png',
+		"pill6" = 'icons/UI_Icons/Pills/pill6.png',
+		"pill7" = 'icons/UI_Icons/Pills/pill7.png',
+		"pill8" = 'icons/UI_Icons/Pills/pill8.png',
+		"pill9" = 'icons/UI_Icons/Pills/pill9.png',
+		"pill10" = 'icons/UI_Icons/Pills/pill10.png',
+		"pill11" = 'icons/UI_Icons/Pills/pill11.png',
+		"pill12" = 'icons/UI_Icons/Pills/pill12.png',
+		"pill13" = 'icons/UI_Icons/Pills/pill13.png',
+		"pill14" = 'icons/UI_Icons/Pills/pill14.png',
+		"pill15" = 'icons/UI_Icons/Pills/pill15.png',
+		"pill16" = 'icons/UI_Icons/Pills/pill16.png',
+		"pill17" = 'icons/UI_Icons/Pills/pill17.png',
+		"pill18" = 'icons/UI_Icons/Pills/pill18.png',
+		"pill19" = 'icons/UI_Icons/Pills/pill19.png',
+		"pill20" = 'icons/UI_Icons/Pills/pill20.png',
+		"pill21" = 'icons/UI_Icons/Pills/pill21.png',
+		"pill22" = 'icons/UI_Icons/Pills/pill22.png',
 	)
 
 /datum/asset/simple/IRV

code/modules/client/preferences.dm

@@ -71,8 +71,11 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/gender = MALE					//gender of character (well duh)
 	var/age = 30						//age of character
 	var/underwear = "Nude"				//underwear type
+	var/undie_color = "#FFFFFF"
 	var/undershirt = "Nude"				//undershirt type
+	var/shirt_color = "#FFFFFF"
 	var/socks = "Nude"					//socks type
+	var/socks_color = "#FFFFFF"
 	var/backbag = DBACKPACK				//backpack type
 	var/hair_style = "Bald"				//Hair type
 	var/hair_color = "000"				//Hair color
@@ -674,8 +677,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 			dat += "<table><tr><td width='340px' height='300px' valign='top'>"
 			dat += "<h2>Clothing & Equipment</h2>"
 			dat += "<b>Underwear:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=underwear;task=input'>[underwear]</a>"
+			if(UNDIE_COLORABLE(GLOB.underwear_list[underwear]))
+				dat += "<b>Underwear Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=undie_color;task=input'>[undie_color]</a>"
 			dat += "<b>Undershirt:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=undershirt;task=input'>[undershirt]</a>"
+			if(UNDIE_COLORABLE(GLOB.undershirt_list[undershirt]))
+				dat += "<b>Undershirt Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=shirt_color;task=input'>[shirt_color]</a>"
 			dat += "<b>Socks:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=socks;task=input'>[socks]</a>"
+			if(UNDIE_COLORABLE(GLOB.socks_list[socks]))
+				dat += "<b>Socks Color:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=socks_color;task=input'>[socks_color]</a>"
 			dat += "<b>Backpack:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=bag;task=input'>[backbag]</a>"
 			dat += "<b>Uplink Location:</b><a style='display:block;width:100px' href ='?_src_=prefs;preference=uplink_loc;task=input'>[uplink_spawn_loc]</a>"
 			dat += "</td>"
@@ -1399,10 +1408,13 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					facial_hair_style = random_facial_hair_style(gender)
 				if("underwear")
 					underwear = random_underwear(gender)
+					undie_color = random_color()
 				if("undershirt")
 					undershirt = random_undershirt(gender)
+					shirt_color = random_color()
 				if("socks")
 					socks = random_socks()
+					socks_color = random_color()
 				if(BODY_ZONE_PRECISE_EYES)
 					eye_color = random_eye_color()
 				if("s_tone")
@@ -1508,29 +1520,35 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					bgstate = next_list_item(bgstate, bgstate_options)
 
 				if("underwear")
-					var/new_underwear
-					if(gender == MALE)
-						new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in GLOB.underwear_m
-					else
-						new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in GLOB.underwear_f
+					var/new_underwear = input(user, "Choose your character's underwear:", "Character Preference")  as null|anything in GLOB.underwear_list
 					if(new_underwear)
 						underwear = new_underwear
 
+				if("undie_color")
+					var/n_undie_color = input(user, "Choose your underwear's color.", "Character Preference", undie_color) as color|null
+					if(n_undie_color)
+						undie_color = n_undie_color
+
 				if("undershirt")
-					var/new_undershirt
-					if(gender == MALE)
-						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_m
-					else
-						new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_f
+					var/new_undershirt = input(user, "Choose your character's undershirt:", "Character Preference") as null|anything in GLOB.undershirt_list
 					if(new_undershirt)
 						undershirt = new_undershirt
 
+				if("shirt_color")
+					var/n_shirt_color = input(user, "Choose your undershirt's color.", "Character Preference", shirt_color) as color|null
+					if(n_shirt_color)
+						shirt_color = n_shirt_color
+
 				if("socks")
-					var/new_socks
-					new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list
+					var/new_socks = input(user, "Choose your character's socks:", "Character Preference") as null|anything in GLOB.socks_list
 					if(new_socks)
 						socks = new_socks
 
+				if("socks_color")
+					var/n_socks_color = input(user, "Choose your socks' color.", "Character Preference", socks_color) as color|null
+					if(n_socks_color)
+						socks_color = n_socks_color
+
 				if("eyes")
 					var/new_eyes = input(user, "Choose your character's eye colour:", "Character Preference","#"+eye_color) as color|null
 					if(new_eyes)
@@ -2249,11 +2267,16 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	character.hair_style = hair_style
 	character.facial_hair_style = facial_hair_style
 	character.underwear = underwear
+
 	character.saved_underwear = underwear
 	character.undershirt = undershirt
 	character.saved_undershirt = undershirt
 	character.socks = socks
 	character.saved_socks = socks
+	character.undie_color = undie_color
+	character.shirt_color = shirt_color
+	character.socks_color = socks_color
+
 
 	character.backbag = backbag
 

code/modules/client/preferences_savefile.dm

@@ -268,8 +268,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["hair_style_name"]	>> hair_style
 	S["facial_style_name"]	>> facial_hair_style
 	S["underwear"]			>> underwear
+	S["undie_color"]		>> undie_color
 	S["undershirt"]			>> undershirt
+	S["shirt_color"]		>> shirt_color
 	S["socks"]				>> socks
+	S["socks_color"]		>> socks_color
 	S["backbag"]			>> backbag
 	S["uplink_loc"]			>> uplink_spawn_loc
 	S["feature_mcolor"]					>> features["mcolor"]
@@ -390,14 +393,15 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	if(gender == MALE)
 		hair_style			= sanitize_inlist(hair_style, GLOB.hair_styles_male_list)
 		facial_hair_style			= sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_male_list)
-		underwear		= sanitize_inlist(underwear, GLOB.underwear_m)
-		undershirt 		= sanitize_inlist(undershirt, GLOB.undershirt_m)
 	else
 		hair_style			= sanitize_inlist(hair_style, GLOB.hair_styles_female_list)
 		facial_hair_style			= sanitize_inlist(facial_hair_style, GLOB.facial_hair_styles_female_list)
-		underwear		= sanitize_inlist(underwear, GLOB.underwear_f)
-		undershirt		= sanitize_inlist(undershirt, GLOB.undershirt_f)
+	underwear		= sanitize_inlist(underwear, GLOB.underwear_list)
+	undie_color		= sanitize_hexcolor(undie_color, 6, 1, initial(undie_color))
+	undershirt		= sanitize_inlist(undershirt, GLOB.undershirt_list)
+	shirt_color		= sanitize_hexcolor(shirt_color, 6, 1, initial(shirt_color))
 	socks			= sanitize_inlist(socks, GLOB.socks_list)
+	socks_color		= sanitize_hexcolor(socks_color, 6, 1, initial(socks_color))
 	age				= sanitize_integer(age, AGE_MIN, AGE_MAX, initial(age))
 	hair_color			= sanitize_hexcolor(hair_color, 3, 0)
 	facial_hair_color			= sanitize_hexcolor(facial_hair_color, 3, 0)
@@ -467,8 +471,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	WRITE_FILE(S["hair_style_name"]	, hair_style)
 	WRITE_FILE(S["facial_style_name"]	, facial_hair_style)
 	WRITE_FILE(S["underwear"]			, underwear)
+	WRITE_FILE(S["undie_color"]			, undie_color)
 	WRITE_FILE(S["undershirt"]			, undershirt)
+	WRITE_FILE(S["shirt_color"]			, shirt_color)
 	WRITE_FILE(S["socks"]				, socks)
+	WRITE_FILE(S["socks_color"]			, socks_color)
 	WRITE_FILE(S["backbag"]			, backbag)
 	WRITE_FILE(S["uplink_loc"]			, uplink_spawn_loc)
 	WRITE_FILE(S["species"]			, pref_species.id)

code/modules/clothing/head/helmet.dm

@@ -54,6 +54,8 @@
 	tint = 2
 
 /obj/item/clothing/head/helmet/blueshirt
+	name = "blue helmet"
+	desc = "A reliable, blue tinted helmet reminding you that you <i>still</i> owe that engineer a beer."
 	icon_state = "blueshift"
 	item_state = "blueshift"
 

code/modules/clothing/suits/armor.dm

@@ -37,6 +37,8 @@
 	slowdown = 1
 
 /obj/item/clothing/suit/armor/vest/blueshirt
+	name = "large armor vest"
+	desc = "A large, yet comfortable piece of armor, protecting you from some threats."
 	icon_state = "blueshift"
 	item_state = "blueshift"
 
@@ -59,7 +61,7 @@
 	flags_inv = 0
 	strip_delay = 80
 	unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
-	
+
 /obj/item/clothing/suit/armor/vest/warden
 	name = "warden's jacket"
 	desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."

code/modules/clothing/under/jobs/security.dm

@@ -142,6 +142,7 @@
  */
 
 /obj/item/clothing/under/rank/security/blueshirt
+	name = "blue shirt and tie"
 	desc = "I'm a little busy right now, Calhoun."
 	icon_state = "blueshift"
 	item_state = "blueshift"

code/modules/events/mice_migration.dm

@@ -32,4 +32,4 @@
 				P.update_icon()
 
 /datum/round_event/mice_migration/start()
-	SSsqueak.trigger_migration(rand(minimum_mice, maximum_mice))
+	SSminor_mapping.trigger_migration(rand(minimum_mice, maximum_mice))

code/modules/mob/dead/new_player/preferences_setup.dm

@@ -6,8 +6,11 @@
 	else
 		gender = pick(MALE,FEMALE)
 	underwear = random_underwear(gender)
+	undie_color = random_color()
 	undershirt = random_undershirt(gender)
+	shirt_color = random_color()
 	socks = random_socks()
+	socks_color = random_color()
 	skin_tone = random_skin_tone()
 	hair_style = random_hair_style(gender)
 	facial_hair_style = random_facial_hair_style(gender)

code/modules/mob/dead/new_player/sprite_accessories/_sprite_accessories.dm

@@ -59,4 +59,8 @@
 	var/locked = FALSE		//Is this part locked from roundstart selection? Used for parts that apply effects
 	var/dimension_x = 32
 	var/dimension_y = 32
-	var/center = FALSE	//Should we center the sprite?
+	var/center = FALSE	//Should we center the sprite?
+
+/datum/sprite_accessory/underwear
+	icon = 'icons/mob/underwear.dmi'
+	var/has_color = FALSE

code/modules/mob/dead/new_player/sprite_accessories/socks.dm

@@ -2,135 +2,132 @@
 // Socks Definitions //
 ///////////////////////
 
-/datum/sprite_accessory/socks
-	icon = 'icons/mob/underwear.dmi'
-
-/datum/sprite_accessory/socks/nude
+/datum/sprite_accessory/underwear/socks/nude
 	name = "Nude"
 	icon_state = null
 
 // please make sure they're sorted alphabetically and categorized
 
-/datum/sprite_accessory/socks/bee_knee
-	name = "Knee-high (Bee)"
+/datum/sprite_accessory/underwear/socks/socks_knee
+	name = "Knee-high"
+	icon_state = "socks_knee"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/socks/bee_knee
+	name = "Knee-high - Bee"
 	icon_state = "bee_knee"
 
-/datum/sprite_accessory/socks/black_knee
-	name = "Knee-high (Black)"
-	icon_state = "black_knee"
-
-/datum/sprite_accessory/socks/commie_knee
-	name = "Knee-High (Commie)"
+/datum/sprite_accessory/underwear/socks/commie_knee
+	name = "Knee-High - Commie"
 	icon_state = "commie_knee"
 
-/datum/sprite_accessory/socks/usa_knee
-	name = "Knee-High (Freedom)"
+/datum/sprite_accessory/underwear/socks/usa_knee
+	name = "Knee-High - Freedom"
 	icon_state = "assblastusa_knee"
 
-/datum/sprite_accessory/socks/rainbow_knee
-	name = "Knee-high (Rainbow)"
+/datum/sprite_accessory/underwear/socks/rainbow_knee
+	name = "Knee-high - Rainbow"
 	icon_state = "rainbow_knee"
 
-/datum/sprite_accessory/socks/striped_knee
-	name = "Knee-high (Striped)"
+/datum/sprite_accessory/underwear/socks/striped_knee
+	name = "Knee-high - Striped"
 	icon_state = "striped_knee"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/thin_knee
-	name = "Knee-high (Thin)"
+/datum/sprite_accessory/underwear/socks/thin_knee
+	name = "Knee-high - Thin"
 	icon_state = "thin_knee"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/uk_knee
-	name = "Knee-High (UK)"
+/datum/sprite_accessory/underwear/socks/uk_knee
+	name = "Knee-High - UK"
 	icon_state = "uk_knee"
 
-/datum/sprite_accessory/socks/white_knee
-	name = "Knee-high (White)"
-	icon_state = "white_knee"
+/datum/sprite_accessory/underwear/socks/socks_norm
+	name = "Normal"
+	icon_state = "socks_norm"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/black_norm
-	name = "Normal (Black)"
-	icon_state = "black_norm"
+/datum/sprite_accessory/underwear/socks/bee_norm
+	name = "Normal - Bee"
+	icon_state = "bee_norm"
 
-/datum/sprite_accessory/socks/white_norm
-	name = "Normal (White)"
-	icon_state = "white_norm"
-
-/datum/sprite_accessory/socks/pantyhose
+/datum/sprite_accessory/underwear/socks/pantyhose
 	name = "Pantyhose"
 	icon_state = "pantyhose"
 
-/datum/sprite_accessory/socks/black_short
-	name = "Short (Black)"
-	icon_state = "black_short"
+/datum/sprite_accessory/underwear/socks/socks_short
+	name = "Short"
+	icon_state = "socks_short"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/white_short
-	name = "Short (White)"
-	icon_state = "white_short"
-
-/datum/sprite_accessory/socks/stockings_blue
-	name = "Stockings (Blue)"
+/datum/sprite_accessory/underwear/socks/stockings_blue
+	name = "Stockings - Blue"
 	icon_state = "stockings_blue"
 
-/datum/sprite_accessory/socks/stockings_cyan
-	name = "Stockings (Cyan)"
+/datum/sprite_accessory/underwear/socks/stockings_cyan
+	name = "Stockings - Cyan"
 	icon_state = "stockings_cyan"
 
-/datum/sprite_accessory/socks/stockings_dpink
-	name = "Stockings (Dark Pink)"
+/datum/sprite_accessory/underwear/socks/stockings_dpink
+	name = "Stockings - Dark Pink"
 	icon_state = "stockings_dpink"
 
-/datum/sprite_accessory/socks/stockings_green
-	name = "Stockings (Green)"
+/datum/sprite_accessory/underwear/socks/stockings_green
+	name = "Stockings - Green"
 	icon_state = "stockings_black"
 
-/datum/sprite_accessory/socks/stockings_orange
-	name = "Stockings (Orange)"
+/datum/sprite_accessory/underwear/socks/stockings_orange
+	name = "Stockings - Orange"
 	icon_state = "stockings_orange"
 
-/datum/sprite_accessory/socks/stockings_programmer
-	name = "Stockings (Programmer)"
+/datum/sprite_accessory/underwear/socks/stockings_programmer
+	name = "Stockings - Programmer"
 	icon_state = "stockings_lpink"
 
-/datum/sprite_accessory/socks/stockings_purple
-	name = "Stockings (Purple)"
+/datum/sprite_accessory/underwear/socks/stockings_purple
+	name = "Stockings - Purple"
 	icon_state = "stockings_purple"
 
-/datum/sprite_accessory/socks/stockings_yellow
-	name = "Stockings (Yellow)"
+/datum/sprite_accessory/underwear/socks/stockings_yellow
+	name = "Stockings - Yellow"
 	icon_state = "stockings_yellow"
 
-/datum/sprite_accessory/socks/bee_thigh
-	name = "Thigh-high (Bee)"
+/datum/sprite_accessory/underwear/socks/socks_thigh
+	name = "Thigh-high"
+	icon_state = "socks_thigh"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/socks/bee_thigh
+	name = "Thigh-high - Bee"
 	icon_state = "bee_thigh"
 
-/datum/sprite_accessory/socks/black_thigh
-	name = "Thigh-high (Black)"
-	icon_state = "black_thigh"
-
-/datum/sprite_accessory/socks/commie_thigh
-	name = "Thigh-high (Commie)"
+/datum/sprite_accessory/underwear/socks/commie_thigh
+	name = "Thigh-high - Commie"
 	icon_state = "commie_thigh"
 
-/datum/sprite_accessory/socks/usa_thigh
-	name = "Thigh-high (Freedom)"
+/datum/sprite_accessory/underwear/socks/usa_thigh
+	name = "Thigh-high - Freedom"
 	icon_state = "assblastusa_thigh"
 
-/datum/sprite_accessory/socks/rainbow_thigh
-	name = "Thigh-high (Rainbow)"
+/datum/sprite_accessory/underwear/socks/fishnet
+	name = "Thigh-high - Fishnet"
+	icon_state = "fishnet"
+
+/datum/sprite_accessory/underwear/socks/rainbow_thigh
+	name = "Thigh-high - Rainbow"
 	icon_state = "rainbow_thigh"
 
-/datum/sprite_accessory/socks/striped_thigh
-	name = "Thigh-high (Striped)"
+/datum/sprite_accessory/underwear/socks/striped_thigh
+	name = "Thigh-high - Striped"
 	icon_state = "striped_thigh"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/thin_thigh
-	name = "Thigh-high (Thin)"
+/datum/sprite_accessory/underwear/socks/thin_thigh
+	name = "Thigh-high - Thin"
 	icon_state = "thin_thigh"
+	has_color = TRUE
 
-/datum/sprite_accessory/socks/uk_thigh
-	name = "Thigh-high (UK)"
+/datum/sprite_accessory/underwear/socks/uk_thigh
+	name = "Thigh-high - UK"
 	icon_state = "uk_thigh"
-
-/datum/sprite_accessory/socks/white_thigh
-	name = "Thigh-high (White)"
-	icon_state = "white_thigh"

code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm

@@ -2,311 +2,288 @@
 // Undershirt Definitions //
 ////////////////////////////
 
-/datum/sprite_accessory/undershirt
-	icon = 'icons/mob/underwear.dmi'
-	gender = NEUTER
-
-/datum/sprite_accessory/undershirt/nude
+/datum/sprite_accessory/underwear/top/nude
 	name = "Nude"
 	icon_state = null
 
 // please make sure they're sorted alphabetically and categorized
 
-/datum/sprite_accessory/undershirt/bluejersey
+/datum/sprite_accessory/underwear/top/longjon
+	name = "Long John Shirt"
+	icon_state = "ljont"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/longstripe_black
+	name = "Longsleeve Striped Shirt - Black"
+	icon_state = "longstripe"
+
+/datum/sprite_accessory/underwear/top/longstripe_blue
+	name = "Longsleeve Striped Shirt - Blue"
+	icon_state = "longstripe_blue"
+
+/datum/sprite_accessory/underwear/top/shirt
+	name = "Shirt"
+	icon_state = "undershirt"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bowlingw
+	name = "Shirt - Bowling"
+	icon_state = "bowlingw"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bowling
+	name = "Shirt, Bowling - Red"
+	icon_state = "bowling"
+
+/datum/sprite_accessory/underwear/top/bowlingp
+	name = "Shirt, Bowling - Pink"
+	icon_state = "bowlingp"
+
+/datum/sprite_accessory/underwear/top/bowlinga
+	name = "Shirt, Bowling - Aqua"
+	icon_state = "bowlinga"
+
+/datum/sprite_accessory/underwear/top/bluejersey
 	name = "Shirt, Jersey - Blue"
 	icon_state = "shirt_bluejersey"
 
-/datum/sprite_accessory/undershirt/redjersey
+/datum/sprite_accessory/underwear/top/redjersey
 	name = "Shirt, Jersey - Red"
 	icon_state = "shirt_redjersey"
 
-/datum/sprite_accessory/undershirt/bluepolo
-	name = "Shirt, Polo - Blue"
-	icon_state = "bluepolo"
+/datum/sprite_accessory/underwear/top/polo
+	name = "Shirt - Polo"
+	icon_state = "polo"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/grayyellowpolo
-	name = "Shirt, Polo - Gray, Yellow"
-	icon_state = "grayyellowpolo"
-
-/datum/sprite_accessory/undershirt/redpolo
-	name = "Shirt, Polo - Red"
-	icon_state = "redpolo"
-
-/datum/sprite_accessory/undershirt/whitepolo
-	name = "Shirt, Polo - White"
-	icon_state = "whitepolo"
-
-/datum/sprite_accessory/undershirt/alienshirt
+/datum/sprite_accessory/underwear/top/alienshirt
 	name = "Shirt - Alien"
 	icon_state = "shirt_alien"
 
-/datum/sprite_accessory/undershirt/mondmondjaja
+/datum/sprite_accessory/underwear/top/mondmondjaja
 	name = "Shirt - Band"
 	icon_state = "band"
 
-/datum/sprite_accessory/undershirt/shirt_black
-	name = "Shirt - Black"
-	icon_state = "shirt_black"
+/datum/sprite_accessory/underwear/top/shirt_bee
+	name = "Shirt - Bee"
+	icon_state = "bee_shirt"
 
-/datum/sprite_accessory/undershirt/blueshirt
-	name = "Shirt - Blue"
-	icon_state = "shirt_blue"
-
-/datum/sprite_accessory/undershirt/clownshirt
+/datum/sprite_accessory/underwear/top/clownshirt
 	name = "Shirt - Clown"
 	icon_state = "shirt_clown"
 
-/datum/sprite_accessory/undershirt/commie
+/datum/sprite_accessory/underwear/top/commie
 	name = "Shirt - Commie"
 	icon_state = "shirt_commie"
 
-/datum/sprite_accessory/undershirt/greenshirt
-	name = "Shirt - Green"
-	icon_state = "shirt_green"
-
-/datum/sprite_accessory/undershirt/shirt_grey
-	name = "Shirt - Grey"
-	icon_state = "shirt_grey"
-
-/datum/sprite_accessory/undershirt/ian
+/datum/sprite_accessory/underwear/top/ian
 	name = "Shirt - Ian"
 	icon_state = "ian"
 
-/datum/sprite_accessory/undershirt/ilovent
+/datum/sprite_accessory/underwear/top/ilovent
 	name = "Shirt - I Love NT"
 	icon_state = "ilovent"
 
-/datum/sprite_accessory/undershirt/lover
+/datum/sprite_accessory/underwear/top/lover
 	name = "Shirt - Lover"
 	icon_state = "lover"
 
-/datum/sprite_accessory/undershirt/matroska
+/datum/sprite_accessory/underwear/top/matroska
 	name = "Shirt - Matroska"
 	icon_state = "matroska"
 
-/datum/sprite_accessory/undershirt/meat
+/datum/sprite_accessory/underwear/top/meat
 	name = "Shirt - Meat"
 	icon_state = "shirt_meat"
 
-/datum/sprite_accessory/undershirt/nano
+/datum/sprite_accessory/underwear/top/nano
 	name = "Shirt - Nanotrasen"
 	icon_state = "shirt_nano"
 
-/datum/sprite_accessory/undershirt/peace
+/datum/sprite_accessory/underwear/top/peace
 	name = "Shirt - Peace"
 	icon_state = "peace"
 
-/datum/sprite_accessory/undershirt/pacman
+/datum/sprite_accessory/underwear/top/pacman
 	name = "Shirt - Pogoman"
 	icon_state = "pogoman"
 
-/datum/sprite_accessory/undershirt/question
+/datum/sprite_accessory/underwear/top/question
 	name = "Shirt - Question"
 	icon_state = "shirt_question"
 
-/datum/sprite_accessory/undershirt/redshirt
-	name = "Shirt - Red"
-	icon_state = "shirt_red"
-
-/datum/sprite_accessory/undershirt/skull
+/datum/sprite_accessory/underwear/top/skull
 	name = "Shirt - Skull"
 	icon_state = "shirt_skull"
 
-/datum/sprite_accessory/undershirt/ss13
+/datum/sprite_accessory/underwear/top/ss13
 	name = "Shirt - SS13"
 	icon_state = "shirt_ss13"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/stripe
+/datum/sprite_accessory/underwear/top/stripe
 	name = "Shirt - Striped"
 	icon_state = "shirt_stripes"
 
-/datum/sprite_accessory/undershirt/tiedye
+/datum/sprite_accessory/underwear/top/tiedye
 	name = "Shirt - Tie-dye"
 	icon_state = "shirt_tiedye"
 
-/datum/sprite_accessory/undershirt/uk
+/datum/sprite_accessory/underwear/top/uk
 	name = "Shirt - UK"
 	icon_state = "uk"
 
-/datum/sprite_accessory/undershirt/usa
+/datum/sprite_accessory/underwear/top/usa
 	name = "Shirt - USA"
 	icon_state = "shirt_assblastusa"
 
-/datum/sprite_accessory/undershirt/shirt_white
-	name = "Shirt - White"
-	icon_state = "shirt_white"
+/datum/sprite_accessory/underwear/top/shortsleeve
+	name = "Shirt - Short Sleeved"
+	icon_state = "shortsleeve"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/blackshortsleeve
-	name = "Shirt, Short Sleeved - Black"
-	icon_state = "blackshortsleeve"
-
-/datum/sprite_accessory/undershirt/blueshortsleeve
-	name = "Shirt, Short Sleeved - Blue"
-	icon_state = "blueshortsleeve"
-
-/datum/sprite_accessory/undershirt/greenshortsleeve
-	name = "Shirt, Short Sleeved - Green"
-	icon_state = "greenshortsleeve"
-
-/datum/sprite_accessory/undershirt/purpleshortsleeve
-	name = "Shirt, Short Sleeved - Purple"
-	icon_state = "purpleshortsleeve"
-
-/datum/sprite_accessory/undershirt/whiteshortsleeve
-	name = "Shirt, Short Sleeved - White"
-	icon_state = "whiteshortsleeve"
-
-/datum/sprite_accessory/undershirt/blueshirtsport
+/datum/sprite_accessory/underwear/top/blueshirtsport
 	name = "Shirt, Sports - Blue"
 	icon_state = "blueshirtsport"
-	gender = NEUTER
 
-/datum/sprite_accessory/undershirt/greenshirtsport
+/datum/sprite_accessory/underwear/top/greenshirtsport
 	name = "Shirt, Sports - Green"
 	icon_state = "greenshirtsport"
-	gender = NEUTER
 
-/datum/sprite_accessory/undershirt/redshirtsport
+/datum/sprite_accessory/underwear/top/redshirtsport
 	name = "Shirt, Sports - Red"
 	icon_state = "redshirtsport"
-	gender = NEUTER
 
-/datum/sprite_accessory/undershirt/redtop
-	name = "Shirt, Short - Red"
-	icon_state = "redtop"
-
-/datum/sprite_accessory/undershirt/whitetop
-	name = "Shirt, Short - White"
-	icon_state = "whitetop"
-
-/datum/sprite_accessory/undershirt/tshirt_blue
-	name = "T-Shirt - Blue"
-	icon_state = "blueshirt"
-
-/datum/sprite_accessory/undershirt/tshirt_green
-	name = "T-Shirt - Green"
-	icon_state = "greenshirt"
-
-/datum/sprite_accessory/undershirt/tshirt_red
-	name = "T-Shirt - Red"
-	icon_state = "redshirt"
-
-/datum/sprite_accessory/undershirt/yellowshirt
-	name = "T-Shirt - Yellow"
-	icon_state = "yellowshirt"
-
-/datum/sprite_accessory/undershirt/tank_black
-	name = "Tank Top - Black"
-	icon_state = "tank_black"
-
-/datum/sprite_accessory/undershirt/tankfire
+/datum/sprite_accessory/underwear/top/tankfire
 	name = "Tank Top - Fire"
 	icon_state = "tank_fire"
 
-/datum/sprite_accessory/undershirt/tank_grey
-	name = "Tank Top - Grey"
-	icon_state = "tank_grey"
+/datum/sprite_accessory/underwear/top/tanktop
+	name = "Tank Top"
+	icon_state = "tanktop"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_midriff
+/datum/sprite_accessory/underwear/top/tanktop_alt
+	name = "Tank Top - Alt"
+	icon_state = "tanktop_alt"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/tanktop_midriff
 	name = "Tank Top - Midriff"
 	icon_state = "tank_midriff"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/tank_red
-	name = "Tank Top - Red"
-	icon_state = "tank_red"
+/datum/sprite_accessory/underwear/top/tanktop_midriff_alt
+	name = "Tank Top - Midriff Halterneck"
+	icon_state = "tank_midriff_alt"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/tankstripe
+/datum/sprite_accessory/underwear/top/tankstripe
 	name = "Tank Top - Striped"
 	icon_state = "tank_stripes"
 
-/datum/sprite_accessory/undershirt/tank_white
-	name = "Tank Top - White"
-	icon_state = "tank_white"
+/datum/sprite_accessory/underwear/top/tank_top_sun
+	name = "Tank top - Sun"
+	icon_state = "tank_sun"
 
-/datum/sprite_accessory/undershirt/female_red
-	name = "Bra - Red"
-	icon_state = "bra_red"
+/datum/sprite_accessory/underwear/top/babydoll
+	name = "Baby-Doll"
+	icon_state = "babydoll"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_pink
-	name = "Bra - Pink"
-	icon_state = "bra_pink"
+/datum/sprite_accessory/underwear/top/bra
+	name = "Bra"
+	icon_state = "bra"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_kinky
+/datum/sprite_accessory/underwear/top/bra_alt
+	name = "Bra - Alt"
+	icon_state = "bra_alt"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bra_thin
+	name = "Bra - Thin"
+	icon_state = "bra_thin"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/bra_kinky
 	name = "Bra - Kinky Black"
 	icon_state = "bra_kinky"
 
-/datum/sprite_accessory/undershirt/female_green
-	name = "Bra - Green"
-	icon_state = "bra_green"
-
-/datum/sprite_accessory/undershirt/female_commie
+/datum/sprite_accessory/underwear/top/bra_freedom
 	name = "Bra - Freedom"
 	icon_state = "bra_assblastusa"
 
-/datum/sprite_accessory/undershirt/female_commie
+/datum/sprite_accessory/underwear/top/bra_commie
 	name = "Bra - Commie"
 	icon_state = "bra_commie"
 
-/datum/sprite_accessory/undershirt/female_babyblue
-	name = "Bra - Baby Blue"
-	icon_state = "bra_babyblue"
-
-/datum/sprite_accessory/undershirt/female_beekini
+/datum/sprite_accessory/underwear/top/bra_beekini
 	name = "Bra - Bee-kini"
 	icon_state = "bra_bee-kini"
 
-/datum/sprite_accessory/undershirt/female_black
-	name = "Bra - Black"
-	icon_state = "bra_black"
-
-/datum/sprite_accessory/undershirt/female_uk
+/datum/sprite_accessory/underwear/top/bra_uk
 	name = "Bra - UK"
 	icon_state = "bra_uk"
 
-/datum/sprite_accessory/undershirt/female_white
-	name = "Bra - White"
-	icon_state = "bra_white"
+/datum/sprite_accessory/underwear/top/bra_neko
+	name = "Bra - Neko"
+	icon_state = "bra_neko"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_white_neko
-	name = "Bra, Neko - white"
-	icon_state = "bra_neko_white"
+/datum/sprite_accessory/underwear/top/halterneck_bra
+	name = "Bra - Halterneck"
+	icon_state = "halterneck_bra"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_black_neko
-	name = "Bra, Neko - Black"
-	icon_state = "bra_neko_black"
-
-/datum/sprite_accessory/undershirt/female_blackalt
-	name = "Bra, Sports - Black"
-	icon_state = "bra_sports_black"
-
-/datum/sprite_accessory/undershirt/sports_bra
-	name = "Bra, Sports 1 - White"
+/datum/sprite_accessory/underwear/top/sports_bra
+	name = "Bra, Sports"
 	icon_state = "sports_bra"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_whitealt
-	name = "Bra, Sports 2 - White"
-	icon_state = "bra_sports_white"
-
-/datum/sprite_accessory/undershirt/sports_bra2
-	name = "Bra, Sports 3 - White"
+/datum/sprite_accessory/underwear/top/sports_bra_alt
+	name = "Bra, Sports - Alt"
 	icon_state = "sports_bra_alt"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_yellow
-	name = "Bra - Yellow"
-	icon_state = "bra_yellow"
+/datum/sprite_accessory/underwear/top/bra_strapless
+	name = "Bra, Strapless"
+	icon_state = "bra_strapless"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/female_thong
-	name = "Bra, Strapless - Pink"
-	icon_state = "bra_strapless_pink"
-
-/datum/sprite_accessory/undershirt/female_blue
-	name = "Bra, Strapless - Blue"
+/datum/sprite_accessory/underwear/top/bra_strapless_alt
+	name = "Bra, Strapless - Alt"
 	icon_state = "bra_blue"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/swimsuit_green
-	name = "Swimsuit, Top - Green"
-	icon_state = "bra_swimming_green"
+/datum/sprite_accessory/underwear/top/striped_bra
+	name = "Bra - Striped"
+	icon_state = "striped_bra"
+	has_color = TRUE
 
-/datum/sprite_accessory/undershirt/swimsuit_purple
-	name = "Swimsuit, Top - Purple"
-	icon_state = "bra_swimming_purple"
+/datum/sprite_accessory/underwear/top/fishnet_sleeves
+	name = "Fishnet - sleeves"
+	icon_state = "fishnet_sleeves"
+
+/datum/sprite_accessory/underwear/top/fishnet_gloves
+	name = "Fishnet - gloves"
+	icon_state = "fishnet_gloves"
+
+/datum/sprite_accessory/underwear/top/fishnet_base
+	name = "Fishnet - top"
+	icon_state = "fishnet_body"
+
+/datum/sprite_accessory/underwear/top/swimsuit
+	name = "Swimsuit Top"
+	icon_state = "bra_swimming"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/swimsuit_alt
+	name = "Swimsuit Top - Strapless"
+	icon_state = "bra_swimming_alt"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/top/tubetop
+	name = "Tube Top"
+	icon_state = "tubetop"
+	has_color = TRUE

code/modules/mob/dead/new_player/sprite_accessories/underwear.dm

@@ -1,174 +1,144 @@
 ///////////////////////////
 // Underwear Definitions //
 ///////////////////////////
-/datum/sprite_accessory/underwear
-	icon = 'icons/mob/underwear.dmi'
-	gender = NEUTER
 
-/datum/sprite_accessory/underwear/nude
+/datum/sprite_accessory/underwear/bottom/nude
 	name = "Nude"
 	icon_state = null
 
-/datum/sprite_accessory/underwear/mankini
-	name = "Mankini - Green"
-	icon_state = "mankini_green"
+/datum/sprite_accessory/underwear/bottom/mankini
+	name = "Mankini"
+	icon_state = "mankini"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/male_kinky
-	name = "Jockstrap - White"
-	icon_state = "jockstrap_white"
+/datum/sprite_accessory/underwear/bottom/male_kinky
+	name = "Jockstrap"
+	icon_state = "jockstrap"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/male_white
-	name = "Briefs - White"
-	icon_state = "briefs_white"
+/datum/sprite_accessory/underwear/bottom/briefs
+	name = "Briefs"
+	icon_state = "briefs"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/male_black
-	name = "Briefs - Black"
-	icon_state = "briefs_black"
+/datum/sprite_accessory/underwear/bottom/boxers
+	name = "Boxers"
+	icon_state = "boxers"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/male_grey
-	name = "Briefs - Grey"
-	icon_state = "briefs_grey"
+/datum/sprite_accessory/underwear/bottom/male_bee
+	name = "Boxers - Bee"
+	icon_state = "bee_shorts"
 
-/datum/sprite_accessory/underwear/male_red
-	name = "Briefs - Red"
-	icon_state = "briefs_red"
-
-/datum/sprite_accessory/underwear/male_green
-	name = "Briefs - Green"
-	icon_state = "briefs_green"
-
-/datum/sprite_accessory/underwear/male_blue
-	name = "Briefs - Blue"
-	icon_state = "briefs_blue"
-
-/datum/sprite_accessory/underwear/male_blackalt
-	name = "Boxers - Black"
-	icon_state = "boxers_black"
-
-/datum/sprite_accessory/underwear/male_greyalt
-	name = "Boxers - Grey"
-	icon_state = "boxers_grey"
-
-/datum/sprite_accessory/underwear/male_hearts
+/datum/sprite_accessory/underwear/bottom/male_hearts
 	name = "Boxers - Heart"
 	icon_state = "boxers_heart"
 
-/datum/sprite_accessory/underwear/male_stripe
+/datum/sprite_accessory/underwear/bottom/male_stripe
 	name = "Boxers - Striped"
 	icon_state = "boxers_striped"
 
-/datum/sprite_accessory/underwear/male_commie
+/datum/sprite_accessory/underwear/bottom/male_commie
 	name = "Boxers - Striped Communist"
 	icon_state = "boxers_commie"
 
-/datum/sprite_accessory/underwear/male_usastripe
+/datum/sprite_accessory/underwear/bottom/male_usastripe
 	name = "Boxers - Striped Freedom"
 	icon_state = "boxers_assblastusa"
 
-/datum/sprite_accessory/underwear/male_uk
+/datum/sprite_accessory/underwear/bottom/male_uk
 	name = "Boxers - Striped UK"
 	icon_state = "boxers_uk"
 
+/datum/sprite_accessory/underwear/bottom/boxer_briefs
+	name = "Boxer Briefs"
+	icon_state = "boxer_briefs"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/female_whitealt
-	name = "Boxer Briefs - White"
-	icon_state = "boxer_briefs_white"
+/datum/sprite_accessory/underwear/bottom/panties
+	name = "Panties"
+	icon_state = "panties"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/female_blackalt
-	name = "Boxer Briefs - Black"
-	icon_state = "boxer_briefs_black"
+/datum/sprite_accessory/underwear/bottom/panties_alt
+	name = "Panties - Alt"
+	icon_state = "panties_alt"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/female_pink
-	name = "Boxer Briefs - Pink"
-	icon_state = "boxer_briefs_pink"
+/datum/sprite_accessory/underwear/bottom/fishnet_lower
+	name = "Panties - Fishnet"
+	icon_state = "fishnet_lower"
 
-/datum/sprite_accessory/underwear/female_babyblue
-	name = "Boxer Briefs - Baby Blue"
-	icon_state = "boxer_briefs_babyblue"
-
-/datum/sprite_accessory/underwear/female_yellow
-	name = "Boxer Briefs - Yellow"
-	icon_state = "boxer_briefs_yellow"
-
-/datum/sprite_accessory/underwear/female_beekini
+/datum/sprite_accessory/underwear/bottom/female_beekini
 	name = "Panties - Bee-kini"
 	icon_state = "panties_bee-kini"
 
-/datum/sprite_accessory/underwear/female_black
-	name = "Panties - Black"
-	icon_state = "panties_black"
-
-/datum/sprite_accessory/underwear/female_blue
-	name = "Panties - Blue"
-	icon_state = "panties_blue"
-
-/datum/sprite_accessory/underwear/female_commie
+/datum/sprite_accessory/underwear/bottom/female_commie
 	name = "Panties - Commie"
 	icon_state = "panties_commie"
 
-/datum/sprite_accessory/underwear/female_usastripe
+/datum/sprite_accessory/underwear/bottom/female_usastripe
 	name = "Panties - Freedom"
 	icon_state = "panties_assblastusa"
 
-/datum/sprite_accessory/underwear/female_green
-	name = "Panties - Green"
-	icon_state = "panties_green"
-
-/datum/sprite_accessory/underwear/female_kinky
+/datum/sprite_accessory/underwear/bottom/female_kinky
 	name = "Panties - Kinky Black"
 	icon_state = "panties_kinky"
 
-/datum/sprite_accessory/underwear/female_red
-	name = "Panties - Red"
-	icon_state = "panties_red"
-
-/datum/sprite_accessory/underwear/female_uk
+/datum/sprite_accessory/underwear/bottom/panties_uk
 	name = "Panties - UK"
 	icon_state = "panties_uk"
 
-/datum/sprite_accessory/underwear/female_white
-	name = "Panties - White"
-	icon_state = "panties_white"
+/datum/sprite_accessory/underwear/bottom/panties_neko
+	name = "Panties - Neko"
+	icon_state = "panties_neko"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/female_white_neko
-	name = "Panties, Neko - White"
-	icon_state = "panties_neko_white"
+/datum/sprite_accessory/underwear/bottom/panties_slim
+	name = "Panties - Slim"
+	icon_state = "panties_slim"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/female_black_neko
-	name = "Panties, Neko - Black"
-	icon_state = "panties_neko_black"
+/datum/sprite_accessory/underwear/bottom/striped_panties
+	name = "Panties - Striped"
+	icon_state = "striped_panties"
+	has_color = TRUE
 
+/datum/sprite_accessory/underwear/bottom/panties_swimsuit
+	name = "Panties - Swimsuit"
+	icon_state = "panties_swimming"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/swimsuit_red
+/datum/sprite_accessory/underwear/bottom/panties_thin
+	name = "Panties - Thin"
+	icon_state = "panties_thin"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/bottom/longjon
+	name = "Long John Bottoms"
+	icon_state = "ljonb"
+	has_color = TRUE
+
+/datum/sprite_accessory/underwear/bottom/swimsuit_red
 	name = "Swimsuit, One Piece - Red"
 	icon_state = "swimming_red"
 
-/datum/sprite_accessory/underwear/swimsuit
+/datum/sprite_accessory/underwear/bottom/swimsuit
 	name = "Swimsuit, One Piece - Black"
 	icon_state = "swimming_black"
 
-/datum/sprite_accessory/underwear/swimsuit_blue
+/datum/sprite_accessory/underwear/bottom/swimsuit_blue
 	name = "Swimsuit, One Piece - Striped Blue"
 	icon_state = "swimming_blue"
 
-/datum/sprite_accessory/underwear/swimsuit_green
-	name = "Swimsuit, Bottom - Green"
-	icon_state = "panties_swimming_green"
+/datum/sprite_accessory/underwear/bottom/thong
+	name = "Thong"
+	icon_state = "thong"
+	has_color = TRUE
 
-/datum/sprite_accessory/underwear/swimsuit_purple
-	name = "Swimsuit, Bottom - Purple"
-	icon_state = "panties_swimming_purple"
-
-/datum/sprite_accessory/underwear/female_thong_black
-	name = "Thong - Black"
-	icon_state = "thong_black"
-
-/datum/sprite_accessory/underwear/female_thong
-	name = "Thong - Pink"
-	icon_state = "thong_pink"
-
-/datum/sprite_accessory/underwear/female_babydoll
-	name = "Babydoll - Black"
-	icon_state = "babydoll"
+/datum/sprite_accessory/underwear/bottom/thong_babydoll
+	name = "Thong - Alt"
+	icon_state = "thong_babydoll"
+	has_color = TRUE
 
 

code/modules/mob/living/carbon/human/human_defines.dm

@@ -25,8 +25,11 @@
 	var/age = 30		//Player's age
 
 	var/underwear = "Nude"	//Which underwear the player wants
+	var/undie_color = "#FFFFFF"
 	var/undershirt = "Nude" //Which undershirt the player wants
+	var/shirt_color = "#FFFFFF"
 	var/socks = "Nude" //Which socks the player wants
+	var/socks_color = "#FFFFFF"
 	var/backbag = DBACKPACK		//Which backpack type the player has chosen.
 
 	//Equipment slots

code/modules/mob/living/carbon/human/species.dm

@@ -495,34 +495,42 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			if(H.hidden_underwear)
 				H.underwear = "Nude"
 			else
-				H.underwear = H.saved_underwear
-			var/datum/sprite_accessory/underwear/underwear = GLOB.underwear_list[H.underwear]
-			if(underwear)
-				standing += mutable_appearance(underwear.icon, underwear.icon_state, -BODY_LAYER)
+				H.saved_underwear = H.underwear
+				var/datum/sprite_accessory/underwear/bottom/B = GLOB.underwear_list[H.underwear]
+				if(B)
+					var/mutable_appearance/MA = mutable_appearance(B.icon, B.icon_state, -BODY_LAYER)
+					if(UNDIE_COLORABLE(B))
+						MA.color = H.undie_color
+					standing += MA
 
 		if(H.undershirt)
 			if(H.hidden_undershirt)
 				H.undershirt = "Nude"
 			else
-				H.undershirt = H.saved_undershirt
-			var/datum/sprite_accessory/undershirt/undershirt = GLOB.undershirt_list[H.undershirt]
-			if(undershirt)
-				if(H.dna.species.sexes && H.gender == FEMALE)
-					standing += wear_female_version(undershirt.icon_state, undershirt.icon, BODY_LAYER)
-				else
-					standing += mutable_appearance(undershirt.icon, undershirt.icon_state, -BODY_LAYER)
+				H.saved_undershirt = H.undershirt
+				var/datum/sprite_accessory/underwear/top/T = GLOB.undershirt_list[H.undershirt]
+				if(T)
+					var/mutable_appearance/MA
+					if(H.dna.species.sexes && H.gender == FEMALE)
+						MA = wear_female_version(T.icon_state, T.icon, BODY_LAYER)
+					else
+						MA = mutable_appearance(T.icon, T.icon_state, -BODY_LAYER)
+					if(UNDIE_COLORABLE(T))
+						MA.color = H.shirt_color
+					standing += MA
 
 		if(H.socks && H.get_num_legs(FALSE) >= 2)
 			if(H.hidden_socks)
 				H.socks = "Nude"
 			else
-				H.socks = H.saved_socks
-			var/datum/sprite_accessory/socks/socks = GLOB.socks_list[H.socks]
-			if(socks)
-				if(DIGITIGRADE in species_traits)
-					standing += mutable_appearance(socks.icon, socks.icon_state + "_d", -BODY_LAYER)
-				else
-					standing += mutable_appearance(socks.icon, socks.icon_state, -BODY_LAYER)
+				H.saved_socks = H.socks
+				var/datum/sprite_accessory/underwear/socks/S = GLOB.socks_list[H.socks]
+				if(S)
+					var/digilegs = (DIGITIGRADE in species_traits) ? "_d" : ""
+					var/mutable_appearance/MA = mutable_appearance(S.icon, "[S.icon_state][digilegs]", -BODY_LAYER)
+					if(UNDIE_COLORABLE(S))
+						MA.color = H.socks_color
+					standing += MA
 
 	if(standing.len)
 		H.overlays_standing[BODY_LAYER] = standing

code/modules/projectiles/ammunition/caseless/rocket.dm

@@ -9,7 +9,7 @@
 	name = "\improper PM-9HEDP"
 	desc = "An 84mm High Explosive Dual Purpose rocket. Pointy end toward mechs."
 	caliber = "84mm"
-	icon_state = "84mm-hedp"
+	icon_state = "s-casing-live"
 	projectile_type = /obj/item/projectile/bullet/a84mm
 
 /obj/item/ammo_casing/caseless/a75

code/modules/projectiles/boxes_magazines/internal/grenade.dm

@@ -11,7 +11,7 @@
 	max_ammo = 1
 
 /obj/item/ammo_box/magazine/internal/rocketlauncher
-	name = "rocket launcher internal magazine"
+	name = "grenade launcher internal magazine"
 	ammo_type = /obj/item/ammo_casing/caseless/rocket
 	caliber = "84mm"
 	max_ammo = 1

code/modules/projectiles/gun.dm

@@ -32,10 +32,9 @@
 	var/fire_delay = 0					//rate of fire for burst firing and semi auto
 	var/firing_burst = 0				//Prevent the weapon from firing again while already firing
 	var/semicd = 0						//cooldown handler
-	var/weapon_weight = WEAPON_LIGHT	//currently only used for inaccuracy
+	var/weapon_weight = WEAPON_LIGHT
 	var/spread = 0						//Spread induced by the gun itself.
 	var/randomspread = 1				//Set to 0 for shotguns. This is used for weapons that don't fire all their bullets at once.
-	var/inaccuracy_modifier = 1
 
 	lefthand_file = 'icons/mob/inhands/weapons/guns_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/guns_righthand.dmi'
@@ -539,13 +538,3 @@
 	if(A == chambered)
 		chambered = null
 		update_icon()
-
-/obj/item/gun/proc/getinaccuracy(mob/living/user)
-	if(!iscarbon(user))
-		return FALSE
-	else
-		var/mob/living/carbon/holdingdude = user
-		if(istype(holdingdude) && holdingdude.combatmode)
-			return (max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0) * inaccuracy_modifier)
-		else
-			return ((weapon_weight * 25) * inaccuracy_modifier)

code/modules/projectiles/guns/ballistic/launchers.dm

@@ -86,7 +86,6 @@
 	pin = /obj/item/firing_pin/implant/pindicate
 	burst_size = 1
 	fire_delay = 0
-	inaccuracy_modifier = 0.7
 	casing_ejector = FALSE
 	weapon_weight = WEAPON_HEAVY
 	magazine_wording = "rocket"
@@ -109,34 +108,34 @@
 /obj/item/gun/ballistic/rocketlauncher/can_shoot()
 	return chambered?.BB
 
+/obj/item/gun/ballistic/rocketlauncher/process_chamber()
+	if(chambered)
+		chambered = null
+	if(magazine)
+		QDEL_NULL(magazine)
+	update_icon()
+
 /obj/item/gun/ballistic/rocketlauncher/attack_self_tk(mob/user)
 	return //too difficult to remove the rocket with TK
 
 /obj/item/gun/ballistic/rocketlauncher/attack_self(mob/living/user)
 	if(magazine)
-		var/obj/item/ammo_casing/AC = chambered
-		if(AC)
-			if(!user.put_in_hands(AC))
-				AC.bounce_away(FALSE, NONE)
-			to_chat(user, "<span class='notice'>You remove \the [AC] from \the [src]!</span>")
-			playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
+		if(chambered)
+			chambered.forceMove(magazine)
+			magazine.stored_ammo.Insert(1, chambered)
 			chambered = null
 		else
-			to_chat(user, "<span class='notice'>There's no [magazine_wording] in [src].</span>")
+			stack_trace("Removed [magazine] from [src] without a chambered round")
+		magazine.forceMove(drop_location())
+		if(user.is_holding(src))
+			user.put_in_hands(magazine)
+		playsound(src, 'sound/weapons/gun_magazine_remove_full.ogg', 70, TRUE)
+		to_chat(user, "<span class='notice'>You work the [magazine] out from [src].</span>")
+		magazine = null
+	else
+		to_chat(user, "<span class='notice'>There's no rocket in [src].</span>")
 	update_icon()
 
-/obj/item/gun/ballistic/rocketlauncher/attackby(obj/item/A, mob/user, params)
-	if(magazine && istype(A, /obj/item/ammo_casing))
-		if(user.temporarilyRemoveItemFromInventory(A))
-			if(!chambered)
-				to_chat(user, "<span class='notice'>You load a new [A] into \the [src].</span>")
-				playsound(src, "gun_insert_full_magazine", 70, 1)
-				chamber_round()
-				update_icon()
-				return TRUE
-		else
-			to_chat(user, "<span class='warning'>You cannot seem to get \the [A] out of your hands!</span>")
-
 /obj/item/gun/ballistic/rocketlauncher/update_icon()
 	icon_state = "[initial(icon_state)]-[chambered ? "1" : "0"]"
 

code/modules/projectiles/projectile/special/rocket.dm

@@ -16,7 +16,6 @@
 	var/anti_armour_damage = 200
 	armour_penetration = 100
 	dismemberment = 100
-	ricochets_max = 0
 
 /obj/item/projectile/bullet/a84mm/on_hit(atom/target, blocked = FALSE)
 	..()

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -1,3 +1,6 @@
+#define PILL_STYLE_COUNT 22 //Update this if you add more pill icons or you die
+#define RANDOM_PILL_STYLE 22 //Dont change this one though
+
 /obj/machinery/chem_master
 	name = "ChemMaster 3000"
 	desc = "Used to separate chemicals and distribute them in a variety of forms."
@@ -13,12 +16,24 @@
 	var/obj/item/storage/pill_bottle/bottle = null
 	var/mode = 1
 	var/condi = FALSE
+	var/chosenPillStyle = 1
 	var/screen = "home"
 	var/analyzeVars[0]
 	var/useramount = 30 // Last used amount
+	var/list/pillStyles
 
 /obj/machinery/chem_master/Initialize()
 	create_reagents(100)
+
+	//Calculate the span tags and ids fo all the available pill icons
+	var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+	pillStyles = list()
+	for (var/x in 1 to PILL_STYLE_COUNT)
+		var/list/SL = list()
+		SL["id"] = x
+		SL["htmltag"] = assets.icon_tag("pill[x]")
+		pillStyles += list(SL)
+
 	. = ..()
 
 /obj/machinery/chem_master/Destroy()
@@ -128,9 +143,15 @@
 										datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
+		var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+		assets.send(user)
 		ui = new(user, src, ui_key, "chem_master", name, 500, 550, master_ui, state)
 		ui.open()
 
+//Insert our custom spritesheet css link into the html
+/obj/machinery/chem_master/ui_base_html(html)
+	var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/simple/pills)
+	. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())
 
 /obj/machinery/chem_master/ui_data(mob/user)
 	var/list/data = list()
@@ -141,7 +162,7 @@
 	data["condi"] = condi
 	data["screen"] = screen
 	data["analyzeVars"] = analyzeVars
-
+	data["chosenPillStyle"] = chosenPillStyle
 	data["isPillBottleLoaded"] = bottle ? 1 : 0
 	if(bottle)
 		GET_COMPONENT_FROM(STRB, /datum/component/storage, bottle)
@@ -160,6 +181,9 @@
 			bufferContents.Add(list(list("name" = N.name, "id" = N.id, "volume" = N.volume))) // ^
 		data["bufferContents"] = bufferContents
 
+	//Calculated at init time as it never changes
+	data["pillStyles"] = pillStyles
+
 	return data
 
 /obj/machinery/chem_master/ui_act(action, params)
@@ -236,6 +260,12 @@
 					else
 						P = new(drop_location())
 					P.name = trim("[name] pill")
+					if(chosenPillStyle == RANDOM_PILL_STYLE)
+						P.icon_state ="pill[rand(1,21)]"
+					else
+						P.icon_state = "pill[chosenPillStyle]"
+					if(P.icon_state == "pill4")
+						P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality."
 					adjust_item_drop_location(P)
 					reagents.trans_to(P,vol_each)
 			else
@@ -250,6 +280,10 @@
 				reagents.trans_to(P,10)
 			. = TRUE
 
+		if("pillStyle")
+			var/id = text2num(params["id"])
+			chosenPillStyle = id
+
 		if("createPatch")
 			var/many = params["many"]
 			if(reagents.total_volume == 0)
@@ -401,3 +435,6 @@
 	name = "CondiMaster 3000"
 	desc = "Used to create condiments and other cooking supplies."
 	condi = TRUE
+
+#undef PILL_STYLE_COUNT
+#undef RANDOM_PILL_STYLE

code/modules/reagents/reagent_containers/pill.dm

@@ -46,6 +46,9 @@
 		M.visible_message("<span class='danger'>[user] forces [M] to [apply_method] [src].</span>", \
 							"<span class='userdanger'>[user] forces [M] to [apply_method] [src].</span>")
 
+  var/makes_me_think = pick(strings("redpill.json", "redpill_questions"))
+	if(icon_state == "pill4" && prob(5)) //you take the red pill - you stay in Wonderland, and I show you how deep the rabbit hole goes
+		addtimer(CALLBACK(GLOBAL_PROC, /proc/to_chat, M, "<span class='notice'>[makes_me_think]</span>"), 50)
 
 	log_combat(user, M, "fed", reagents.log_list())
 	if(reagents.total_volume)

code/modules/tgui/external.dm

@@ -49,6 +49,20 @@
 	if(!ui || ui.status != UI_INTERACTIVE)
 		return 1 // If UI is not interactive or usr calling Topic is not the UI user, bail.
 
+ /**
+  * public
+  *
+  * Called on an object when a tgui object is being created, allowing you to customise the html
+  * For example: inserting a custom stylesheet that you need in the head
+  *
+  * For this purpose, some tags are available in the html, to be parsed out with replacetext
+  * (customheadhtml) - Additions to the head tag
+  *
+  * required html the html base text
+  *
+ **/
+/datum/proc/ui_base_html(html)
+	return html
 
  /**
   * private

code/modules/tgui/tgui.dm

@@ -198,11 +198,19 @@
  **/
 /datum/tgui/proc/get_html(var/inline)
 	var/html
+	html = SStgui.basehtml
+
+	//Allow the src object to override the html if needed
+	html = src_object.ui_base_html(html)
+	//Strip out any remaining custom tags that are used in ui_base_html
+	html = replacetext(html, "<!--customheadhtml-->", "")
+
 	// Poplate HTML with JSON if we're supposed to inline.
 	if(inline)
-		html = replacetextEx(SStgui.basehtml, "{}", get_json(initial_data))
-	else
-		html = SStgui.basehtml
+		html = replacetextEx(html, "{}", get_json(initial_data))
+
+
+	//Setup for tgui stuff, including styles
 	html = replacetextEx(html, "\[ref]", "[REF(src)]")
 	html = replacetextEx(html, "\[style]", style)
 	return html

code/modules/vending/security.dm

@@ -14,8 +14,13 @@
 				    /obj/item/flashlight/seclite = 4,
 				    /obj/item/restraints/legcuffs/bola/energy = 7)
 	contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
-		              /obj/item/storage/fancy/donut_box = 2)
-	premium = list(/obj/item/coin/antagtoken = 1)
+		              /obj/item/storage/fancy/donut_box = 2,
+		              /obj/item/ssword_kit = 1)
+	premium = list(/obj/item/coin/antagtoken = 1,
+					/obj/item/clothing/head/helmet/blueshirt = 1,
+					/obj/item/clothing/suit/armor/vest/blueshirt = 1,
+					/obj/item/clothing/under/rank/security/blueshirt = 1,
+					/obj/item/ssword_kit = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
 	resistance_flags = FIRE_PROOF
 

html/changelogs/AutoChangeLog-pr-8752.yml

@@ -0,0 +1,5 @@
+author: "Sishen1542"
+delete-after: True
+changes: 
+  - rscadd: "Added the ability to alter your genitalia as a slimeperson more than addition/removal."
+  - bugfix: "fixed genitalia removal proc in alter form."

html/changelogs/AutoChangeLog-pr-8845.yml

@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - imageadd: "Tweaked the :b: emoji."

html/changelogs/AutoChangeLog-pr-8857.yml

@@ -0,0 +1,8 @@
+author: "Ghommie"
+delete-after: True
+changes: 
+  - refactor: "refactored underwears to allow custom color preferences, instead of manually colored sprites."
+  - rscdel: "The aforementioned manually colored pieces. Some of your char preferences may have been resetted as result."
+  - rscadd: "More underwear choices, including: Bowling shirts, long johns, a tank top, fishnets, more bee socks, bee t-shirt and bee boxers (original PR for the latter three by nemvar from /tg/station)."
+  - tweak: "random bodies will now have random underwear again."
+  - bugfix: "Dressers will now properly change undergarment again."

html/changelogs/AutoChangeLog-pr-8873.yml

@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by YPOQ)"
+delete-after: True
+changes: 
+  - bugfix: "Fixes clockwork armor not actually having armor."

html/changelogs/AutoChangeLog-pr-8874.yml

@@ -0,0 +1,5 @@
+author: "Ghommie (original PRs by Floyd/Qustinnus, optimumtact, Denton and coiax)"
+delete-after: True
+changes: 
+  - rscadd: "You can now select what your pills will look like when making pills from the Chem Master"
+  - rscadd: "Red pills can make you think."

html/changelogs/AutoChangeLog-pr-8883.yml

@@ -0,0 +1,4 @@
+author: "CameronWoof"
+delete-after: True
+changes: 
+  - tweak: "Hexacrocin overdose no longer causes climaxes"

html/changelogs/AutoChangeLog-pr-8884.yml

@@ -0,0 +1,5 @@
+author: "Ghommie (original PR by duckay)"
+delete-after: True
+changes: 
+  - rscadd: "Added better names and descriptions for blueshirt officer gear."
+  - rscadd: "Added the above gear to the premium selection of the sectech"

html/changelogs/AutoChangeLog-pr-8885.yml

@@ -0,0 +1,4 @@
+author: "Ghommie (original PR by coiax)"
+delete-after: True
+changes: 
+  - code_imp: "The Squeak subsystem has been renamed to Minor Mapping."

modular_citadel/code/game/machinery/vending.dm

@@ -1,7 +1,3 @@
-/obj/machinery/vending/security
-	contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2, /obj/item/ssword_kit = 1)
-	premium = list(/obj/item/coin/antagtoken = 1, /obj/item/ssword_kit = 1)
-
 /obj/machinery/vending/medical
 	products = list(/obj/item/reagent_containers/syringe = 12,
 					/obj/item/reagent_containers/dropper = 3,

modular_citadel/code/modules/mob/living/carbon/human/species_types/jellypeople.dm

@@ -69,7 +69,7 @@
 
 /datum/action/innate/slime_change/proc/change_form()
 	var/mob/living/carbon/human/H = owner
-	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Cancel")
+	var/select_alteration = input(owner, "Select what part of your form to alter", "Form Alteration", "cancel") in list("Hair Style", "Genitals", "Tail", "Snout", "Markings", "Ears", "Taur body", "Penis", "Vagina", "Penis Length", "Breast Size", "Breast Shape", "Cancel")
 	if(select_alteration == "Hair Style")
 		if(H.gender == MALE)
 			var/new_style = input(owner, "Select a facial hair style", "Hair Alterations")  as null|anything in GLOB.facial_hair_styles_list
@@ -114,7 +114,7 @@
 					O.Remove(H)
 				organ.forceMove(get_turf(H))
 				qdel(organ)
-				H.update_body()
+				H.update_genitals()
 
 	else if (select_alteration == "Ears")
 		var/list/snowflake_ears_list = list("Normal" = null)
@@ -194,5 +194,65 @@
 			if(new_taur != "None")
 				H.dna.features["mam_tail"] = "None"
 		H.update_body()
+
+	else if (select_alteration == "Penis")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's dong", "Genital Alteration") as null|anything in GLOB.cock_shapes_list
+		if(new_shape)
+			H.dna.features["cock_shape"] = new_shape
+		H.update_genitals()
+		H.give_balls()
+		H.give_penis()
+		H.apply_overlay()
+
+
+	else if (select_alteration == "Vagina")
+		for(var/obj/item/organ/genital/vagina/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Choose your character's pussy", "Genital Alteration") as null|anything in GLOB.vagina_shapes_list
+		if(new_shape)
+			H.dna.features["vag_shape"] = new_shape
+		H.update_genitals()
+		H.give_womb()
+		H.give_vagina()
+		H.apply_overlay()
+
+	else if (select_alteration == "Penis Length")
+		for(var/obj/item/organ/genital/penis/X in H.internal_organs)
+			qdel(X)
+		var/new_length
+		new_length = input(owner, "Penis length in inches:\n([COCK_SIZE_MIN]-[COCK_SIZE_MAX])", "Genital Alteration") as num|null
+		if(new_length)
+			H.dna.features["cock_length"] = max(min( round(text2num(new_length)), COCK_SIZE_MAX),COCK_SIZE_MIN)
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_balls()
+		H.give_penis()
+
+	else if (select_alteration == "Breast Size")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_size
+		new_size = input(owner, "Breast Size", "Genital Alteration") as null|anything in GLOB.breasts_size_list
+		if(new_size)
+			H.dna.features["breasts_size"] = new_size
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
+	else if (select_alteration == "Breast Shape")
+		for(var/obj/item/organ/genital/breasts/X in H.internal_organs)
+			qdel(X)
+		var/new_shape
+		new_shape = input(owner, "Breast Shape", "Genital Alteration") as null|anything in GLOB.breasts_shapes_list
+		if(new_shape)
+			H.dna.features["breasts_shape"] = new_shape
+		H.update_genitals()
+		H.apply_overlay()
+		H.give_breasts()
+
 	else
 		return

modular_citadel/code/modules/projectiles/gun.dm

@@ -9,3 +9,13 @@
 		return 0
 	else
 		return ..()
+
+/obj/item/gun/proc/getinaccuracy(mob/living/user)
+	if(!iscarbon(user))
+		return 0
+	else
+		var/mob/living/carbon/holdingdude = user
+		if(istype(holdingdude) && holdingdude.combatmode)
+			return max((holdingdude.lastdirchange + weapon_weight * 25) - world.time,0)
+		else
+			return weapon_weight * 25

modular_citadel/code/modules/reagents/reagents/cit_reagents.dm

@@ -152,11 +152,9 @@
 
 /datum/reagent/drug/aphrodisiacplus/overdose_process(mob/living/M)
 	if(M && M.canbearoused && !HAS_TRAIT(M, TRAIT_CROCRIN_IMMUNE) && prob(33))
-		if(M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
-			var/mob/living/carbon/human/H = M
-			if(prob(50)) //Less spam
-				to_chat(H, "<span class='love'>Your libido is going haywire!</span>")
-				H.mob_climax(forced_climax=TRUE)
+		if(prob(5) && M.getArousalLoss() >= 100 && ishuman(M) && M.has_dna())
+			if(prob(5)) //Less spam
+				to_chat(M, "<span class='love'>Your libido is going haywire!</span>")
 		if(M.min_arousal < 50)
 			M.min_arousal += 1
 		if(M.min_arousal < M.max_arousal)

strings/redpill.json

@@ -0,0 +1,43 @@
+{
+	"redpill_questions": [
+		"What happened to the ceiling?",
+		"Why is it called the emergency shuttle if it arrives every single shift?",
+		"Where does the Cook get all this meat from?",
+		"Space wind? How does that even make sense?",
+		"Why does Nanotrasen hire Clowns and Mimes for every single station?",
+		"Why is the station's air supply connected to the plasma tank?",
+		"Why are there fire alarms everywhere but no sprinklers?",
+		"Why is this a plasma research station if we know everything about plasma already?",
+		"Who hires all these unqualified, violent assistants?",
+		"How do the morgue trays know whether someone's soul is still in their body?",
+		"If two miners were in Lavaland and one of them killed the other with a pickaxe, wouldn't that be fucked up or what?",
+		"How do I know the names of all these people that I've never met before?",
+		"How do I know the name of someone just by hearing them talk?",
+		"How come a hole in the floor doesn't suck you out into space?",
+		"Why is space cold?",
+		"Why does space circle around on itself?",
+		"Nanotrasen just clones us every shift.",
+		"There's no biological difference between lizards and humans.",
+		"Why is there a floor, but no roof?",
+		"The universe always ends after we reach Centcomm.",
+		"Everyone is controlled by strings behind a glowing screen",
+		"Seperation is absolute.",
+		"It doesn't take much for people to murder their friends.",
+		"All the crew are just greytiders with different paint.",
+		"What the fuck is CO2?",
+		"2008 was 550 years ago.",
+		"This is all an endless looping nightmare of misery.",
+		"The ultimate god is really really stoned.",
+		"Space stations are no substitute for healthy social interaction.",
+		"The gods are always watching, and will wipe you from existence if you fuck up.",
+		"How do mirrors give people haircuts?",
+		"Why is this station so poorly designed?",
+		"How can an escape pod only take two people normally, but an infinite number of people if they're lying down?",
+		"Why do only lizards get their own native language?",
+		"Why do people just randomly murder all their friends some shifts?",
+		"If magic is real, why aren't we researching that?",
+		"How is everyone a complete expert in every threat in the universe?",
+		"If suit sensors are so important, why don't they always start maximized?",
+		"If we can wash clothes in a sink, why do we need washing machines?"
+	]
+}

strings/traumas.json

@@ -133,7 +133,8 @@
 		";,g absorbing @pick(roles)",
 		";chemist can u @pick(create_verbs) holy @pick(mellens) for @pick(s_roles)???!!",
 		"@pick(semicolon) LIZZARRD SPEAKIGN IN EVIL BULL LANGUAGE SCI!!",
-		"@pick(semicolon)POST REBOOT MESSAGE LOLOL FUCK FUCK FUCK YOU"
+		"@pick(semicolon)POST REBOOT MESSAGE LOLOL FUCK FUCK FUCK YOU",
+		"@pick(semicolon)so, i was trying to talk to someone on rp today, and then a mime walks up and pies them in the face along with some other prankster--i thought that mimes and clowns are supposed to be hired to entertain not to be a nuisance, and that if entertainment comes at someone elses expense then it's not supposed to be done. is that enough to like submit a player complaint or some shit or am i just being petty?"
     ],
 
     "mutations": [

tgstation.dme

@@ -244,6 +244,7 @@
 #include "code\controllers\subsystem\machines.dm"
 #include "code\controllers\subsystem\mapping.dm"
 #include "code\controllers\subsystem\medals.dm"
+#include "code\controllers\subsystem\minor_mapping.dm"
 #include "code\controllers\subsystem\mobs.dm"
 #include "code\controllers\subsystem\moods.dm"
 #include "code\controllers\subsystem\nightshift.dm"
@@ -260,7 +261,6 @@
 #include "code\controllers\subsystem\server_maint.dm"
 #include "code\controllers\subsystem\shuttle.dm"
 #include "code\controllers\subsystem\spacedrift.dm"
-#include "code\controllers\subsystem\squeak.dm"
 #include "code\controllers\subsystem\stickyban.dm"
 #include "code\controllers\subsystem\sun.dm"
 #include "code\controllers\subsystem\tgui.dm"

tgui/src/interfaces/chem_master.ract

@@ -1,4 +1,4 @@
-{{#if data.screen == "home"}}
+{{#if data.screen == "home"}}
 	<ui-display title='Beaker' button>
 		<ui-button icon='{{data.isBeakerLoaded ? "Eject" : "close"}}'
 			style='{{data.isBeakerLoaded ? "selected" : null}}'
@@ -50,14 +50,17 @@
 
 	{{#if !data.condi}}
 		<ui-display title='Pills, Bottles and Patches' >
+			{{#each data.pillStyles}}
+				<ui-button state='{{id==data.chosenPillStyle ? "selected" : null}}' action='pillStyle' params='{"id": "{{id}}"}'>{{{htmltag}}}</ui-button>
+			{{/each}}
+			<br>
 			{{#if data.isPillBottleLoaded}}
 				<ui-button action='ejectp' state='{{data.isPillBottleLoaded ? null : "disabled"}}'>{{data.isPillBottleLoaded ? "Eject" : "No Pill bottle loaded"}}</ui-button>
 				<span class='content'>{{data.pillBotContent}}/{{data.pillBotMaxContent}}</span>
 			{{else}}
 				<span class='average'>No Pillbottle</span>
 			{{/if}}
-			
-			<br/>
+
 			<br/>
 			<ui-button action='createPill' params='{"many": 0}' state='{{data.bufferContents ? null : "disabled"}}' >Create Pill (max 50µ)</ui-button>
 			<br/>

tgui/tgui.html

@@ -16,7 +16,8 @@
       };
     </script>
     <link rel='stylesheet' href='tgui.css'/>
-    <link rel='stylesheet' href='spritesheet_pipes.css'/>
+    <!-- This is processed in byond, so interfaces can override the html head if needed, for custom sheets of style etc -->
+    <!--customheadhtml-->
     <script id='data' type='application/json' data-ref='[ref]'>{}</script>
     <script defer src='tgui.js'></script>
   </head>