New Mecha Stuff (#26316)

* New Mecha Stuff

* Turns out istypeinlist is bad

* barrycatches

* designs
This commit is contained in:
Kurfursten
2020-04-30 03:28:20 -05:00
committed by GitHub
parent 26063fd9f7
commit fef708fcae
12 changed files with 176 additions and 29 deletions

View File

@@ -158,7 +158,14 @@
if(usr.incapacitated())
return 1
if (istype(usr.loc,/obj/mecha)) // stops inventory actions in a mech
return 1
if(istype(master,/obj/item/weapon/storage)) //should always be true, but sanity
var/obj/item/weapon/storage/S = master
if(!S.distance_interact(usr))
return 1
//else... continue onward to master.attackby
else
//master isn't storage, exit
return 1
if(master)
var/obj/item/I = usr.get_active_hand()
if(I)