cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-15 12:42:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Xenotaser should work now

Browse Source
This commit is contained in:
Anewbe
2017-01-18 17:47:38 -06:00
parent 3921b94c4d
commit c71007fa58
3 changed files with 51 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,12 @@ Also includes Life and New
if(!health)
stat = DEAD
/mob/living/simple_animal/xeno/bullet_act(var/obj/item/projectile/Proj)
if(istype(Proj, /obj/item/projectile/beam/stun/xeno))
var/obj/item/projectile/beam/stun/xeno/hit = Proj
stasis += hit.stasisforce
..()
/mob/living/simple_animal/xeno/Destroy()
traitdat.Destroy() //Let's clean up after ourselves.
traitdat = null

12
code/modules/xenobio2/tools/slime_handling_tools.dm
View File

@@ -52,13 +52,19 @@
muzzle_type = /obj/effect/projectile/laser_omni/muzzle
tracer_type = /obj/effect/projectile/laser_omni/tracer
impact_type = /obj/effect/projectile/laser_omni/impact
/*
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
if(istype(target, /mob/living/simple_animal/xeno))
world << "is xeno"
var/mob/living/simple_animal/xeno/X = target
if(istype(target, /mob/living/simple_animal/xeno/slime))
world << "[target.name]"
if(istype(X, /mob/living/simple_animal/xeno/slime))
world << "is slime"
X.stasis += stasisforce
else
world << "is not slime"
X.stasis += (stasisforce / 8)
else
..()
world << "is not xeno"
..()
*/