no message

code/__DEFINES/DNA.dm

@@ -136,8 +136,6 @@
 #define MARKINGS		17
 #define MUTCOLORS2		18
 #define MUTCOLORS3		19
-#define NOAROUSAL		20	//Stops all arousal effects
-#define NOGENITALS		21	//Cannot create, use, or otherwise have genitals
 #define MATRIXED		22	//if icon is color matrix'd
 #define SKINTONE		23	//uses skin tones
 #define CUSTOM_SKINTONE	24	//adds a "_g" suffix to bodypart overlays icon states if a custom skintone is used.
@@ -172,16 +170,7 @@
 #define ORGAN_SLOT_BRAIN_ANTIDROP "brain_antidrop"
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
 #define ORGAN_SLOT_TAIL "tail"
-#define ORGAN_SLOT_PENIS "penis"
-#define ORGAN_SLOT_WOMB "womb"
-#define ORGAN_SLOT_VAGINA "vagina"
-#define ORGAN_SLOT_TESTICLES "testicles"
-#define ORGAN_SLOT_BREASTS "breasts"
-#define ORGAN_SLOT_BUTT "butt"
-#define ORGAN_SLOT_BELLY "belly"
-#define ORGAN_CHEST_GENITALS ORGAN_SLOT_BREASTS
-#define ORGAN_GROIN_GENITALS ORGAN_SLOT_PENIS, ORGAN_SLOT_WOMB, ORGAN_SLOT_VAGINA, ORGAN_SLOT_TESTICLES, ORGAN_SLOT_BUTT
-#define ORGAN_BELLY_GENITALS ORGAN_SLOT_BELLY
+
 
 ////organ defines
 #define STANDARD_ORGAN_THRESHOLD 	100

code/__DEFINES/atom_hud.dm

@@ -27,9 +27,6 @@
 //for antag huds. these are used at the /mob level
 #define ANTAG_HUD		"23"
 #define ONLINE_HUD		"24"
-/// Genital huds
-#define GENITAL_HUD		"25"
-#define TAIL_HUD		"26"
 
 //by default everything in the hud_list of an atom is an image
 //a value in hud_list with one of these will change that behavior

code/__DEFINES/dcs/signals.dm

@@ -478,7 +478,6 @@
 #define COMSIG_HUMAN_PREFS_COPIED_TO "human_prefs_copied_to"					//from datum/preferences/copy_to(): (datum/preferences, icon_updates, roundstart_checks)
 #define COMSIG_HUMAN_HARDSET_DNA "human_hardset_dna"							//from mob/living/carbon/human/hardset_dna(): (ui, list/mutation_index, newreal_name, newblood_type, datum/species, newfeatures)
 #define COMSIG_HUMAN_ON_RANDOMIZE "humman_on_randomize"							//from base of proc/randomize_human()
-#define COMSIG_HUMAN_UPDATE_GENITALS "hummen_update_genitals"							//from base of proc/randomize_human()
 
 // /datum/species signals
 #define COMSIG_SPECIES_GAIN "species_gain"						//from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)

code/__DEFINES/inventory.dm

