Moved item_heal_robotic out of obj/item and into mob_helpers.dm

This commit is contained in:
Rockdtben
2014-06-05 19:25:08 -05:00
parent 7d607d0bde
commit 569d12facf
4 changed files with 27 additions and 27 deletions
+1 -1
View File
@@ -173,7 +173,7 @@
if(affecting.status == ORGAN_ROBOTIC)
if(src.remove_fuel(0))
src.item_heal_robotic(H, user, 30, 0)
item_heal_robotic(H, user, 30, 0)
return
else
user << "<span class='warning'>Need more welding fuel!</span>"
+25 -1
View File
@@ -418,4 +418,28 @@ proc/is_special_character(mob/M) // returns 1 for special characters and 2 for h
/proc/get_both_hands(mob/living/carbon/M)
var/list/hands = list(M.l_hand, M.r_hand)
return hands
return hands
/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn)
var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
var/dam //changes repair text based on how much brute/burn was supplied
if(brute > burn)
dam = 1
else
dam = 0
if(affecting.status == ORGAN_ROBOTIC)
if(brute > 0 && affecting.brute_dam > 0 || burn > 0 && affecting.burn_dam > 0)
affecting.heal_damage(brute,burn,1)
H.update_damage_overlays(0)
H.updatehealth()
for(var/mob/O in viewers(user, null))
O.show_message(text("<span class='notice'>[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!</span>"), 1)
return
else
user << "<span class='notice'>[H]'s [affecting.getDisplayName()] is already in good condition</span>"
return
else
return
+1 -1
View File
@@ -491,7 +491,7 @@ obj/structure/cable/proc/avail()
var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
if(affecting.status == ORGAN_ROBOTIC)
src.item_heal_robotic(H, user, 0, 30)
item_heal_robotic(H, user, 0, 30)
src.use(1)
return
else
-24
View File
@@ -151,30 +151,6 @@
return update_organ_icon()
/obj/item/proc/item_heal_robotic(var/mob/living/carbon/human/H, var/mob/user, var/brute, var/burn)
var/obj/item/organ/limb/affecting = H.get_organ(check_zone(user.zone_sel.selecting))
var/dam //changes repair text based on how much brute/burn was supplied
if(brute > burn)
dam = 1
else
dam = 0
if(affecting.status == ORGAN_ROBOTIC)
if(brute > 0 && affecting.brute_dam > 0 || burn > 0 && affecting.burn_dam > 0)
affecting.heal_damage(brute,burn,1)
H.update_damage_overlays(0)
H.updatehealth()
for(var/mob/O in viewers(user, null))
O.show_message(text("<span class='notice'>[user] has fixed some of the [dam ? "dents on" : "burnt wires in"] [H]'s [affecting.getDisplayName()]!</span>"), 1)
return
else
user << "<span class='notice'>[H]'s [affecting.getDisplayName()] is already in good condition</span>"
return
else
return
//Returns total damage...kinda pointless really
/obj/item/organ/limb/proc/get_damage()
return brute_dam + burn_dam