mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Xenotaser should work now
This commit is contained in:
@@ -95,6 +95,12 @@ Also includes Life and New
|
|||||||
if(!health)
|
if(!health)
|
||||||
stat = DEAD
|
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()
|
/mob/living/simple_animal/xeno/Destroy()
|
||||||
traitdat.Destroy() //Let's clean up after ourselves.
|
traitdat.Destroy() //Let's clean up after ourselves.
|
||||||
traitdat = null
|
traitdat = null
|
||||||
|
|||||||
@@ -52,13 +52,19 @@
|
|||||||
muzzle_type = /obj/effect/projectile/laser_omni/muzzle
|
muzzle_type = /obj/effect/projectile/laser_omni/muzzle
|
||||||
tracer_type = /obj/effect/projectile/laser_omni/tracer
|
tracer_type = /obj/effect/projectile/laser_omni/tracer
|
||||||
impact_type = /obj/effect/projectile/laser_omni/impact
|
impact_type = /obj/effect/projectile/laser_omni/impact
|
||||||
|
/*
|
||||||
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
|
/obj/item/projectile/beam/stun/xeno/on_hit(var/atom/target, var/blocked = 0)
|
||||||
if(istype(target, /mob/living/simple_animal/xeno))
|
if(istype(target, /mob/living/simple_animal/xeno))
|
||||||
|
world << "is xeno"
|
||||||
var/mob/living/simple_animal/xeno/X = target
|
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
|
X.stasis += stasisforce
|
||||||
else
|
else
|
||||||
|
world << "is not slime"
|
||||||
X.stasis += (stasisforce / 8)
|
X.stasis += (stasisforce / 8)
|
||||||
else
|
else
|
||||||
|
world << "is not xeno"
|
||||||
..()
|
..()
|
||||||
|
*/
|
||||||
36
html/changelogs/Anewbe - Xenotaser.yml
Normal file
36
html/changelogs/Anewbe - Xenotaser.yml
Normal 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."
|
||||||
Reference in New Issue
Block a user