Merge pull request #3255 from VOREStation/aro-robocheck

Fix incorrect robolimb checks
This commit is contained in:
Aronai Sieyes
2018-03-16 20:34:10 -04:00
committed by GitHub
7 changed files with 13 additions and 10 deletions
+1 -1
View File
@@ -343,7 +343,7 @@
new /obj/item/weapon/farmbot_arm_assembly(loc, src)
/obj/structure/reagent_dispensers/watertank/attackby(var/obj/item/organ/external/S, mob/user as mob)
if ((!istype(S, /obj/item/organ/external/arm)) || (!S.robotic == ORGAN_ROBOT))
if ((!istype(S, /obj/item/organ/external/arm)) || S.robotic != ORGAN_ROBOT)
..()
return
+1 -1
View File
@@ -333,7 +333,7 @@
qdel(src)
/obj/item/weapon/storage/firstaid/attackby(var/obj/item/organ/external/S, mob/user as mob)
if (!istype(S, /obj/item/organ/external/arm) || !(S.robotic == ORGAN_ROBOT))
if (!istype(S, /obj/item/organ/external/arm) || S.robotic != ORGAN_ROBOT)
..()
return