mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-14 00:23:29 +01:00
Robots can no longer stick their items onto/into things.
It's possible I missed some things, but I got lockers, crates, backpacks/boxes/toolboxes/etc, tables, and racks. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1358 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -160,6 +160,9 @@
|
||||
del(src)
|
||||
return
|
||||
|
||||
if(isrobot(user))
|
||||
return
|
||||
|
||||
usr.drop_item()
|
||||
|
||||
if (W)
|
||||
@@ -189,6 +192,8 @@
|
||||
return
|
||||
if(istype(O, /obj/secure_closet) || istype(O, /obj/closet))
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
step_towards(O, src.loc)
|
||||
user.show_viewers(text("\red [] stuffs [] into []!", user, O, src))
|
||||
src.add_fingerprint(user)
|
||||
|
||||
@@ -272,6 +272,8 @@
|
||||
src.loc = P
|
||||
O.amount -= 3
|
||||
else if(opened)
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(W)
|
||||
W.loc = src.loc
|
||||
|
||||
@@ -81,6 +81,8 @@
|
||||
|
||||
/obj/item/weapon/storage/attackby(obj/item/weapon/W as obj, mob/user as mob)
|
||||
..()
|
||||
if(isrobot(user))
|
||||
return
|
||||
if(can_hold.len)
|
||||
var/ok = 0
|
||||
for(var/A in can_hold)
|
||||
|
||||
@@ -90,6 +90,8 @@
|
||||
|
||||
if ((!( istype(O, /obj/item/weapon) ) || user.equipped() != O))
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if (O.loc != src.loc)
|
||||
step(O, get_dir(O, src))
|
||||
@@ -119,6 +121,10 @@
|
||||
//SN src = null
|
||||
del(src)
|
||||
return
|
||||
|
||||
if(isrobot(user))
|
||||
return
|
||||
|
||||
user.drop_item()
|
||||
if(W && W.loc) W.loc = src.loc
|
||||
return
|
||||
@@ -127,6 +133,9 @@
|
||||
|
||||
if (istype(W, /obj/item/weapon/grab))
|
||||
var/obj/item/weapon/grab/G = W
|
||||
if(G.state<2)
|
||||
user << "\red You need a better grip to do that!"
|
||||
return
|
||||
G.affecting.loc = src.loc
|
||||
G.affecting.weakened = 5
|
||||
for(var/mob/O in viewers(world.view, src))
|
||||
@@ -150,6 +159,8 @@
|
||||
user << "\blue Table strengthened"
|
||||
src.status = 2
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(W && W.loc) W.loc = src.loc
|
||||
return
|
||||
@@ -163,6 +174,8 @@
|
||||
playsound(src.loc, 'Deconstruct.ogg', 50, 1)
|
||||
del(src)
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(W && W.loc) W.loc = src.loc
|
||||
return
|
||||
@@ -203,6 +216,8 @@
|
||||
/obj/rack/MouseDrop_T(obj/O as obj, mob/user as mob)
|
||||
if ((!( istype(O, /obj/item/weapon) ) || user.equipped() != O))
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if (O.loc != src.loc)
|
||||
step(O, get_dir(O, src))
|
||||
@@ -215,6 +230,8 @@
|
||||
//SN src = null
|
||||
del(src)
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(W && W.loc) W.loc = src.loc
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user