Merge pull request #87 from alex-gh/bs12cherrypicks2

A few more fixes from BS12 dev branch.
This commit is contained in:
ZomgPonies
2013-12-14 16:45:00 -08:00
2 changed files with 4 additions and 4 deletions
+2 -2
View File
@@ -923,8 +923,8 @@
if(nutrition > 500)
nutrition = 500
if(light_amount > 2) //if there's enough light, heal
heal_overall_damage(1,1)
if(light_amount > 5) //if there's enough light, heal
adjustBruteLoss(-1)
adjustToxLoss(-1)
adjustOxyLoss(-1)
if(dna && dna.mutantrace == "shadow")
+2 -2
View File
@@ -891,8 +891,8 @@ obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
H.regenerate_icons()
H.stat = 2
H.death()
brainmob.stat = 2
brainmob.death()
obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
brainmob = new(src)