Xenotaser should work now

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

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

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"
..()
*/

View File

@@ -0,0 +1,36 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################
# Your name.
author: Anewbe
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "The Xenotaser should work properly."