Organ Spilling Rebalance (#343)

## About The Pull Request

This isn't an organ spill rebalance but rather a bugfix that fixes
sexual organs being spilled out on disembowelment. The title exists so
that future employers don't look at my github history and see "Fixes
anuses, vaginas, penises, testicles spilling out during disembowelment"
on my git history.

I did not test this yet because I need to go to bed and I just spent the
last 10 minutes fixing my fucked git repo. But it compiles, so it
works™️.

actually im not even sure if it compiles i did not even bother to
compile it


## Changelog


🆑 BurgerBB
fix: Fixes sexual organs being spilled out on disembowelment.
balance: Removes cock checking.
/🆑
This commit is contained in:
BurgerLUA
2023-07-16 23:29:10 -04:00
committed by GitHub
parent 7a8f8fa12a
commit 6609b8acc0
3 changed files with 6 additions and 2 deletions
+3 -1
View File
@@ -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)
@@ -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)
*/
+1 -1
View File
@@ -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"