Merge pull request #42 from Realtimeslayer/cleaning-up

cleans up remaining ERP mechanics in code
IrisSS13 · Aug 8, 2024 · fb40f61 · fb40f61
2 parents 7f00758 + 9117fc2
commit fb40f61
Show file tree

Hide file tree

Showing 27 changed files with 15 additions and 2,360 deletions.
diff --git a/code/__DEFINES/font_awesome_icons.dm b/code/__DEFINES/font_awesome_icons.dm
@@ -1550,7 +1550,6 @@
 #define FA_ICON_PERSON_ARROW_UP_FROM_LINE "fa-person-arrow-up-from-line"
 #define FA_ICON_PERSON_BIKING "fa-person-biking"
 #define FA_ICON_PERSON_BOOTH "fa-person-booth"
-#define FA_ICON_PERSON_BREASTFEEDING "fa-person-breastfeeding"
 #define FA_ICON_PERSON_BURST "fa-person-burst"
 #define FA_ICON_PERSON_CANE "fa-person-cane"
 #define FA_ICON_PERSON_CHALKBOARD "fa-person-chalkboard"

diff --git a/code/__DEFINES/mobs.dm b/code/__DEFINES/mobs.dm
@@ -710,13 +710,8 @@ GLOBAL_LIST_INIT(human_heights_to_offsets, list(
 // NOVA EDIT ADDITION END
 /// Jumpsuit clothing layer
 #define UNIFORM_LAYER 32 // NOVA EDIT CHANGE - ORIGINAL: 27
-// NOVA EDIT ADDITION BEGIN - cursed layers under clothing
-#define ANUS_LAYER 31
-#define VAGINA_LAYER 30
-#define PENIS_LAYER 29
-#define NIPPLES_LAYER 28
+// NOVA EDIT ADDITION START: layers under clothing
 #define BANDAGE_LAYER 27
-//NOVA EDIT ADDITION END
 /// ID card layer
 #define ID_LAYER 26
 /// ID card layer (might be deprecated)

diff --git a/code/__DEFINES/~nova_defines/DNA.dm b/code/__DEFINES/~nova_defines/DNA.dm
@@ -67,27 +67,6 @@
 #define BODY_SIZE_MAX 1.5
 #define BODY_SIZE_MIN 0.8
 
-//In inches
-#define PENIS_MIN_GIRTH PENIS_MIN_LENGTH
-#define PENIS_MAX_GIRTH 20
-/// for non oversized mobs with a 'normal' body size
-#define PENIS_MAX_GIRTH_NORMAL_SIZED 15
-#define PENIS_DEFAULT_GIRTH 5 // a lil big but not by much
-#define PENIS_MIN_LENGTH 1
-#define PENIS_MAX_LENGTH 36
-/// for non oversized mobs with a 'normal' body size
-#define PENIS_MAX_LENGTH_NORMAL_SIZED 20
-#define PENIS_DEFAULT_LENGTH 6 //still a lil long but not insane
-
-#define TESTICLES_MIN_SIZE 0
-#define TESTICLES_MAX_SIZE 6
-/// for non oversized mobs with a 'normal' body size
-#define TESTICLES_MAX_NORMAL_SIZED 3
-
-#define SHEATH_NONE	"None"
-#define SHEATH_NORMAL "Sheath"
-#define SHEATH_SLIT	"Slit"
-#define SHEATH_MODES list(SHEATH_NONE, SHEATH_NORMAL, SHEATH_SLIT)
 
 #define MANDATORY_FEATURE_LIST list(\
 	"mcolor" = "#FFFFBB",\
@@ -96,29 +75,10 @@
 	"ethcolor" = "#FFCCCC",\
 	"skin_color" = "#FFEEDD",\
 	"flavor_text" = "",\
-	"breasts_size" = 1,\
-	"breasts_lactation" = FALSE,\
-	"penis_size" = 13,\
-	"penis_girth" = 9,\
-	"penis_taur_mode" = TRUE,\
-	"penis_sheath" = SHEATH_NONE,\
-	"balls_size" = 1,\
 	"body_size" = BODY_SIZE_NORMAL,\
 	"custom_species" = null,\
-	"penis_uses_skintones" = TRUE,\
-	"penis_uses_skincolor" = TRUE,\
-	"testicles_uses_skintones" = TRUE,\
-	"testicles_uses_skincolor" = TRUE,\
-	"vagina_uses_skintones" = TRUE,\
-	"vagina_uses_skincolor" = TRUE,\
-	"breasts_uses_skintones" = TRUE,\
-	"breasts_uses_skincolor" = TRUE,\
 )
 
-#define AROUSAL_CANT 0
-#define AROUSAL_NONE 1
-#define AROUSAL_PARTIAL 2
-#define AROUSAL_FULL 3
 
 //Species IDs. If you wanna look at tg's species ID defines, go look in the *other* DNA.dm file
 #define SPECIES_AKULA "akula"

diff --git a/code/__DEFINES/~nova_defines/_organ_defines.dm b/code/__DEFINES/~nova_defines/_organ_defines.dm
@@ -1,16 +1,4 @@
 #define ORGAN_SLOT_SCANNER "scanner"
 #define ORGAN_SLOT_BRAIN_NIF "nif"
 
-#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_ANUS "anus"
-#define ORGAN_SLOT_NIPPLES "nipples"
-#define ORGAN_SLOT_TAIL "tail"
-#define ORGAN_SLOT_SLIT "slit"
-#define ORGAN_SLOT_SHEATH "sheath"
-#define ORGAN_ERP_LIST list(ORGAN_SLOT_PENIS, ORGAN_SLOT_WOMB, ORGAN_SLOT_VAGINA, ORGAN_SLOT_TESTICLES, ORGAN_SLOT_BREASTS, ORGAN_SLOT_ANUS, ORGAN_SLOT_NIPPLES, ORGAN_SLOT_TAIL, ORGAN_SLOT_SLIT, ORGAN_SLOT_SHEATH)
-
 #define ORGAN_SLOT_WINGS "wings"
diff --git a/code/__DEFINES/~nova_defines/inventory.dm b/code/__DEFINES/~nova_defines/inventory.dm
@@ -5,8 +5,3 @@
 #define STYLE_TAUR_ALL (STYLE_TAUR_SNAKE|STYLE_TAUR_PAW|STYLE_TAUR_HOOF)
 #define STYLE_DIGI (1<<5)
 
-// We don't use the HUD for these, they have their own menu.
-#define LEWD_SLOT_VAGINA (1<<0)
-#define LEWD_SLOT_PENIS (1<<1)
-#define LEWD_SLOT_ANUS (1<<2)
-#define LEWD_SLOT_NIPPLES (1<<3)
diff --git a/code/__DEFINES/~nova_defines/lewd_defines.dm b/code/__DEFINES/~nova_defines/lewd_defines.dm
diff --git a/code/modules/jobs/job_types/chaplain/chaplain.dm b/code/modules/jobs/job_types/chaplain/chaplain.dm
@@ -70,7 +70,7 @@
 
 	holy_bible.deity_name = new_deity
 	switch(LOWER_TEXT(new_religion))
-		if("homosexuality", "gay", "penis", "ass", "cock", "cocks")
+		if("homosexuality", "gay")
 			new_bible = pick("Guys Gone Wild","Coming Out of The Closet","War of Cocks")
 			switch(new_bible)
 				if("War of Cocks")

diff --git a/html/font-awesome/css/all.min.css b/html/font-awesome/css/all.min.css
diff --git a/modular_nova/master_files/code/modules/client/preferences.dm b/modular_nova/master_files/code/modules/client/preferences.dm
@@ -27,8 +27,6 @@
 
 	var/needs_update = TRUE
 
-	var/arousal_preview = AROUSAL_NONE
-
 	var/datum/species/pref_species
 
 	// BACKGROUND STUFF

diff --git a/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm b/modular_nova/master_files/code/modules/client/preferences/tgui_prefs_migration.dm
@@ -20,11 +20,7 @@ MUTANT_SYNTH_CHASSIS, \
 "taur", \
 "xenodorsal", \
 "xenohead", \
-"penis", \
-"testicles", \
-"womb", \
-"vagina", \
-"breasts",))
+))
 
 /datum/preferences/proc/migrate_nova(list/nova_data)
 	if(features["flavor_text"])

