TG: Fixes some mix-up with what hand was lost

Regenerate admin verb now restores limbs/lost blood
Fixes power_loss proc to actually respect the electrical channel something is
on.
Revision: r3539
Author: 	 VivianFoxfoot
This commit is contained in:
Erthilo
2012-05-09 23:29:06 +01:00
parent ea390487f2
commit ffeb9a958a
3 changed files with 17 additions and 5 deletions
+3 -4
View File
@@ -217,12 +217,11 @@
SetParalysis(0)
SetStunned(0)
SetWeakened(0)
src.radiation = 0
src.nutrition = 400
src.bodytemperature = initial(src.bodytemperature)
//src.health = 100
if(ishuman(src))
src.radiation = 0
//M.health = 100
src.nutrition = 400
src.bodytemperature = initial(src.bodytemperature)
src.heal_overall_damage(1000, 1000)
//M.updatehealth()
src.buckled = initial(src.buckled)
+13
View File
@@ -713,6 +713,19 @@
if ( !usr || usr==src || !istype(src.loc,/turf) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
return
if(ishuman(usr))
if(usr.hand) // if he's using his left hand.
var/datum/organ/external/temp = usr:get_organ("l_hand")
if(temp.destroyed)
usr << "\blue You look at your stump."
return
else
var/datum/organ/external/temp = usr:get_organ("r_hand")
if(temp.destroyed)
usr << "\blue You look at your stump."
return
if (!( anchored ))
usr.pulling = src
if(ismob(src))
+1 -1
View File
@@ -31,7 +31,7 @@
if(!A || !isarea(A) || !A.master)
return 0 // if not, then not powered
return A.master.powered(chan) // return power status of the area
return A.master.powered(power_channel) // return power status of the area
// increment the power usage stats for an area