cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-20 20:45:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1934 from RobRichards1997/30/11/2013-Toxic-Converter-Cyberlimb-Fix

Browse Source 
Cyber limbs fixes [FIXES #1920] + [Fixes #2180] + [RUNTIME FIX]
This commit is contained in:
Aranclanos
2013-12-30 10:23:54 -08:00
parent f1fb63d5e2 6397796058
commit d5ddac3a00
8 changed files with 45 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/medical.dm
+2 -3
View File
@@ -12,7 +12,7 @@
/obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
var/mob/living/carbon/human/H = M
var/obj/item/organ/limb/affecting = H.get_organ("chest")
var/obj/item/organ/limb/affecting = H.get_organ(user.zone_sel.selecting)
if(affecting.status == ORGAN_ORGANIC) //Limb must be organic to be healed - RR
@@ -63,9 +63,8 @@
if(!istype(affecting, /obj/item/organ/limb) || affecting:burn_dam <= 0)
affecting = H.get_organ("head")
if(affecting.status == ORGAN_ORGANIC) // Just in case a robotic limb SOMEHOW got down to this point of the proc all you get is a message - RR
if (affecting.heal_damage(src.heal_brute, src.heal_burn))
if (affecting.heal_damage(src.heal_brute, src.heal_burn, 0))
H.update_damage_overlays(0)
M.updatehealth()
code/game/objects/items/weapons/storage/bible.dm
+1 -1
View File
@@ -28,7 +28,7 @@
var/heal_amt = 10
for(var/obj/item/organ/limb/affecting in H.organs)
if(affecting.status == ORGAN_ORGANIC) //No Bible can heal a robotic arm!
if(affecting.heal_damage(heal_amt, heal_amt))
if(affecting.heal_damage(heal_amt, heal_amt, 0))
H.update_damage_overlays(0)
return