diff --git a/code/__DEFINES/species/_species.dm b/code/__DEFINES/species/_species.dm
index 9e9247ef029..5e89bdf4b39 100644
--- a/code/__DEFINES/species/_species.dm
+++ b/code/__DEFINES/species/_species.dm
@@ -139,6 +139,12 @@
SPEC_ID_ELF,\
SPEC_ID_HALF_ELF,\
SPEC_ID_HALFLING,\
+ SPEC_ID_AXIAN,\
+ SPEC_ID_LUPIAN,\
+ SPEC_ID_VULPKANIN,\
+ SPEC_ID_TABAXI,\
+ SPEC_ID_MOTH,\
+ SPEC_ID_DRACON,\
)
/// Species who are nonheretical to the church. Excluded species typically have an inhumen god associated, like Zizo. Used for church/faith roles.
diff --git a/code/__HELPERS/sanitize_values.dm b/code/__HELPERS/sanitize_values.dm
index 5705e1831af..3769f8c4fdb 100644
--- a/code/__HELPERS/sanitize_values.dm
+++ b/code/__HELPERS/sanitize_values.dm
@@ -89,3 +89,12 @@
/// Makes sure the input color is text with a # at the start followed by 6 hexadecimal characters. Examples: "#ff1234", "#A38321", COLOR_GREEN_GRAY
/proc/sanitize_color(color)
return findtext(color, GLOB.is_color) ? color : GLOB.normal_ooc_colour
+
+/// Bodypart greyscale expects a 6-char hex string without #; sprite accessories accept either form via sanitize_hexcolor().
+/proc/normalize_skin_tone_hex(skin_tone)
+ if(!istext(skin_tone) || !length(skin_tone))
+ return copytext(sanitize_hexcolor(SKIN_COLOR_CONTINENTAL), 2)
+ var/named = GLOB.skin_tones[skin_tone]
+ if(named)
+ skin_tone = named
+ return sanitize_hexcolor(skin_tone, include_crunch = FALSE)
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index b173aeb720a..af9b912f5ca 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -1318,23 +1318,30 @@ GLOBAL_LIST_EMPTY(respawncounts)
to_chat(src, announcement)
/client/proc/show_character_previews(mutable_appearance/MA, var/dir)
- var/atom/movable/screen/char_preview/O = char_preview_holder
- if(O)
- screen -= O
- qdel(O)
-
- O = new
- char_preview_holder = O
-
- screen += O
- O.appearance = MA
- O.dir = dir
-
- var/matrix/M = matrix()
- M.Scale(2)
- O.transform = M
-
- O.screen_loc = "character_preview_map:1:1,3:-32"
+ var/atom/movable/screen/char_preview/O = char_preview_holder
+ if(O)
+ screen -= O
+ qdel(O)
+
+ O = new
+ char_preview_holder = O
+
+ screen += O
+ O.appearance = MA
+ O.dir = dir
+
+ var/matrix/M = matrix()
+ M.Scale(1)
+ O.transform = M
+ switch(dir)
+ if(NORTH)
+ O.screen_loc = "character_preview_map:1:2,1:0"
+ if(EAST)
+ O.screen_loc = "character_preview_map:1:2,0:0"
+ if(WEST)
+ O.screen_loc = "character_preview_map:0:2,0:0"
+ else
+ O.screen_loc = "character_preview_map:0:2,1:0"
/client/proc/clear_character_previews()
for(var/index in char_render_holders) // associative list, have to index
diff --git a/code/modules/client/customizer/customizers/organ/ears.dm b/code/modules/client/customizer/customizers/organ/ears.dm
index 35e4e7c142f..dd5231337cb 100644
--- a/code/modules/client/customizer/customizers/organ/ears.dm
+++ b/code/modules/client/customizer/customizers/organ/ears.dm
@@ -18,7 +18,7 @@
/datum/customizer/organ/ears/elf
customizer_choices = list(/datum/customizer_choice/organ/ears/elf)
- allows_disabling = TRUE
+ allows_disabling = FALSE
/datum/customizer/organ/ears/halforc
customizer_choices = list(/datum/customizer_choice/organ/ears/halforc)
diff --git a/code/modules/client/preferences/_preferences.dm b/code/modules/client/preferences/_preferences.dm
index 4019b30d1d3..83d321d4dc0 100644
--- a/code/modules/client/preferences/_preferences.dm
+++ b/code/modules/client/preferences/_preferences.dm
@@ -40,7 +40,6 @@ GLOBAL_LIST_INIT(name_adjustments, list())
var/UI_style = null
var/buttons_locked = TRUE
var/hotkeys = TRUE
- var/arousable = TRUE
var/showrolls = TRUE
var/max_chat_length = CHAT_MESSAGE_MAX_LENGTH
@@ -361,10 +360,8 @@ GLOBAL_LIST_INIT(name_adjustments, list())
return dirs[idx]
/datum/preferences/proc/handle_preview_dir_click(mob/user, href_list)
- var/start_dir = text2num(href_list["dir"]) || preview_direction
var/invert = text2num(href_list["invert"]) ? TRUE : FALSE
-
- preview_direction = get_next_dir(start_dir, invert)
+ preview_direction = get_next_dir(preview_direction, invert)
update_preview_icon(preview_direction)
/datum/preferences/proc/build_and_show_menu(mob/user)
@@ -378,12 +375,18 @@ GLOBAL_LIST_INIT(name_adjustments, list())
break
user?.client.acquire_dpi()
+ pref_action_token = "[world.time]_[rand(1, 99999)]"
dat += {"
ERP / Consent "
- dat += ""
- print_erp_consent_row(dat, "erppref", "ERP", TRUE)
- print_erp_consent_row(dat, "nonconpref", "Non-con (CNC)", TRUE)
- print_erp_consent_row(dat, "vorepref", "Vore", TRUE)
- print_erp_consent_row(dat, "tattoopref", "Tattoos", TRUE)
- print_erp_consent_row(dat, "unholypref", "Unholy content", FALSE)
- print_erp_consent_row(dat, "extremepref", "Extreme content", FALSE)
- print_erp_consent_row(dat, "extremeharm", "Extreme harm", FALSE)
- print_erp_consent_row(dat, "mobsexpref", "Hostile mobs", FALSE)
- print_erp_consent_row(dat, "hornyantagspref", "Horny antags", FALSE)
- dat += "
"
-
- dat += ""
- print_erp_toggle_row(dat, "See ERP messages", "toggle_verb_consent", toggles & VERB_CONSENT)
- print_erp_toggle_row(dat, "ERP action sounds", "toggle_lewd_sounds", toggles & LEWD_VERB_SOUNDS)
- print_erp_toggle_row(dat, "Ranged ERP", "toggle_ranged_consent", toggles & RANGED_VERBS_CONSENT)
- print_erp_toggle_row(dat, "Arousable", "toggle_arousable", arousable)
- print_erp_toggle_row(dat, "Custom arousal multiplier", "toggle_arousal_multiplier", use_arousal_multiplier)
- dat += "Arousal strength [arousal_multiplier]% Moan chance [moaning_multiplier]%
"
-
- dat += "Mechanics (Citadel toggles) Ask = prompt before scenes. Yes = consent. No = opt out.
"
- return dat
-
-/datum/preferences/proc/show_erp_prefs_ui(mob/user)
- var/list/dat = print_erp_prefs_page()
- var/datum/browser/popup = new(user, "erp_prefs", "ERP Preferences
", 420, 560)
- popup.set_content(dat.Join())
- popup.open(use_onclose = FALSE)
-
-/datum/preferences/proc/handle_erp_prefs_topic(mob/user, href_list)
- switch(href_list["erp_task"])
- if("cycle")
- var/pref_id = href_list["pref_id"]
- var/use_ask_cycle = text2num(href_list["ask_cycle"])
- if(!get_erp_consent_pref_value(pref_id))
- return
- cycle_erp_consent_pref(pref_id, use_ask_cycle)
- if("toggle_verb_consent")
- toggles ^= VERB_CONSENT
- if("toggle_lewd_sounds")
- toggles ^= LEWD_VERB_SOUNDS
- if("toggle_ranged_consent")
- toggles ^= RANGED_VERBS_CONSENT
- if("toggle_arousable")
- arousable = !arousable
- if("toggle_arousal_multiplier")
- use_arousal_multiplier = !use_arousal_multiplier
- if("toggle_moaning_multiplier")
- use_moaning_multiplier = !use_moaning_multiplier
- if("set_arousal_multiplier")
- var/new_value = input(user, "Arousal multiplier (0-200%)", "ERP Preferences", arousal_multiplier) as num|null
- if(isnull(new_value))
- return
- arousal_multiplier = clamp(round(new_value), 0, 200)
- if("set_moaning_multiplier")
- var/new_value = input(user, "Moan chance (0-100%)", "ERP Preferences", moaning_multiplier) as num|null
- if(isnull(new_value))
- return
- moaning_multiplier = clamp(round(new_value), 0, 100)
-
-/datum/preferences/proc/handle_erp_citadel_toggles(mob/user)
- var/new_toggles = input_bitfield(user, "ERP Mechanics", "citadel_toggles", cit_toggles, nheight = 520)
- if(!isnull(new_toggles))
- cit_toggles = new_toggles
diff --git a/modular_redmoon/code/modules/client/preferences_refresh_guard.dm b/modular_redmoon/code/modules/client/preferences_refresh_guard.dm
new file mode 100644
index 00000000000..589661260c8
--- /dev/null
+++ b/modular_redmoon/code/modules/client/preferences_refresh_guard.dm
@@ -0,0 +1,87 @@
+/// IE's embedded browser replays the last topic URL when browse() refreshes the prefs window.
+/// Tokens are embedded server-side (no JavaScript). Stale replays carry an old token after rebuild.
+
+/datum/preferences/proc/pref_href_is_duplicate_replay(list/href_list)
+ if(!href_list["pref_token"])
+ return FALSE
+ if(!length(last_prefs_href_list))
+ return FALSE
+ if(world.time != last_prefs_href_tick)
+ return FALSE
+ for(var/key in href_list)
+ if(key == "pref_token")
+ continue
+ if(href_list[key] != last_prefs_href_list[key])
+ return FALSE
+ return TRUE
+
+/datum/preferences/proc/record_prefs_href(list/href_list)
+ last_prefs_href_list = href_list.Copy()
+ last_prefs_href_tick = world.time
+
+/datum/preferences/proc/inject_pref_action_tokens(html)
+ if(!pref_action_token)
+ pref_action_token = "[world.time]_[rand(1, 99999)]"
+ var/needle = "'?_src_=prefs;"
+ var/pos = 1
+ while(pos)
+ var/start = findtext(html, needle, pos)
+ if(!start)
+ break
+ var/end = findtext(html, "'", start + length(needle))
+ if(!end)
+ break
+ var/chunk = copytext(html, start, end)
+ if(!findtext(chunk, "pref_token="))
+ var/replacement = "[chunk];pref_token=[pref_action_token]"
+ html = copytext(html, 1, start) + replacement + copytext(html, end)
+ pos = start + length(replacement)
+ else
+ pos = end + 1
+ return html
+
+/datum/preferences/proc/pref_link_token_valid(list/href_list)
+ if(href_list["preference"] == "preview_dir")
+ return TRUE
+ if(!href_list["pref_token"])
+ return TRUE
+ return href_list["pref_token"] == pref_action_token
+
+/datum/preferences/proc/should_ignore_prefs_href(list/href_list)
+ if(pref_href_is_duplicate_replay(href_list))
+ return TRUE
+ if(!pref_link_token_valid(href_list))
+ return TRUE
+ if(href_list["pref_token"])
+ record_prefs_href(href_list)
+ return FALSE
+
+/datum/preferences/proc/capture_preferences_browser_zoom(mob/user)
+ if(!user?.client)
+ return
+ if(!winexists(user, "stonekeep_prefwin.preferences_browser"))
+ return
+ var/current_zoom = winget(user, "stonekeep_prefwin.preferences_browser", "zoom")
+ if(current_zoom && current_zoom != "0")
+ pref_browser_zoom = current_zoom
+
+/datum/preferences/proc/apply_preferences_browser_zoom(mob/user, zoom)
+ if(!user?.client || !zoom || zoom == "0")
+ return
+ if(!winexists(user, "stonekeep_prefwin.preferences_browser"))
+ return
+ winset(user, "stonekeep_prefwin.preferences_browser", list("zoom" = zoom))
+
+/datum/preferences/proc/show_preferences_browser_html(mob/user, html)
+ if(!user?.client)
+ return
+ capture_preferences_browser_zoom(user)
+ user << browse(html, "window=stonekeep_prefwin.preferences_browser;size=816x950")
+ var/zoom = pref_browser_zoom
+ if(!zoom || zoom == "0")
+ zoom = "1"
+ // IE reloads HTML after browse(); apply user zoom once the control exists.
+ spawn(1)
+ apply_preferences_browser_zoom(user, zoom)
+ spawn(5)
+ apply_preferences_browser_zoom(user, zoom)
diff --git a/modular_redmoon/code/modules/reagents/chemistry/reagents/other_reagents.dm b/modular_redmoon/code/modules/reagents/chemistry/reagents/other_reagents.dm
deleted file mode 100644
index b703374e1b5..00000000000
--- a/modular_redmoon/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ /dev/null
@@ -1,125 +0,0 @@
-/obj/effect/decal/cleanable/semendrip
- name = "semen"
- desc = null
- gender = PLURAL
- density = 0
- layer = ABOVE_NORMAL_TURF_LAYER
- icon = 'modular_redmoon/icons/from_bluemoon/mob/genitals/effects.dmi'
- icon_state = "drip1"
- random_icon_states = list("drip1", "drip2", "drip3", "drip4", "drip5")
-
-/obj/effect/decal/cleanable/semendrip/replace_decal(obj/effect/decal/cleanable/semendrip/C)
- . = ..()
- if(!. || QDELETED(src))
- return FALSE
- var/obj/effect/decal/cleanable/semen/S = (locate(/obj/effect/decal/cleanable/semen) in C.loc)
- if(S) // Merge ourselves into this puddle.
- if (reagents) // BLUEMOON EDIT: Invalid Space Turfs
- reagents.trans_to(S, reagents.total_volume) // BLUEMOON EDIT: Invalid Space Turfs
- update_icon()
- return TRUE
- if (reagents)
- reagents.trans_to(C, reagents.total_volume)
- if(C.reagents && C.reagents.total_volume >= 10) // Turn the drip into a puddle. // BLUEMOON EDIT: Invalid Space Turfs
- S = new(C.loc)
- if (C.reagents)
- C.reagents.trans_to(S, C.reagents.total_volume) // BLUEMOON EDIT: Invalid Space Turfs
- S.update_icon()
- qdel(C)
- update_icon()
-
-/obj/effect/decal/cleanable/semendrip/update_icon()
- . = ..()
- add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY)
-
-
-
-//body bluids
-/datum/reagent/consumable/semen
- name = "Semen"
- description = "Sperm from some animal. Useless for anything but insemination, really."
- taste_description = "something salty"
- taste_mult = 2 //Not very overpowering flavor
- data = list("donor"=null,"viruses"=null,"donor_DNA"=null,"blood_type"=null,"resistances"=null,"trace_chem"=null,"mind"=null,"ckey"=null,"gender"=null,"real_name"=null)
- reagent_state = LIQUID
- color = "#FFFFFF" // rgb: 255, 255, 255
- can_synth = FALSE
- // you know i wouldn't
- // boiling_point = T0C + 100
- nutriment_factor = 0.5 * REAGENTS_METABOLISM
- var/decal_path = /obj/effect/decal/cleanable/semen
-
-/datum/reagent/consumable/semen/reaction_turf(turf/location, reac_volume)
- ..()
- if(!istype(location))
- return
-
- if(istype(src, /datum/reagent/consumable/semen/femcum)) //let it be here
- var/obj/effect/decal/cleanable/semen/femcum/F = (locate(/obj/effect/decal/cleanable/semen/femcum) in location) || new(location)
- if(F.reagents?.add_reagent(type, volume, data))
- F.update_icon()
- return
-
- var/obj/effect/decal/cleanable/semen/S = locate(/obj/effect/decal/cleanable/semen) in location
- if(S && !istype(S, /obj/effect/decal/cleanable/semen/femcum))
- if(S.reagents?.add_reagent(type, volume, data))
- S.update_icon()
- return
-
- var/obj/effect/decal/cleanable/semendrip/drip = (locate(/obj/effect/decal/cleanable/semendrip) in location) || new(location)
- if(drip.reagents?.add_reagent(type, volume, data))
- drip.update_icon()
- if(drip.reagents.total_volume >= 10)
- S = new(location)
- drip.reagents.trans_to(S, drip.reagents.total_volume)
- S.update_icon()
- qdel(drip)
- return
-
-/obj/effect/decal/cleanable/semen
- name = "semen"
- desc = null
- gender = PLURAL
- density = 0
- layer = ABOVE_NORMAL_TURF_LAYER
- icon = 'modular_redmoon/icons/from_bluemoon/mob/genitals/effects.dmi'
- icon_state = "semen1"
- random_icon_states = list("semen1", "semen2", "semen3", "semen4", "semen5", "semen6", "semen7", "semen8", "semen9", "semen10", "semen11", "semen12", "semen13", "semen14")
- var/datum/reagent/my_liquid_type = /datum/reagent/consumable/semen
-
-/obj/effect/decal/cleanable/semen/Initialize(mapload)
- . = ..()
- dir = GLOB.cardinals
- if(mapload)
- reagents.add_reagent(/datum/reagent/consumable/semen, 10)
- add_blood_DNA(list("Non-human DNA" = "A+"))
- update_icon()
-
-/obj/effect/decal/cleanable/semen/replace_decal(obj/effect/decal/cleanable/semen/S)
- // BLUEMOON EDIT START: Invalid Space Turfs
- if(reagents && reagents.total_volume > 0)
- reagents.trans_to(S.reagents, reagents.total_volume)
- S.update_icon()
- // BLUEMOON EDIT END: Invalid Space Turfs
- return ..()
-
-/obj/effect/decal/cleanable/semen/update_icon()
- . = ..()
- if(QDELETED(src) || !reagents)
- return
- add_atom_colour(mix_color_from_reagents(reagents.reagent_list), FIXED_COLOUR_PRIORITY)
-
-/datum/reagent/consumable/semen/femcum
- name = "Female Ejaculate"
- description = "Vaginal lubricant found in most mammals and other animals of similar nature. Where you found this is your own business."
- taste_description = "something with a tang" // wew coders who haven't eaten out a girl.
- color = "#FFFFFF"
- decal_path = /obj/effect/decal/cleanable/semen/femcum
-
-/obj/effect/decal/cleanable/semen/femcum
- name = "female ejaculate"
- icon_state = "fem1"
- random_icon_states = list("fem1", "fem2", "fem3", "fem4", "fem5", "fem6", "fem7", "fem8", "fem9", "fem10")
- blood_state = null
- bloodiness = null
- my_liquid_type = /datum/reagent/consumable/semen/femcum
diff --git a/modular_redmoon/code/modules/species_types/_demihuman.dm b/modular_redmoon/code/modules/species_types/_demihuman.dm
index 6bf8bb53cb0..3c7642e18ae 100644
--- a/modular_redmoon/code/modules/species_types/_demihuman.dm
+++ b/modular_redmoon/code/modules/species_types/_demihuman.dm
@@ -12,13 +12,6 @@
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -30,11 +23,4 @@
/datum/customizer/organ/ears/demihuman,
/datum/customizer/organ/horns/demihuman,
/datum/customizer/organ/tail/demihuman,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/_halfling.dm b/modular_redmoon/code/modules/species_types/_halfling.dm
index 3e484bdbec1..fe23f8e0a23 100644
--- a/modular_redmoon/code/modules/species_types/_halfling.dm
+++ b/modular_redmoon/code/modules/species_types/_halfling.dm
@@ -4,21 +4,16 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -27,11 +22,4 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/_harpy.dm b/modular_redmoon/code/modules/species_types/_harpy.dm
index 48ddaaba1e0..c1e33dfedf3 100644
--- a/modular_redmoon/code/modules/species_types/_harpy.dm
+++ b/modular_redmoon/code/modules/species_types/_harpy.dm
@@ -15,13 +15,6 @@
ORGAN_SLOT_TAIL = /obj/item/organ/tail/harpy,
ORGAN_SLOT_WINGS = /obj/item/organ/wings/flight/harpy,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -32,11 +25,4 @@
/datum/customizer/bodypart_feature/face_detail,
/datum/customizer/organ/tail/harpy,
/datum/customizer/organ/wings/harpy,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/_rakshari.dm b/modular_redmoon/code/modules/species_types/_rakshari.dm
index 6cc66cb2122..98a60194627 100644
--- a/modular_redmoon/code/modules/species_types/_rakshari.dm
+++ b/modular_redmoon/code/modules/species_types/_rakshari.dm
@@ -12,13 +12,6 @@
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -27,12 +20,5 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid/rakshari,
/datum/customizer/bodypart_feature/accessory/rakshari,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/axian.dm b/modular_redmoon/code/modules/species_types/axian.dm
index 4df60936e0e..22ac3efc9c7 100644
--- a/modular_redmoon/code/modules/species_types/axian.dm
+++ b/modular_redmoon/code/modules/species_types/axian.dm
@@ -89,13 +89,6 @@
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail/axian,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -110,13 +103,6 @@
/datum/customizer/organ/snout/axian,
/datum/customizer/organ/tail/axian,
/datum/customizer/organ/ears/axian,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/species_types/dracon.dm b/modular_redmoon/code/modules/species_types/dracon.dm
index 8973d470213..393d4d55890 100644
--- a/modular_redmoon/code/modules/species_types/dracon.dm
+++ b/modular_redmoon/code/modules/species_types/dracon.dm
@@ -79,13 +79,6 @@
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail/dracon,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -100,13 +93,6 @@
/datum/customizer/organ/snout/dracon,
/datum/customizer/organ/tail/dracon,
/datum/customizer/organ/ears/dracon,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/species_types/elfd.dm b/modular_redmoon/code/modules/species_types/elfd.dm
index f6ccd6d50a0..1563bec8121 100644
--- a/modular_redmoon/code/modules/species_types/elfd.dm
+++ b/modular_redmoon/code/modules/species_types/elfd.dm
@@ -3,21 +3,16 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears/elf,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
/datum/customizer/organ/ears/elf,
@@ -26,11 +21,4 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/elfs.dm b/modular_redmoon/code/modules/species_types/elfs.dm
index 4b875505bc0..b36b064cfec 100644
--- a/modular_redmoon/code/modules/species_types/elfs.dm
+++ b/modular_redmoon/code/modules/species_types/elfs.dm
@@ -3,21 +3,16 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears/elfw,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -27,11 +22,4 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/halfdrow.dm b/modular_redmoon/code/modules/species_types/halfdrow.dm
index ec11625e8a7..112d1555319 100644
--- a/modular_redmoon/code/modules/species_types/halfdrow.dm
+++ b/modular_redmoon/code/modules/species_types/halfdrow.dm
@@ -3,21 +3,16 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears/elf,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -27,11 +22,4 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/halforc.dm b/modular_redmoon/code/modules/species_types/halforc.dm
index 1b84cc86534..7f14f97aa0b 100644
--- a/modular_redmoon/code/modules/species_types/halforc.dm
+++ b/modular_redmoon/code/modules/species_types/halforc.dm
@@ -3,21 +3,16 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears/halforc,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
customizers = list(
@@ -27,11 +22,4 @@
/datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/humen.dm b/modular_redmoon/code/modules/species_types/humen.dm
index 260284f37c4..4b355f671e5 100644
--- a/modular_redmoon/code/modules/species_types/humen.dm
+++ b/modular_redmoon/code/modules/species_types/humen.dm
@@ -5,19 +5,14 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
diff --git a/modular_redmoon/code/modules/species_types/lupian.dm b/modular_redmoon/code/modules/species_types/lupian.dm
index f88a3235b65..3d81a53d7ee 100644
--- a/modular_redmoon/code/modules/species_types/lupian.dm
+++ b/modular_redmoon/code/modules/species_types/lupian.dm
@@ -86,13 +86,6 @@
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail/lupian,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -107,13 +100,6 @@
/datum/customizer/organ/snout/lupian,
/datum/customizer/organ/tail/lupian,
/datum/customizer/organ/ears/lupian,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/species_types/moth.dm b/modular_redmoon/code/modules/species_types/moth.dm
index 88ec4fd787c..af0a825350f 100644
--- a/modular_redmoon/code/modules/species_types/moth.dm
+++ b/modular_redmoon/code/modules/species_types/moth.dm
@@ -80,13 +80,6 @@
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_NECK_FEATURE = /obj/item/organ/neck_feature/moth,
ORGAN_SLOT_WINGS = /obj/item/organ/wings/moth,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -101,13 +94,6 @@
/datum/customizer/organ/ears/moth,
/datum/customizer/organ/neck_feature/moth,
/datum/customizer/organ/wings/moth,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/species_types/tabaxi.dm b/modular_redmoon/code/modules/species_types/tabaxi.dm
index ef7ee92f598..566b13179db 100644
--- a/modular_redmoon/code/modules/species_types/tabaxi.dm
+++ b/modular_redmoon/code/modules/species_types/tabaxi.dm
@@ -86,13 +86,6 @@
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail/tabaxi,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -107,13 +100,6 @@
/datum/customizer/organ/snout/tabaxi,
/datum/customizer/organ/tail/tabaxi,
/datum/customizer/organ/ears/tabaxi,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/species_types/tiefling.dm b/modular_redmoon/code/modules/species_types/tiefling.dm
index 5eba338462d..1fb8513a5b8 100644
--- a/modular_redmoon/code/modules/species_types/tiefling.dm
+++ b/modular_redmoon/code/modules/species_types/tiefling.dm
@@ -3,35 +3,29 @@
species_traits = list(NO_UNDERWEAR)
organs = list(
ORGAN_SLOT_BRAIN = /obj/item/organ/brain,
+ ORGAN_SLOT_SPLEEN = /obj/item/organ/spleen,
ORGAN_SLOT_HEART = /obj/item/organ/heart,
ORGAN_SLOT_LUNGS = /obj/item/organ/lungs,
ORGAN_SLOT_EYES = /obj/item/organ/eyes,
+ ORGAN_SLOT_EARS = /obj/item/organ/ears,
ORGAN_SLOT_TONGUE = /obj/item/organ/tongue,
ORGAN_SLOT_LIVER = /obj/item/organ/liver,
ORGAN_SLOT_STOMACH = /obj/item/organ/stomach,
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
+ ORGAN_SLOT_HORNS = /obj/item/organ/horns/tiefling,
+ ORGAN_SLOT_TAIL = /obj/item/organ/tail/tiefling,
)
customizers = list(
+ /datum/customizer/organ/ears/tiefling,
+ /datum/customizer/organ/horns/tiefling,
+ /datum/customizer/organ/tail/tiefling,
/datum/customizer/organ/eyes/humanoid,
/datum/customizer/bodypart_feature/hair/head/humanoid,
+ /datum/customizer/bodypart_feature/hair/facial/humanoid,
/datum/customizer/bodypart_feature/accessory,
/datum/customizer/bodypart_feature/face_detail,
/datum/customizer/organ/snout/vulpkanin,
/datum/customizer/organ/tail/vulpkanin,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
diff --git a/modular_redmoon/code/modules/species_types/vulpkanin.dm b/modular_redmoon/code/modules/species_types/vulpkanin.dm
index 8e39db451a0..bd1a8ade60e 100644
--- a/modular_redmoon/code/modules/species_types/vulpkanin.dm
+++ b/modular_redmoon/code/modules/species_types/vulpkanin.dm
@@ -85,13 +85,6 @@
ORGAN_SLOT_GUTS = /obj/item/organ/guts,
ORGAN_SLOT_APPENDIX = /obj/item/organ/appendix,
ORGAN_SLOT_TAIL = /obj/item/organ/tail/vulpkanin,
- ORGAN_SLOT_BREASTS = /obj/item/organ/genital/breasts,
- ORGAN_SLOT_BUTT = /obj/item/organ/genital/butt,
- ORGAN_SLOT_VAGINA = /obj/item/organ/genital/vagina,
- ORGAN_SLOT_PENIS = /obj/item/organ/genital/penis,
- ORGAN_SLOT_TESTICLES = /obj/item/organ/genital/testicles,
- ORGAN_SLOT_BELLY = /obj/item/organ/genital/belly,
- ORGAN_SLOT_ANUS = /obj/item/organ/genital/anus,
)
bodypart_features = list(
@@ -105,13 +98,6 @@
/datum/customizer/bodypart_feature/face_detail,
/datum/customizer/organ/snout/vulpkanin,
/datum/customizer/organ/tail/vulpkanin,
- /datum/customizer/organ/genital/penis,
- /datum/customizer/organ/genital/testicles,
- /datum/customizer/organ/genital/vagina,
- /datum/customizer/organ/genital/breasts,
- /datum/customizer/organ/genital/butt,
- /datum/customizer/organ/genital/belly,
- /datum/customizer/organ/genital/anus
)
body_marking_sets = list(
diff --git a/modular_redmoon/code/modules/status_effects/neutral.dm b/modular_redmoon/code/modules/status_effects/neutral.dm
deleted file mode 100644
index 8f5444e7f38..00000000000
--- a/modular_redmoon/code/modules/status_effects/neutral.dm
+++ /dev/null
@@ -1,141 +0,0 @@
-/datum/status_effect/dripping_cum
- id = "dripping_cum"
- status_type = STATUS_EFFECT_MULTIPLE
- duration = -1
- tick_interval = 5 SECONDS
- alert_type = /atom/movable/screen/alert/status_effect/dripping_cum
-
- var/datum/reagents/contents
- var/list/blood_DNA
- var/cum_in_anus = 0
- var/cum_in_vagina = 0
- var/anus_can_leak
- var/vagina_can_leak
-
- var/total_injected_volume = 0
-
-
-/datum/status_effect/dripping_cum/on_creation(mob/living/carbon/human/new_owner, datum/reagents/add_or_merge, list/blood_DNA, obj/item/organ/genital/hole)
- // если у владельца уже есть dripping_cum — просто обновляем существующий эффект
- var/datum/status_effect/dripping_cum/existing = new_owner.has_status_effect(/datum/status_effect/dripping_cum)
- if(existing && existing != src)
- if(istype(hole, /obj/item/organ/genital/anus))
- existing.cum_in_anus += add_or_merge.total_volume
- if(istype(hole, /obj/item/organ/genital/vagina))
- existing.cum_in_vagina += add_or_merge.total_volume
- add_or_merge.trans_to(existing.contents, add_or_merge.total_volume)
- if(blood_DNA)
- LAZYINITLIST(existing.blood_DNA)
- existing.blood_DNA |= blood_DNA
- qdel(src)
- return
-
- . = ..()
- if(QDELETED(src) || !.)
- return
- if(!istype(new_owner) || !(istype(add_or_merge) && add_or_merge.total_volume > 0))
- qdel(src)
- return
-
- if(isnull(contents))
- contents = new(300, NO_REACT)
-
- if(istype(hole, /obj/item/organ/genital/anus))
- cum_in_anus += add_or_merge.total_volume
- if(istype(hole, /obj/item/organ/genital/vagina))
- cum_in_vagina += add_or_merge.total_volume
-
- add_or_merge.trans_to(contents, add_or_merge.total_volume)
- if(blood_DNA)
- LAZYINITLIST(src.blood_DNA)
- src.blood_DNA |= blood_DNA
-
- // --- Обычное создание при первом применении ---
- add_or_merge.trans_to(contents, add_or_merge.total_volume)
- if(istype(hole, /obj/item/organ/genital/anus))
- cum_in_anus += add_or_merge.total_volume
- if(istype(hole, /obj/item/organ/genital/vagina))
- cum_in_vagina += add_or_merge.total_volume
-
- if(blood_DNA)
- LAZYINITLIST(src.blood_DNA)
- src.blood_DNA |= blood_DNA
-
-/datum/status_effect/dripping_cum/on_remove(mob/living/carbon/human/owner)
- qdel(contents)
- blood_DNA = null
- . = ..()
-
-/datum/status_effect/dripping_cum/tick()
- if(contents.total_volume <= 0)
- qdel(src)
- return
-
- if(!owner.alerts["dripping_cum"])
- var/atom/movable/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
- A.attached_effect = src
- linked_alert = A
-
- if(!can_drip())
- return
-
- var/turf/location = get_turf(owner)
-
- var/obj/effect/decal/cleanable/semen/S = locate(/obj/effect/decal/cleanable/semen) in location
- if(S && !istype(S, /obj/effect/decal/cleanable/semen/femcum))
- if(contents.trans_to(S, 1))
- if(cum_in_anus > 0)
- cum_in_anus--
- else if(cum_in_vagina > 0)
- cum_in_vagina--
-
- S.reagents.add_reagent(/datum/reagent/consumable/semen, 10)
- if(S.reagents.total_volume > 0)
- S.reagents.trans_to(S.reagents, S.reagents.total_volume)
-
- S.update_icon()
- return
- qdel(src)
-
- var/obj/effect/decal/cleanable/semendrip/drip = (locate(/obj/effect/decal/cleanable/semendrip) in location) || new(location)
- if(contents.trans_to(drip, 1))
- if(cum_in_anus > 0)
- cum_in_anus--
- else if(cum_in_vagina > 0)
- cum_in_vagina--
- drip.update_icon()
- if(drip.reagents.total_volume >= 10)
- S = new(location)
- drip.reagents.trans_to(S, drip.reagents.total_volume)
- S.update_icon()
- qdel(drip)
- return
- qdel(src)
-
-/datum/status_effect/dripping_cum/proc/can_drip()
- var/mob/living/carbon/human/human_owner = owner
- var/obj/item/clothing/clothes = human_owner.get_item_by_slot(ITEM_SLOT_ARMOR)
- if(clothes)
- return FALSE
- if(!(((cum_in_anus > 0) && anus_can_leak) || ((cum_in_vagina > 0) && vagina_can_leak)))
- return FALSE
- return TRUE
-
-/atom/movable/screen/alert/status_effect/dripping_cum
- name = "Dripping Cum"
- desc = "Your last affairs left you dripping someone's seed."
- icon = 'modular_redmoon/icons/from_bluemoon/mob/genitals/screen_alert.dmi'
- icon_state = "dripping_cum"
-
-/atom/movable/screen/alert/status_effect/dripping_cum/MouseEntered(location, control, params)
- desc = initial(desc)
- var/datum/status_effect/dripping_cum/DC = attached_effect
- if(DC)
- var/total_cum = DC.cum_in_anus + DC.cum_in_vagina
- desc += " = {
- head: 'Голова',
- chest: 'Торс',
- groin: 'Пах',
- left_arm: 'Левая рука',
- right_arm: 'Правая рука',
- left_leg: 'Левая нога',
- right_leg: 'Правая нога',
- tail: 'Хвост',
-};
-
-type BodyPartId =
- | 'head'
- | 'chest'
- | 'groin'
- | 'left_arm'
- | 'right_arm'
- | 'left_leg'
- | 'right_leg'
- | 'tail';
-
-interface InteractionAction {
- id: string; // byond path или уникальный id
- name: string; // отображаемое название действия
-}
-
-type InteractionActionsByPart = {
- [K in BodyPartId]?: InteractionAction[];
-};
-
-interface InteractMenuData {
- entity_from: string;
- entity_to: string;
- character_ref: any;
- actions_by_part: InteractionActionsByPart;
- all_actions_by_part?: InteractionActionsByPart;
- favorite_actions?: string[];
- lust?: number;
- lust_max?: number;
- lust_progress?: number;
- auto_running?: boolean;
- auto_action_id?: string;
- auto_interval?: number;
-}
-
-export const InteractMenu = (props, context) => {
- const { data, config, act } = useBackend();
- const { entity_from, entity_to, character_ref } = data;
-
- const [selectedPart, setSelectedPart] = useState('chest');
- const [activeTab, setActiveTab] = useState('main');
- const [showHitboxes, setShowHitboxes] = useState(false);
-
- const progressValue =
- typeof data.lust_progress === 'number' ? data.lust_progress : 0;
- const autoRunning = !!data.auto_running;
- const autoActionId = data.auto_action_id || '';
-
- const runAction = (actionId: string) => {
- if (autoRunning && autoActionId === actionId && duration > 0) {
- act('stop_auto_action');
- return;
- }
- act('run_action_once', {
- part: selectedPart,
- action_id: actionId,
- duration,
- });
- };
-
- const handleMouseOver = (e: React.MouseEvent) => {
- e.currentTarget.style.border = '2px solid #fff';
- };
-
- const handleMouseLeave = (e: React.MouseEvent) => {
- e.currentTarget.style.border = '2px solid transparent';
- };
-
- // Длительность действия (слайдер снизу)
- const [duration, setDuration] = useState(0.0);
-
- if (config.status < 2) {
- return null;
- }
- const actions = data.actions_by_part?.[selectedPart] || [];
- const allActionsForPart = data.all_actions_by_part?.[selectedPart] || [];
- const favoriteActions = Array.isArray(data.favorite_actions)
- ? data.favorite_actions
- : [];
- const favoriteSet = new Set(favoriteActions);
- const preferredActionsForPart = allActionsForPart.filter((action) =>
- favoriteSet.has(action.id),
- );
- const availableActionsForPart = allActionsForPart.filter(
- (action) => !favoriteSet.has(action.id),
- );
-
- return (
-
-
-
- {/* Верхняя панель */}
-
-
-
-
-
- {(entity_from || 'Сущность 1') +
- ' --> ' +
- (entity_to || 'Сущность 2')}
-
-
-
-
-
-
-
-
- {/* Вкладки */}
-
-
-
- setActiveTab('main')}
- >
- Основное
-
-
-
- setActiveTab('builder')}
- >
- Конструктор
-
-
-
-
-
- {/* Центральная область */}
-
- {activeTab === 'main' ? (
-
- {/* Левая колонка: модель персонажа / хитбоксы */}
-
-
-
- {/* Верх: ByondUi с персонажем */}
-
-
-
- {/* Голова */}
- setSelectedPart('head')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Грудь */}
- setSelectedPart('chest')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Пах */}
- setSelectedPart('groin')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Левая рука */}
- setSelectedPart('left_arm')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Правая рука */}
- setSelectedPart('right_arm')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Левая нога */}
- setSelectedPart('left_leg')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Правая нога */}
- setSelectedPart('right_leg')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- {/* Хвост */}
- setSelectedPart('tail')}
- onMouseOver={handleMouseOver}
- onMouseLeave={handleMouseLeave}
- />
-
- )}
-
-
-
- setShowHitboxes(!showHitboxes)}
- >
- {showHitboxes ? 'Скрыть хитбоксы' : 'Показать хитбоксы'}
-
-
-
-
-
- {/* Правая колонка: действия */}
-
-
- {actions.length === 0 ? (
-
- Нет доступных действий (заглушка).
-
- ) : (
- // Оборачиваем список в Box с прокруткой
-
-
- {actions.map((action) => {
- const isFav = favoriteSet.has(action.id);
- const isAuto =
- autoRunning && autoActionId === action.id;
- return (
-
-
-
- runAction(action.id)}
- width="24px"
- />
-
-
-
- runAction(action.id)}
- >
- {action.name}
-
-
-
-
-
- act('toggle_preferred_action', {
- action_id: action.id,
- })
- }
- width="24px"
- />
-
-
-
- );
- })}
-
-
- )}
-
-
-
- ) : (
-
-
-
-
- Настройка порядка действий для части тела:{' '}
- {BODY_PART_LABELS[selectedPart]}
-
-
-
-
- {!preferredActionsForPart.length ? (
- Для этой части тела избранных действий пока нет.
- ) : (
-
- {preferredActionsForPart.map((action, index) => (
-
-
-
-
- act('toggle_preferred_action', {
- action_id: action.id,
- })
- }
- >
- {action.name}
-
-
-
-
- act('move_preferred_action', {
- action_id: action.id,
- direction: 'up',
- })
- }
- />
-
-
-
- act('move_preferred_action', {
- action_id: action.id,
- direction: 'down',
- })
- }
- />
-
-
-
- act('toggle_preferred_action', {
- action_id: action.id,
- })
- }
- />
-
-
-
- ))}
-
- )}
-
-
-
-
- {!availableActionsForPart.length ? (
- Все действия этой части тела уже в избранном.
- ) : (
-
- {availableActionsForPart.map((action) => (
-
-
- act('toggle_preferred_action', {
- action_id: action.id,
- })
- }
- >
- {action.name}
-
-
- ))}
-
- )}
-
-
-
- act('clear_preferred_actions')}
- >
- Очистить все избранные действия
-
-
-
-
- )}
-
-
- {/* Нижняя шкала времени */}
-
-
-
-
-
-
- );
-};
diff --git a/tools/generate_erp_prefs_buttons.py b/tools/generate_erp_prefs_buttons.py
deleted file mode 100644
index 62fb0f3881f..00000000000
--- a/tools/generate_erp_prefs_buttons.py
+++ /dev/null
@@ -1,79 +0,0 @@
-"""Generate erp_prefs.png / erp_prefs_hover.png for character UI themes."""
-from pathlib import Path
-
-from PIL import Image
-
-BASE = Path(__file__).resolve().parents[1] / "html" / "character_ui"
-THEMES = ("dusty", "grimshart", "paper", "parchment")
-TEXT = "ERP PREFS"
-TEXT_X = 3
-
-
-GLYPHS = {
- " ": [[0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0], [0, 0, 0]],
- "E": [[1, 1, 1], [1, 0, 0], [1, 1, 0], [1, 0, 0], [1, 1, 1]],
- "R": [[1, 1, 0], [1, 0, 1], [1, 1, 0], [1, 0, 1], [1, 0, 1]],
- "P": [[1, 1, 1], [1, 0, 1], [1, 1, 1], [1, 0, 0], [1, 0, 0]],
- "F": [[1, 1, 1], [1, 0, 0], [1, 1, 0], [1, 0, 0], [1, 0, 0]],
- "S": [[0, 1, 1], [1, 0, 0], [0, 1, 0], [0, 0, 1], [1, 1, 0]],
-}
-
-
-def sample_text_color(img: Image.Image) -> tuple:
- px = img.load()
- width, height = img.size
- for x in range(2, width - 6):
- for y in range(height):
- color = px[x, y]
- if len(color) == 4 and color[3] == 0:
- continue
- if sum(color[:3]) < 500:
- return color
- return (0, 0, 0, 255)
-
-
-def clear_text_area(img: Image.Image) -> None:
- px = img.load()
- width, height = img.size
- bg = px[1, height // 2]
- for x in range(1, width - 5):
- for y in range(height):
- px[x, y] = bg
-
-
-def draw_text(img: Image.Image, text: str, x: int, y: int, fg) -> None:
- px = img.load()
- cx = x
- for ch in text:
- glyph = GLYPHS.get(ch, GLYPHS[" "])
- for row in range(5):
- for col in range(3):
- if not glyph[row][col]:
- continue
- px[cx + col, y + row] = fg
- cx += 4
-
-
-def make_button(src_path: Path, dst_path: Path, hover: bool) -> None:
- img = Image.open(src_path).convert("RGBA")
- clear_text_area(img)
- if hover:
- fg = (255, 255, 255, 255)
- else:
- fg = sample_text_color(Image.open(src_path).convert("RGBA"))
- draw_text(img, TEXT, TEXT_X, 2, fg)
- img.save(dst_path)
-
-
-def main() -> None:
- for theme in THEMES:
- family_dir = BASE / theme / "family"
- family_dir.mkdir(parents=True, exist_ok=True)
- src = BASE / theme / "flavour" / "flavour_foodprefs.png"
- make_button(src, family_dir / "erp_prefs.png", hover=False)
- make_button(src, family_dir / "erp_prefs_hover.png", hover=True)
- print(f"Generated {theme}")
-
-
-if __name__ == "__main__":
- main()
diff --git a/vanderlin.dme b/vanderlin.dme
index cc1340771cf..c105e37559b 100644
--- a/vanderlin.dme
+++ b/vanderlin.dme
@@ -4310,70 +4310,19 @@
#include "interface\fonts\datums\wernicke.dm"
#include "interface\fonts\datums\yataghan.dm"
#include "modular_redmoon\__DEFINES\__DNA_defines.dm"
-#include "modular_redmoon\__DEFINES\_global_lewd.dm"
-#include "modular_redmoon\__DEFINES\_lewd.dm"
-#include "modular_redmoon\__DEFINES\_preferences.dm"
-#include "modular_redmoon\__DEFINES\_signals.dm"
#include "modular_redmoon\__DEFINES\_sizecode.dm"
-#include "modular_redmoon\__DEFINES\_spans.dm"
-#include "modular_redmoon\__DEFINES\citadel_defines.dm"
-#include "modular_redmoon\__DEFINES\erp_traits_defines.dm"
#include "modular_redmoon\__DEFINES\inventory.dm"
#include "modular_redmoon\__DEFINES\items_flags.dm"
#include "modular_redmoon\__DEFINES\jobs_lunatic.dm"
-#include "modular_redmoon\__DEFINES\lewd_definitions.dm"
#include "modular_redmoon\__DEFINES\misc.dm"
#include "modular_redmoon\__DEFINES\mobs.dm"
#include "modular_redmoon\__DEFINES\healing_miracle.dm"
-#include "modular_redmoon\__DEFINES\status_effects.dm"
#include "modular_redmoon\_HELPERS\_cit_helpers.dm"
#include "modular_redmoon\_HELPERS\_logging.dm"
-#include "modular_redmoon\_HELPERS\body_parts_helpers.dm"
#include "modular_redmoon\_HELPERS\mobs.dm"
#include "modular_redmoon\_HELPERS\sizecode.dm"
#include "modular_redmoon\code\_globalvars\lists\flavor_misc.dm"
-#include "modular_redmoon\code\_onclick\_onclick_human.dm"
-#include "modular_redmoon\code\controllers\subsystem\interactions.dm"
-#include "modular_redmoon\code\datums\interaction_mob.dm"
-#include "modular_redmoon\code\datums\interactions\__bitfields.dm"
-#include "modular_redmoon\code\datums\interactions\_interactions.dm"
-#include "modular_redmoon\code\datums\interactions\lewd_definitions.dm"
-#include "modular_redmoon\code\datums\interactions\lewd_interactions.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\_lewd.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\interaction_definitions.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd_datums.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\breasts.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\facefuck.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\feet.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\finger.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\frotting.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\fuck.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\handjob.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\kiss.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\lick.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\mount.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\nipsuck.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\nuts.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\oral.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\cursed\bite.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\cursed\earfuck.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\cursed\eyefuck.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\self\breasts.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\self\finger.dm"
-#include "modular_redmoon\code\datums\interactions\interaction_datums\lewd\self\jack.dm"
#include "modular_redmoon\code\datums\status_effects\healing_miracle.dm"
-#include "modular_redmoon\code\modules\arousal\arousal.dm"
-#include "modular_redmoon\code\modules\arousal\genitals.dm"
-#include "modular_redmoon\code\modules\arousal\genitals_customizer_chooses.dm"
-#include "modular_redmoon\code\modules\arousal\genitals_sprite_accessories.dm"
-#include "modular_redmoon\code\modules\arousal\organs\anus.dm"
-#include "modular_redmoon\code\modules\arousal\organs\belly.dm"
-#include "modular_redmoon\code\modules\arousal\organs\breasts.dm"
-#include "modular_redmoon\code\modules\arousal\organs\butt.dm"
-#include "modular_redmoon\code\modules\arousal\organs\penis.dm"
-#include "modular_redmoon\code\modules\arousal\organs\testicles.dm"
-#include "modular_redmoon\code\modules\arousal\organs\vagina.dm"
-#include "modular_redmoon\code\modules\arousal\organs\womb.dm"
#include "modular_redmoon\code\modules\blooper\say_barks.dm"
#include "modular_redmoon\code\modules\blooper\bark_extra.dm"
#include "modular_redmoon\code\modules\jobs\playerquality_jobs.dm"
@@ -4382,7 +4331,7 @@
#include "modular_redmoon\code\modules\spells\healing_miracle.dm"
#include "modular_redmoon\code\modules\client\preferences.dm"
#include "modular_redmoon\code\modules\client\preferences_playerquality.dm"
-#include "modular_redmoon\code\modules\client\preferences_erp.dm"
+#include "modular_redmoon\code\modules\client\preferences_refresh_guard.dm"
#include "modular_redmoon\code\modules\client\preferences_barks.dm"
#include "modular_redmoon\code\modules\client\pronouns_ru.dm"
#include "modular_redmoon\code\modules\customizers\features\neck.dm"
@@ -4394,7 +4343,6 @@
#include "modular_redmoon\code\modules\customizers\sprite_accessories\snouts.dm"
#include "modular_redmoon\code\modules\customizers\sprite_accessories\tails.dm"
#include "modular_redmoon\code\modules\customizers\sprite_accessories\wings.dm"
-#include "modular_redmoon\code\modules\reagents\chemistry\reagents\other_reagents.dm"
#include "modular_redmoon\code\modules\species\werewolf_barks.dm"
#include "modular_redmoon\code\modules\species_types\_demihuman.dm"
#include "modular_redmoon\code\modules\species_types\_halfling.dm"
@@ -4412,5 +4360,4 @@
#include "modular_redmoon\code\modules\species_types\tabaxi.dm"
#include "modular_redmoon\code\modules\species_types\tiefling.dm"
#include "modular_redmoon\code\modules\species_types\vulpkanin.dm"
-#include "modular_redmoon\code\modules\status_effects\neutral.dm"
// END_INCLUDE