More dionaea tweaks, NO_PAIN, IS_PLANT and IS_SLOW specifically.

Conflicts:
	code/modules/mob/living/carbon/species.dm
This commit is contained in:
Zuhayr
2014-01-07 00:04:27 -05:00
committed by ZomgPonies
parent ab6fb88bf5
commit d856157f26
6 changed files with 23 additions and 15 deletions
+4 -3
View File
@@ -105,7 +105,7 @@
u_equip(c_hand)
if(broken)
emote("me", 1, "screams in pain and drops what they were holding in their [E.display_name?"[E.display_name]":"[E]"]!")
emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : "screams in pain and"] drops what they were holding in their [E.display_name?"[E.display_name]":"[E]"]!")
if(malfunction)
emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
@@ -121,7 +121,8 @@
// standing is poor
if(leg_tally <= 0 && !paralysis && !(lying || resting) && prob(5))
emote("scream")
if(species && species.flags & NO_PAIN)
emote("scream")
emote("collapse")
paralysis = 10
@@ -133,4 +134,4 @@
E = organs_by_name["r_foot"]
if(E.status & ORGAN_DESTROYED)
can_stand--
can_stand--
+4 -1
View File
@@ -608,7 +608,10 @@ This function completely restores a damaged organ to perfect condition.
if(status & ORGAN_BROKEN)
return
owner.visible_message("\red You hear a loud cracking sound coming from \the [owner].","\red <b>Something feels like it shattered in your [display_name]!</b>","You hear a sickening crack.")
owner.emote("scream")
if(owner.species && !(owner.species.flags & NO_PAIN))
owner.emote("scream")
status |= ORGAN_BROKEN
broken_description = pick("broken","fracture","hairline fracture")
perma_injury = brute_dam