cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-09-10 22:05:55 -04:00
committed by GitHub
parent 06014fb014
commit d7775566d0
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
code/modules/xenobio2/mob/xeno.dm
View File

@@ -101,12 +101,6 @@ Also includes Life and New
stasis += hit.stasisforce stasis += hit.stasisforce
..() ..()
<<<<<<< HEAD
/mob/living/simple_animal/xeno/Destroy() /mob/living/simple_animal/xeno/Destroy()
QDEL_NULL(traitdat) QDEL_NULL(traitdat)
======= ..()
/mob/living/simple_mob/xeno/Destroy()
traitdat.Destroy() //Let's clean up after ourselves.
traitdat = null
>>>>>>> 1ef36f1a6e... Merge pull request #13709 from Heroman3003/remove-animal
..()