diff --git a/modular_nova/master_files/code/modules/client/preferences_savefile.dm b/modular_nova/master_files/code/modules/client/preferences_savefile.dm
@@ -7,8 +7,7 @@
 
 #define MODULAR_SAVEFILE_UP_TO_DATE -1
 
-#define VERSION_GENITAL_TOGGLES 1
-#define VERSION_BREAST_SIZE_CHANGE 2
+
 #define VERSION_SYNTH_REFACTOR 3
 #define VERSION_UNDERSHIRT_BRA_SPLIT 4
 #define VERSION_CHRONOLOGICAL_AGE 5
@@ -301,7 +300,6 @@
 #undef MODULAR_SAVEFILE_UP_TO_DATE
 
 #undef VERSION_GENITAL_TOGGLES
-#undef VERSION_BREAST_SIZE_CHANGE
 #undef VERSION_SYNTH_REFACTOR
 #undef VERSION_UNDERSHIRT_BRA_SPLIT
 #undef VERSION_CHRONOLOGICAL_AGE
diff --git a/modular_nova/modules/customization/__DEFINES/lists.dm b/modular_nova/modules/customization/__DEFINES/lists.dm
@@ -1,13 +1,5 @@
 /// What accessories can a species have as well as their default accessory of such type e.g. "frills" = "Aquatic". Default accessory colors is dictated by the accessory properties and mutcolors of the specie
 GLOBAL_LIST_EMPTY(default_mutant_bodyparts)
