Merge pull request #3077 from Citadel-Station-13/upstream-merge-31192

[MIRROR] ismecha define
This commit is contained in:
LetterJay
2017-10-02 21:11:59 -04:00
committed by GitHub
30 changed files with 1166 additions and 1172 deletions
+1 -1
View File
@@ -96,7 +96,7 @@
if(!modifiers["catcher"] && A.IsObscured())
return
if(istype(loc, /obj/mecha))
if(ismecha(loc))
var/obj/mecha/M = loc
return M.click_action(A,src,params)
+1 -1
View File
@@ -28,7 +28,7 @@
icon_state = "act_equip"
/obj/screen/human/equip/Click()
if(istype(usr.loc, /obj/mecha)) // stops inventory actions in a mech
if(ismecha(usr.loc)) // stops inventory actions in a mech
return 1
var/mob/living/carbon/human/H = usr
H.quick_equip()
File diff suppressed because it is too large Load Diff