diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index c3282967e64..41eb4d518ba 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -50,7 +50,7 @@
 					qdel(organ) //so the brain isn't transfered to the head when the head drops.
 					continue
 				var/org_zone = check_zone(organ.zone) //both groin and chest organs.
-				if(org_zone == BODY_ZONE_CHEST)
+				if(org_zone == BODY_ZONE_CHEST && organ.drop_when_organ_spilling) //Zubbers change, checks for drop_when_organ_spilling
 					organ.Remove(src)
 					organ.forceMove(Tsec)
 					organ.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
@@ -62,6 +62,8 @@
 			if(no_organs && !istype(organ, /obj/item/organ/internal/brain))
 				qdel(organ)
 				continue
+			if(!organ.drop_when_organ_spilling) //Zubbers change, checks for drop_when_organ_spilling
+				continue
 			organ.Remove(src)
 			organ.forceMove(Tsec)
 			organ.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
diff --git a/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm b/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm
index b2d6c975652..eac95a0e3d5 100644
--- a/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm
+++ b/modular_skyrat/master_files/code/modules/mob/living/carbon/death.dm
@@ -1,4 +1,5 @@
 // By temporarily removing the unspillable organs before calling the parent proc we can avoid Skyrat edits and make this less likely to break in the future
+/* Bubberstation edit: Removed in favor of directly injecting this into the code so it works and doesn't have to do a funny hacky method.
 /mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts, gibbed = FALSE)
 	var/list/held_organs = list()
 	for(var/obj/item/organ/organ as anything in organs)
@@ -18,3 +19,4 @@
 	// put the unspillable organs back
 	for(var/obj/item/organ/organ as anything in held_organs)
 		organs.Add(organ)
+*/
diff --git a/tgstation.dme b/tgstation.dme
index bdcf06202fe..10ead83c9d2 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -5441,11 +5441,11 @@
 #include "interface\interface.dm"
 #include "interface\menu.dm"
 #include "interface\stylesheet.dm"
+#include "interface\skin.dmf"
 #include "interface\fonts\fonts_datum.dm"
 #include "interface\fonts\grand_9k.dm"
 #include "interface\fonts\tiny_unicode.dm"
 #include "interface\fonts\vcr_osd_mono.dm"
-#include "interface\skin.dmf"
 #include "modular_skyrat\master_files\code\_globalvars\configuration.dm"
 #include "modular_skyrat\master_files\code\_globalvars\religion.dm"
 #include "modular_skyrat\master_files\code\_globalvars\lists\ambience.dm"