Merge branch 'master' into logging-improvements

This commit is contained in:
farie82
2020-05-22 07:16:23 +02:00
committed by GitHub
319 changed files with 17089 additions and 15784 deletions
+1 -1
View File
@@ -58,7 +58,7 @@
else
return 1
var/obj/item/organ/external/O = M.get_organ(user.zone_selected)
if((is_sharp(src) || (isscrewdriver(src) && O.is_robotic())) && user.a_intent == INTENT_HELP)
if((is_sharp(src) || (isscrewdriver(src) && O?.is_robotic())) && user.a_intent == INTENT_HELP)
if(!attempt_initiate_surgery(src, M, user))
return FALSE
else