Refactors robolimb emagging, fixes emag resolve_attackby not passing emag_source

This commit is contained in:
mwerezak
2015-09-09 02:58:07 -04:00
parent 080e365911
commit 43a7ca9271
2 changed files with 10 additions and 15 deletions
@@ -251,22 +251,17 @@ emp_act
return 1
return 0
//*** TODO
/* TODO Reimplement pending cleanup
if(istype(I,/obj/item/weapon/card/emag))
if(!(affecting.status & ORGAN_ROBOT))
user << "\red That limb isn't robotic."
return
/mob/living/carbon/human/emag_act(var/remaining_charges, mob/user, var/emag_source)
var/obj/item/organ/external/affecting = get_organ(user.zone_sel.selecting)
if(!affecting || !(affecting.status & ORGAN_ROBOT))
user << "<span class='warning'>That limb isn't robotic.</span>"
return -1
if(affecting.sabotaged)
user << "\red [src]'s [affecting.name] is already sabotaged!"
else
user << "\red You sneakily slide [I] into the dataport on [src]'s [affecting.name] and short out the safeties."
var/obj/item/weapon/card/emag/emag = I
emag.uses--
affecting.sabotaged = 1
user << "<span class='warning'>[src]'s [affecting.name] is already sabotaged!</span>"
return -1
user << "<span class='notice'>You sneakily slide [emag_source] into the dataport on [src]'s [affecting.name] and short out the safeties.</span>"
affecting.sabotaged = 1
return 1
*/
//this proc handles being hit by a thrown atom
/mob/living/carbon/human/hitby(atom/movable/AM as mob|obj,var/speed = THROWFORCE_SPEED_DIVISOR)