@@ -977,6 +977,3 @@ GLOBAL_LIST_INIT(storage_tray_can_hold, typecacheof(list(
 
 //Internals checker
 #define GET_INTERNAL_SLOTS(C) list(C.head, C.wear_mask)
-
-//Slots that won't trigger humans' update_genitals() on equip().
-GLOBAL_LIST_INIT(no_genitals_update_slots, list(SLOT_L_STORE, SLOT_R_STORE, SLOT_S_STORE, SLOT_IN_BACKPACK, SLOT_LEGCUFFED, SLOT_HANDCUFFED, SLOT_HANDS, SLOT_GENERC_DEXTROUS_STORAGE))

code/__DEFINES/misc.dm

@@ -32,47 +32,38 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 
 //Human Overlays Indexes/////////
 //"LOTS OF CIT CHANGES HERE. BE CAREFUL WHEN UPSTREAM ADDS MORE LAYERS" said the downstream, bottomly
-#define MUTATIONS_LAYER							41	//mutations. Tk headglows, cold resistance glow, etc
-#define GENITALS_BEHIND_LAYER					40	//The behind portion of genitals, mostly for north-facing sprites being behind everything. Not used by butts!
-#define BODY_BEHIND_LAYER						39	//certain mutantrace features (tail when looking south) that must appear behind the body parts
-#define BODYPARTS_LAYER							38	//Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag
-#define MARKING_LAYER							37	//Matrixed body markings because clashing with snouts?
-#define ARMS_PART_LAYER							35	//the arms themselves
-#define MARKING_LAYER_ARMS						34	//Markings that should show up over a butt, like arms
-#define BODY_ADJ_LAYER							33	//certain mutantrace features (snout, body markings) that must appear above the body parts
-#define GENITAL_UNDER_UNDERWEAR_MID_LAYER 		32	// Genitals set to be visible over everything else
-#define GENITAL_UNDER_UNDERWEAR_FRONT_LAYER 	31	// Genitals set to be visible over everything else
-#define BODY_LAYER								30	//underwear, undershirts, socks, eyes, lips(makeup)
-#define BODY_ADJ_UPPER_LAYER					29	//Taur lowernesses
-#define FRONT_MUTATIONS_LAYER					28	//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define DAMAGE_LAYER							27	//damage indicators (cuts and burns)
-#define GENITAL_OVER_UNDERWEAR_MID_LAYER 		26	// Genitals set to be visible over everything else
-#define GENITAL_OVER_UNDERWEAR_FRONT_LAYER 		25	// Genitals set to be visible over everything else
-#define GENITALS_FRONT_LAYER					24	//Genitals that go over the body, but under the hands and arms
-#define UNIFORM_LAYER							23
-#define HANDS_PART_LAYER						22	//Hands
-#define ID_LAYER								21
-#define SHOES_LAYER								20
-#define GLOVES_LAYER							19
-#define EARS_LAYER								18
-#define SUIT_LAYER								17
-#define GLASSES_LAYER							16
-#define BELT_LAYER								15	//Possible make this an overlay of somethign required to wear a belt?
-#define SUIT_STORE_LAYER						14
-#define NECK_LAYER								13
-#define BACK_LAYER								12
-#define GENITAL_OVER_CLOTHES_MID_LAYER 			11	// Genitals set to be visible over everything else
-#define GENITAL_OVER_CLOTHES_FRONT_LAYER 		10	// Genitals set to be visible over everything else
-#define HAIR_LAYER								9	//TODO: make part of head layer?
-#define HORNS_LAYER								8
+#define MUTATIONS_LAYER							31	//mutations. Tk headglows, cold resistance glow, etc
+#define BODY_BEHIND_LAYER						30	//certain mutantrace features (tail when looking south) that must appear behind the body parts
+#define BODYPARTS_LAYER							29	//Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag
+#define MARKING_LAYER							28	//Matrixed body markings because clashing with snouts?
+#define ARMS_PART_LAYER							27	//the arms themselves
+#define MARKING_LAYER_ARMS						26	//Markings that should show up over a butt, like arms
+#define BODY_ADJ_LAYER							25	//certain mutantrace features (snout, body markings) that must appear above the body parts
+#define BODY_LAYER								24	//underwear, undershirts, socks, eyes, lips(makeup)
+#define BODY_ADJ_UPPER_LAYER					23	//Taur lowernesses
+#define FRONT_MUTATIONS_LAYER					22	//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
+#define DAMAGE_LAYER							21	//damage indicators (cuts and burns)
+#define UNIFORM_LAYER							20
+#define HANDS_PART_LAYER						19	//Hands
+#define ID_LAYER								18
+#define SHOES_LAYER								17
+#define GLOVES_LAYER							16
+#define EARS_LAYER								15
+#define SUIT_LAYER								14
+#define GLASSES_LAYER							13
+#define BELT_LAYER								12	//Possible make this an overlay of somethign required to wear a belt?
+#define SUIT_STORE_LAYER						11
+#define NECK_LAYER								10
+#define BACK_LAYER								9
+#define HAIR_LAYER								8	//TODO: make part of head layer?
 #define FACEMASK_LAYER							7
 #define HEAD_LAYER								6
 #define HANDCUFF_LAYER							5
 #define LEGCUFF_LAYER							4
 #define HANDS_LAYER								3
 #define BODY_FRONT_LAYER						2
 #define FIRE_LAYER								1	//If you're on fire
-#define TOTAL_LAYERS							41	//KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_;
+#define TOTAL_LAYERS							31	//KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_;
 
 //Human Overlay Index Shortcuts for alternate_worn_layer, layers
 //Because I *KNOW* somebody will think layer+1 means "above"

code/datums/components/tackle.dm

@@ -267,27 +267,27 @@
 	switch(damage_mod)
 		if(-INFINITY to 1)
 			user.visible_message(
-				span_warning("[user] rams into [hit] with a flying tackle!"), 
-				span_userdanger("You rams into [hit] with a flying tackle!"), 
+				span_warning("[user] rams into [hit] with a flying tackle!"),
+				span_userdanger("You rams into [hit] with a flying tackle!"),
 				ignored_mobs = list(hit))
 			to_chat(hit, span_userdanger("[user] rams into you!"))
 		if(1.1 to 3)
 			user.visible_message(
-				span_warning("[user] slams into [hit] with a deadly charge!"), 
-				span_userdanger("You slam into [hit] with a deadly charge!"), 
+				span_warning("[user] slams into [hit] with a deadly charge!"),
+				span_userdanger("You slam into [hit] with a deadly charge!"),
 				ignored_mobs = list(hit))
 			to_chat(hit, span_userdanger("[user] slams into you!"))
 		if(3.1 to INFINITY)
 			user.visible_message(
-				span_warning("[user] CRASHES into [hit] with an atomic clothesline!"), 
-				span_userdanger("You CRASH into [hit] with a atomic clothesline!"), 
+				span_warning("[user] CRASHES into [hit] with an atomic clothesline!"),
+				span_userdanger("You CRASH into [hit] with a atomic clothesline!"),
 				ignored_mobs = list(hit))
 			to_chat(hit, span_userdanger("[user] CRASHES into you!"))
 	playsound(user, 'sound/effects/flesh_impact_1.ogg', 60, TRUE)
 	if(damage_mod >= 2)
 		hit.emote("scream")
 	user.emote("scream")
-	
+
 	var/armormult = clamp(hit.getarmor(BODY_ZONE_CHEST, "melee"), 0, 1)
 
 	hit.apply_damage(tackle_damage, STAMINA, BODY_ZONE_CHEST, armormult)

code/datums/tattoo.dm

@@ -1,5 +1,5 @@
-/* 
- * Tattoos! 
+/*
+ * Tattoos!
  */
 // Mutable appearances are children of images, just so you know. just a fun fact
 
@@ -124,18 +124,6 @@
 	switch(tat_location)
 		if(TATTOO_FUCKUP)
 			return "misapplied over [ishuman(person) ? "[person.p_their()]" : "the"] bepis. There's a bit more written there:[span_phobia("hey this tattoo didnt set the location right, tell superlagg their shit broke.")]."
-		if(TATTOO_TRAMP_STAMP)
-			return "positioned over [ishuman(person) ? "[person.p_their()]" : "the"] [person.getorganslot(ORGAN_SLOT_TAIL) ? "tail" : "buttcrack"]."
-		if(TATTOO_WOMB_TATTOO)
-			return "positioned over [ishuman(person) ? "[person.p_their()]" : "the"] lower groin."
-		if(TATTOO_LEFT_ASS)
-			return "situated on [ishuman(person) ? "[person.p_their()]" : "the"] left buttcheek."
-		if(TATTOO_RIGHT_ASS)
-			return "situated on [ishuman(person) ? "[person.p_their()]" : "the"] right buttcheek."
-		if(TATTOO_LEFT_BOOB)
-			return "printed across [ishuman(person) ? "[person.p_their()]" : "the"] left [prob(1) ? "boobie" : "breast"]."
-		if(TATTOO_RIGHT_BOOB)
-			return "printed across [ishuman(person) ? "[person.p_their()]" : "the"] right [prob(1) ? "boobie" : "breast"]."
 		if(TATTOO_CHEST)
 			return "printed across [ishuman(person) ? "[person.p_their()]" : "the"] chest."
 		if(TATTOO_BELLY)

code/modules/awaymissions/corpse.dm

@@ -210,7 +210,7 @@
 	else
 		H.skin_tone = random_skin_tone()
 	H.update_hair()
-	H.update_body() //update_genitals arg FALSE because these don't quite require/have them most times.
+	H.update_body()
 	if(outfit)
 		var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
 		for(var/slot in slots)

code/modules/client/client_defines.dm

@@ -186,5 +186,3 @@
 	/// If the client is currently under the restrictions of the interview system
 	var/interviewee = FALSE
 	var/is_fullscreen = 0
-	/// ckeys of mobs we'd like to see the genitals of
-	var/list/genital_exceptions = list()

code/modules/client/preferences.dm

@@ -144,9 +144,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	// 0 = character settings, 1 = game preferences
 	var/current_tab = SETTINGS_TAB
 
-	// If in the ERP tab, are we rearranging genitals
-	var/erp_tab_page = ERP_TAB_HOME
-
 	var/unlock_content = 0
 
 	var/list/ignoring = list()
@@ -2018,12 +2015,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("tab")
 					if(href_list["tab"])
 						current_tab = text2num(href_list["tab"])
-				if("erp_tab")
-					if(href_list["newtab"])
-						if(href_list["nonumber"])
-							erp_tab_page = href_list["newtab"]
-						else
-							erp_tab_page = text2num(href_list["newtab"])
 
 	chat_toggles |= CHAT_LOOC // the LOOC stays on during sex
 	if(href_list["preference"] == "gear")

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

@@ -6,16 +6,14 @@
 		WANTED_HUD,
 		IMPLOYAL_HUD,
 		IMPCHEM_HUD,
-		IMPTRACK_HUD, 
-		NANITE_HUD, 
+		IMPTRACK_HUD,
+		NANITE_HUD,
 		DIAG_NANITE_FULL_HUD,
 		ANTAG_HUD,
 		GLAND_HUD,
 		SENTIENT_DISEASE_HUD,
 		RAD_HUD,
 		ONLINE_HUD,
-		GENITAL_HUD = HUD_LIST_LIST, // and boy what a list it is
-		TAIL_HUD,
 		)
 	hud_type = /datum/hud/human
 	possible_a_intents = list(INTENT_HELP, INTENT_DISARM, INTENT_GRAB, INTENT_HARM)
@@ -81,7 +79,6 @@
 	var/list/blood_smear = list(BLOOD_STATE_BLOOD = 0, BLOOD_STATE_OIL = 0, BLOOD_STATE_NOT_BLOODY = 0)
 
 	var/name_override //For temporary visible name changes
-	var/genital_override = FALSE //Force genitals on things incase of chems
 
 	var/custom_species = null
 

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

@@ -636,7 +636,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	H.remove_overlay(BODY_ADJ_LAYER)
 	H.remove_overlay(BODY_ADJ_UPPER_LAYER)
 	H.remove_overlay(BODY_FRONT_LAYER)
-	H.remove_overlay(HORNS_LAYER)
 
 	if(!mutant_bodyparts)
 		return
@@ -712,12 +711,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		"[BODY_ADJ_LAYER]" = "ADJ",
 		"[BODY_ADJ_UPPER_LAYER]" = "ADJUP",
 		"[BODY_FRONT_LAYER]" = "FRONT",
-		"[HORNS_LAYER]" = "HORNS",
 		)
 
 	var/g = (H.dna.features["body_model"] == FEMALE) ? "f" : "m"
 	var/husk = HAS_TRAIT(H, TRAIT_HUSK)
-	var/image/tail_hack // tailhud's a bazinga, innit
 
 	for(var/layer in relevant_layers)
 		var/list/standing = list()
@@ -804,10 +801,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							accessory_overlay.color = "#[H.facial_hair_color]"
 						if(EYECOLOR)
 							accessory_overlay.color = "#[H.left_eye_color]"
-						if(HORNCOLOR)
-							accessory_overlay.color = "#[H.dna.features["horns_color"]]"
-						if(WINGCOLOR)
-							accessory_overlay.color = "#[H.dna.features["wings_color"]]"
 				else
 					accessory_overlay.color = forced_colour
 			else
@@ -829,8 +822,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 				accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
 				accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2]
 
