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
@@ -2,7 +2,7 @@
var/tally = 0
if(species && species.flags & IS_SLOW)
tally = 10
tally = 7
if (istype(loc, /turf/space)) return -1 // It's hard to be slowed down in space by... anything
+9 -6
View File
@@ -914,12 +914,15 @@
nutrition += light_amount
traumatic_shock -= light_amount
if(nutrition > 500)
nutrition = 500
if(light_amount > 5) //if there's enough light, heal
adjustBruteLoss(-1)
adjustToxLoss(-1)
adjustOxyLoss(-1)
if(species.flags & IS_PLANT)
if(nutrition > 500)
nutrition = 500
if(light_amount >= 3) //if there's enough light, heal
adjustBruteLoss(-(light_amount))
adjustToxLoss(-(light_amount))
adjustOxyLoss(-(light_amount))
//TODO: heal wounds, heal broken limbs.
if(dna && dna.mutantrace == "shadow")
var/light_amount = 0
if(isturf(loc))
@@ -454,7 +454,7 @@
if(nutrition > 500)
nutrition = 500
if(light_amount > 2) //if there's enough light, heal
heal_overall_damage(1,1)
adjustBruteLoss(-1)
adjustToxLoss(-1)
adjustOxyLoss(-1)
@@ -679,4 +679,4 @@
return
adjustFireLoss(6)
return
//END FIRE CODE
//END FIRE CODE
+3 -2
View File
@@ -107,6 +107,7 @@
primitive = /mob/living/carbon/monkey/skrell
flags = HAS_LIPS | HAS_UNDERWEAR
bloodflags = BLOOD_GREEN
/datum/species/vox
name = "Vox"
@@ -125,7 +126,7 @@
eyes = "vox_eyes_s"
breath_type = "nitrogen"
flags = NO_SCAN | IS_WHITELISTED
flags = NO_SCAN | IS_WHITELISTED | NO_BLOOD
/datum/species/diona
name = "Diona"
@@ -148,7 +149,7 @@
heat_level_3 = 700
flags = NO_BREATHE | REQUIRE_LIGHT | NO_SCAN | IS_PLANT | RAD_ABSORB | NO_BLOOD | IS_SLOW | NO_PAIN
bloodflags = BLOOD_GREEN
/datum/species/kidan