cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8600 from phil235/AlienNestFixing

Browse Source 
Fixes alien nest buckling
This commit is contained in:
Cheridan
2015-03-31 00:06:14 -05:00
parent 9606763e5f 2ef01a61c5
commit 67d9f77ea9
4 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/death.dm
+2
View File
@@ -38,6 +38,8 @@
living_mob_list -= src
if(!gibbed)
dead_mob_list += src
else if(buckled)
buckled.unbuckle_mob()
/mob/living/proc/setup_animation(var/animation, var/prev_lying)
code/modules/mob/living/living.dm
+3 -4
View File
@@ -693,13 +693,12 @@ Sorry Giacom. Please don't be mad :(
if(do_after(usr, 600))
if(!C.buckled)
return
C.visible_message("<span class='danger'>[C] manages to unbuckle themself!</span>", \
"<span class='notice'>You successfully unbuckle yourself.</span>")
C.buckled.user_unbuckle_mob(C,C)
else
C << "<span class='warning'>You fail to unbuckle yourself!</span>"
if(C && C.buckled)
C << "<span class='warning'>You fail to unbuckle yourself!</span>"
else
L.buckled.user_unbuckle_mob(L,L)
C.buckled.user_unbuckle_mob(C,C)
else
L.buckled.user_unbuckle_mob(L,L)