Resolved merge conflicts... I hope.

This commit is contained in:
Purpose
2018-10-06 16:01:34 +01:00
184 changed files with 18696 additions and 6969 deletions
-2
View File
@@ -86,8 +86,6 @@
if(target_zone == surgery.location)
initiate(user, target, target_zone, tool, surgery)
return 1//returns 1 so we don't stab the guy in the dick or wherever.
if(isrobot(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
return 1
return 0
/datum/surgery_step/proc/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)