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

Merge branch 'master' into upstream-merge-6882

Browse Source
This commit is contained in:
Novacat
2020-03-23 23:25:26 -04:00
committed by GitHub
parent 61bde5ddc7 94f5eda84c
commit 4b2b3b3a2f
38 changed files with 258 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ Also includes Life and New
traitdat.source = name
if(!health)
stat = DEAD
set_stat(DEAD)
/mob/living/simple_mob/xeno/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam/stun/xeno))