cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-27 22:18:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12503 from KillianKirilenko/8298-fix

Browse Source 
Update xeno.dm
This commit is contained in:
Casey
2022-03-21 16:20:05 -04:00
committed by GitHub
parent 4e96b8f564 0b1f139046
commit 997b44be91
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/xenobio2/mob/xeno.dm
-6
View File
@@ -101,12 +101,6 @@ Also includes Life and New
stasis += hit.stasisforce
..()
<<<<<<< HEAD
/mob/living/simple_mob/xeno/Destroy()
traitdat.Destroy() //Let's clean up after ourselves.
traitdat = null
=======
/mob/living/simple_animal/xeno/Destroy()
QDEL_NULL(traitdat)
>>>>>>> a7877d86e50... Merge pull request #8341 from MistakeNot4892/qdel
..()