shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13241 from Putnam3145/voreeject

Browse Source 
Made all death release vore contents, not just gibbing/dusting
This commit is contained in:
silicons
2020-08-23 17:39:43 -07:00
committed by GitHub
parent 1b29e0654f 87080bfac4
commit f0bcab1143
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/death.dm
+1 -4
View File
@@ -8,8 +8,6 @@
spill_organs(no_brain, no_organs, no_bodyparts) spill_organs(no_brain, no_organs, no_bodyparts)
release_vore_contents(silent = TRUE) // return of the bomb safe internals.
if(!no_bodyparts) if(!no_bodyparts)
spread_bodyparts(no_brain, no_organs) spread_bodyparts(no_brain, no_organs)
@@ -46,7 +44,6 @@
buckled.unbuckle_mob(src, force = TRUE) buckled.unbuckle_mob(src, force = TRUE)
dust_animation() dust_animation()
release_vore_contents(silent = TRUE) //technically grief protection, I guess? if they're SM'd it doesn't matter seconds after anyway.
spawn_dust(just_ash) spawn_dust(just_ash)
QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes. QDEL_IN(src,5) // since this is sometimes called in the middle of movement, allow half a second for movement to finish, ghosting to happen and animation to play. Looks much nicer and doesn't cause multiple runtimes.
@@ -103,5 +100,5 @@
for(var/s in sharedSoullinks) for(var/s in sharedSoullinks)
var/datum/soullink/S = s var/datum/soullink/S = s
S.sharerDies(gibbed) S.sharerDies(gibbed)
release_vore_contents(silent = TRUE)
return TRUE return TRUE