Fixes synths spilling brains when gibbed in deathmatch (#2258)

* Fixes synths spilling brains when gibbed in deathmatch * Update death.dm * This can be modular * Update deathmatch_lobby.dm * No it can't be modular Co-authored-by: Bloop <[email protected]>
Fluffy-Frontier · Mar 6, 2024 · ded91b5 · ded91b5
1 parent d9722e7
commit ded91b5
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 22 deletions.
diff --git a/code/modules/deathmatch/deathmatch_lobby.dm b/code/modules/deathmatch/deathmatch_lobby.dm
@@ -133,6 +133,11 @@
 	if (global_chat)
 		ADD_TRAIT(new_player, TRAIT_SIXTHSENSE, INNATE_TRAIT)
 		ADD_TRAIT(new_player, TRAIT_XRAY_HEARING, INNATE_TRAIT)
+	// NOVA EDIT ADDITION START - Synth brains don't drop here - let them delete with the mob
+	var/obj/item/organ/internal/brain/synth/synth_brain = new_player.get_organ_slot(ORGAN_SLOT_BRAIN)
+	if(istype(synth_brain))
+		synth_brain.drop_when_organ_spilling = FALSE
+	// NOVA EDIT ADDITION END
 
 /datum/deathmatch_lobby/proc/game_took_too_long()
 	if (!location || QDELING(src))

diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
@@ -19,7 +19,7 @@
 		death(TRUE)
 
 	ghostize()
-	spill_organs(issynthetic(src) ? drop_bitflags|DROP_BRAIN : drop_bitflags) // NOVA EDIT CHANGE - Synths always drop brains - ORIGINAL: spill_organs(drop_bitflags)
+	spill_organs(drop_bitflags)
 
 	if(drop_bitflags & DROP_BODYPARTS)
 		spread_bodyparts(drop_bitflags)

diff --git a/modular_nova/master_files/code/modules/mob/living/carbon/death.dm b/modular_nova/master_files/code/modules/mob/living/carbon/death.dm
@@ -6,6 +6,11 @@
 			held_organs.Add(organ)
 			organs.Remove(organ)
 
+	// synth brains always drop when gibbed, by default
+	var/obj/item/organ/internal/brain/synth/synth_brain = get_organ_slot(ORGAN_SLOT_BRAIN)
+	if(istype(synth_brain))
+		drop_bitflags |= DROP_BRAIN
+
 	. = ..()
 
 	// put the unspillable organs back

diff --git a/modular_nova/master_files/code/modules/mob/living/carbon/human/human.dm b/modular_nova/master_files/code/modules/mob/living/carbon/human/human.dm
@@ -0,0 +1,11 @@
+/mob/living/carbon/human/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/interactable)
+	//Removing ERP IC verbs depending on config
+	if(CONFIG_GET(flag/disable_erp_preferences))
+		verbs -= /mob/living/carbon/human/verb/toggle_genitals
+		verbs -= /mob/living/carbon/human/verb/toggle_arousal
+	if(CONFIG_GET(flag/disable_erp_preferences))
+		verbs -= /mob/living/carbon/human/verb/climax_verb
+	if(CONFIG_GET(flag/disable_lewd_items))
+		verbs -= /mob/living/carbon/human/verb/safeword
diff --git a/modular_nova/modules/customization/modules/surgery/organs/genitals.dm b/modular_nova/modules/customization/modules/surgery/organs/genitals.dm
@@ -500,7 +500,6 @@
 			return text2num(key)
 	return 0
 
-
 /mob/living/carbon/human/verb/toggle_genitals()
 	set category = "IC"
 	set name = "Expose/Hide genitals"
@@ -530,13 +529,6 @@
 			update_body()
 	return
 
-//Removing ERP IC verb depending on config
-/mob/living/carbon/human/Initialize(mapload)
-	. = ..()
-	if(CONFIG_GET(flag/disable_erp_preferences))
-		verbs -= /mob/living/carbon/human/verb/toggle_genitals
-		verbs -= /mob/living/carbon/human/verb/toggle_arousal
-
 /mob/living/carbon/human/verb/toggle_arousal()
 	set category = "IC"
 	set name = "Toggle Arousal"
@@ -566,4 +558,3 @@
 			picked_organ.aroused = gen_arous_trans[picked_arousal]
 			picked_organ.update_sprite_suffix()
 			update_body()
-	return
diff --git a/modular_nova/modules/interaction_menu/code/interaction_datum.dm b/modular_nova/modules/interaction_menu/code/interaction_datum.dm
@@ -84,7 +84,7 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
 			if(INTERACTION_REQUIRE_TARGET_HAND)
 				if(!target.get_active_hand())
 					return FALSE
-			
+
 			else
 				CRASH("Unimplemented interaction requirement '[requirement]'")
 	return TRUE
@@ -227,10 +227,6 @@ GLOBAL_LIST_EMPTY_TYPED(interaction_instances, /datum/interaction)
 	WRITE_FILE(file, json_encode(json))
 	return TRUE
 
-/mob/living/carbon/human/Initialize(mapload)
-	. = ..()
-	AddComponent(/datum/component/interactable)
-
 /// Global loading procs
 /proc/populate_interaction_instances()
 	for(var/spath in subtypesof(/datum/interaction))

diff --git a/modular_nova/modules/modular_items/lewd_items/code/verbs.dm b/modular_nova/modules/modular_items/lewd_items/code/verbs.dm
@@ -34,13 +34,6 @@
 /mob/living/silicon/get_reflexes_lose_text()
 	return "Our systems will allow platonic contact."
 
-/mob/living/carbon/human/Initialize(mapload)
-	. = ..()
-	if(CONFIG_GET(flag/disable_erp_preferences))
-		verbs -= /mob/living/carbon/human/verb/climax_verb
-	if(CONFIG_GET(flag/disable_lewd_items))
-		verbs -= /mob/living/carbon/human/verb/safeword
-
 /mob/living/carbon/human/verb/safeword()
 	set name = "Remove Lewd Items"
 	set category = "OOC"

diff --git a/tgstation.dme b/tgstation.dme
@@ -6508,6 +6508,7 @@
 #include "modular_nova\master_files\code\modules\mob\living\carbon\death.dm"
 #include "modular_nova\master_files\code\modules\mob\living\carbon\human_helpers.dm"
 #include "modular_nova\master_files\code\modules\mob\living\carbon\human\death.dm"
+#include "modular_nova\master_files\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_nova\master_files\code\modules\mob\living\carbon\human\species.dm"
 #include "modular_nova\master_files\code\modules\mob\living\carbon\human\species_type\lizardpeople.dm"
 #include "modular_nova\master_files\code\modules\mob\living\carbon\human\species_type\podpeople.dm"