-GLOBAL_LIST_INIT(possible_genitals, list(
-	ORGAN_SLOT_VAGINA,
-	ORGAN_SLOT_WOMB,
-	ORGAN_SLOT_TESTICLES,
-	ORGAN_SLOT_BREASTS,
-	ORGAN_SLOT_ANUS,
-	ORGAN_SLOT_PENIS
-))
 
 GLOBAL_LIST_EMPTY(body_markings)
 GLOBAL_LIST_EMPTY_TYPED(body_markings_per_limb, /list)

diff --git a/modular_nova/modules/customization/__HELPERS/global_lists.dm b/modular_nova/modules/customization/__HELPERS/global_lists.dm
@@ -28,9 +28,6 @@
 		var/datum/species/species_instance = new species_type
 		if(!isnull(species_instance.name))
 			GLOB.default_mutant_bodyparts[species_instance.name] = species_instance.get_default_mutant_bodyparts()
-			if(species_instance.can_have_genitals)
-				for(var/genital in GLOB.possible_genitals)
-					GLOB.default_mutant_bodyparts[species_instance.name] += list((genital) = list("None", FALSE))
 		qdel(species_instance)
 
 /proc/make_body_marking_references()

diff --git a/modular_nova/modules/customization/_globalvars/lists.dm b/modular_nova/modules/customization/_globalvars/lists.dm
@@ -1,55 +1,8 @@
 //DO NOT CHANGE THOSE LISTS UNLESS YOU KNOW WHAT YOURE DOING (will mess savefiles)
 
 
-GLOBAL_LIST_INIT(breast_size_translation, list(
-	"0" = BREAST_SIZE_FLATCHESTED,
-	"1" = BREAST_SIZE_A,
-	"2" = BREAST_SIZE_B,
-	"3" = BREAST_SIZE_C,
-	"4" = BREAST_SIZE_D,
-	"5" = BREAST_SIZE_E,
-	"6" = BREAST_SIZE_F,
-	"7" = BREAST_SIZE_G,
-	"8" = BREAST_SIZE_H,
-	"9" = BREAST_SIZE_I,
-	"10" = BREAST_SIZE_J,
-	"11" = BREAST_SIZE_K,
-	"12" = BREAST_SIZE_L,
-	"13" = BREAST_SIZE_M,
-	"14" = BREAST_SIZE_N,
-	"15" = BREAST_SIZE_O,
-	"16" = BREAST_SIZE_P,
-	))
 
-GLOBAL_LIST_INIT(breast_size_to_number, list(
-	BREAST_SIZE_FLATCHESTED = 0,
-	BREAST_SIZE_A = 1,
-	BREAST_SIZE_B = 2,
-	BREAST_SIZE_C = 3,
-	BREAST_SIZE_D = 4,
-	BREAST_SIZE_E = 5,
-	BREAST_SIZE_F = 6,
-	BREAST_SIZE_G = 7,
-	BREAST_SIZE_H = 8,
-	BREAST_SIZE_I = 9,
-	BREAST_SIZE_J = 10,
-	BREAST_SIZE_K = 11,
-	BREAST_SIZE_L = 12,
-	BREAST_SIZE_M = 13,
-	BREAST_SIZE_N = 14,
-	BREAST_SIZE_O = 15,
-	BREAST_SIZE_P = 16,
-	))
 
-GLOBAL_LIST_INIT(balls_size_translation, list(
-	"0" = "Small",
-	"1" = "Average",
-	"2" = "Big",
-	"3" = "Very Big",
-	"4" = "Enormous",
-	"5" = "Immense",
-	"6" = "Gargantuan"
-	))
 
 GLOBAL_LIST_INIT(marking_zone_to_bitflag, list(
 	BODY_ZONE_HEAD = HEAD,
@@ -73,15 +26,6 @@ GLOBAL_LIST_INIT(marking_zones, list(
 	BODY_ZONE_PRECISE_R_HAND,
 	))
 
-GLOBAL_LIST_INIT(preference_balls_sizes, list(
-	"Small",
-	"Average",
-	"Big",
-	"Very Big",
-	"Enormous",
-	"Immense",
-	"Gargantuan"
-	))
 
 GLOBAL_LIST_INIT(robotic_styles_list, list(
 	"None" = "None",