-			if(layertext == "FRONT" && mutant_string == "tail") // durty hack so asses dont eat tails
-				tail_hack = accessory_overlay
 			standing += accessory_overlay
 
 			if(S.extra) //apply the extra overlay, if there is one
@@ -868,11 +859,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 					if(EYECOLOR)
 						extra_accessory_overlay.color = "#[H.left_eye_color]"
 
-					if(HORNCOLOR)
-						extra_accessory_overlay.color = "#[H.dna.features["horns_color"]]"
-					if(WINGCOLOR)
-						extra_accessory_overlay.color = "#[H.dna.features["wings_color"]]"
-
 				if(OFFSET_MUTPARTS in H.dna.species.offset_features)
 					extra_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
 					extra_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2]
@@ -909,11 +895,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 							extra2_accessory_overlay.color = "#[H.dna.features["mcolor"]]"
 						else
 							extra2_accessory_overlay.color = "#[H.hair_color]"
-					if(HORNCOLOR)
-						extra2_accessory_overlay.color = "#[H.dna.features["horns_color"]]"
-					if(WINGCOLOR)
-						extra2_accessory_overlay.color = "#[H.dna.features["wings_color"]]"
-
 				if(OFFSET_MUTPARTS in H.dna.species.offset_features)
 					extra2_accessory_overlay.pixel_x += H.dna.species.offset_features[OFFSET_MUTPARTS][1]
 					extra2_accessory_overlay.pixel_y += H.dna.species.offset_features[OFFSET_MUTPARTS][2]
