Merge pull request #9598 from deathride58/runtimefixpass

various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
This commit is contained in:
kevinz000
2019-10-29 21:41:11 -07:00
committed by GitHub
3 changed files with 2 additions and 3 deletions
+1 -1
View File
@@ -164,7 +164,7 @@
if(starting)
splatter_dir = get_dir(starting, target_loca)
var/obj/item/bodypart/B = L.get_bodypart(def_zone)
if(B.status == BODYPART_ROBOTIC) // So if you hit a robotic, it sparks instead of bloodspatters
if(B && B.status == BODYPART_ROBOTIC) // So if you hit a robotic, it sparks instead of bloodspatters
do_sparks(2, FALSE, target.loc)
if(prob(25))
new /obj/effect/decal/cleanable/oil(target_loca)
-1
View File
@@ -233,7 +233,6 @@
name = "plasma bone \"tongue\""
desc = "Like animated skeletons, Plasmamen vibrate their teeth in order to produce speech."
icon_state = "tongueplasma"
maxHealth = "alien"
modifies_speech = FALSE
/obj/item/organ/tongue/robot