@@ -926,9 +907,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	H.apply_overlay(BODY_ADJ_LAYER)
 	H.apply_overlay(BODY_ADJ_UPPER_LAYER)
 	H.apply_overlay(BODY_FRONT_LAYER)
-	H.apply_overlay(HORNS_LAYER)
-	H.tail_hud_update(tail_hack)
-
 
 /*
  * Equip the outfit required for life. Replaces items currently worn.

code/modules/mob/living/carbon/human/species_types/abductors.dm

@@ -3,7 +3,7 @@
 	id = "abductor"
 	say_mod = "gibbers"
 	sexes = FALSE
-	species_traits = list(NOBLOOD,NOEYES,NOGENITALS,NOAROUSAL,HAS_FLESH,HAS_BONE)
+	species_traits = list(NOBLOOD,NOEYES,HAS_FLESH,HAS_BONE)
 	inherent_traits = list(TRAIT_VIRUSIMMUNE,TRAIT_CHUNKYFINGERS,TRAIT_NOHUNGER,TRAIT_NOBREATH)
 	mutanttongue = /obj/item/organ/tongue/abductor
 	species_type = "alien"

code/modules/mob/living/carbon/human/species_types/android.dm

@@ -2,7 +2,7 @@
 	name = "Android"
 	id = "android"
 	say_mod = "states"
-	species_traits = list(NOBLOOD,NOGENITALS,NOAROUSAL,ROBOTIC_LIMBS)
+	species_traits = list(NOBLOOD,ROBOTIC_LIMBS)
 	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_NOFIRE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_LIMBATTACHMENT)
 	inherent_biotypes = MOB_ROBOTIC|MOB_HUMANOID
 	meat = null

code/modules/mob/living/carbon/human/species_types/corporate.dm

@@ -14,7 +14,7 @@
 	attack_verb = "smash"
 	attack_sound = 'sound/weapons/resonator_blast.ogg'
 	blacklisted = TRUE
-	species_traits = list(NOBLOOD,EYECOLOR,NOGENITALS)
+	species_traits = list(NOBLOOD,EYECOLOR)
 	inherent_traits = list(TRAIT_RADIMMUNE,TRAIT_VIRUSIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NODISMEMBER,TRAIT_NOLIMBDISABLE,TRAIT_NOHUNGER)
 	sexes = 0
 	gib_types = /obj/effect/gibspawner/robot

code/modules/mob/living/carbon/human/species_types/dwarves.dm

@@ -3,7 +3,7 @@
 	id = "dwarf" //Also called Homo sapiens pumilionis
 	default_color = "FFFFFF"
 
-	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS,HORNCOLOR,WINGCOLOR,HAS_FLESH,HAS_BONE)
+	species_traits = list(EYECOLOR,HAIR,FACEHAIR,LIPS,MUTCOLORS,WINGCOLOR,HAS_FLESH,HAS_BONE)
 	inherent_traits = list(TRAIT_DWARF)
 	limbs_id = "human"
 	mutant_bodyparts = list("mcolor" = "FFFFFF","mcolor2" = "FFFFFF","mcolor3" = "FFFFFF", "mam_snouts" = "Husky", "mam_tail" = "Husky", "mam_ears" = "Husky", "deco_wings" = "None", "mam_body_markings" = "Husky", "taur" = "None", "horns" = "None", "legs" = "Plantigrade", "meat_type" = "Mammalian")