mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 20:15:47 +01:00
Merge pull request #3472 from Menshin/missing_nodrop
Nodrop checks for several machines/structures
This commit is contained in:
@@ -190,7 +190,9 @@ LINEN BINS
|
||||
user << "<span class='notice'>You put [I] in [src].</span>"
|
||||
update_icon()
|
||||
else if(amount && !hidden && I.w_class < 4) //make sure there's sheets to hide it among, make sure nothing else is hidden in there.
|
||||
user.drop_item()
|
||||
if(!user.drop_item())
|
||||
user << "<span class='notice'>\The [I] is stuck to your hand, you cannot hide it among the sheets!</span>"
|
||||
return
|
||||
I.loc = src
|
||||
hidden = I
|
||||
user << "<span class='notice'>You hide [I] among the sheets.</span>"
|
||||
|
||||
@@ -250,7 +250,6 @@
|
||||
|
||||
if(contents.len >= storage_capacity)
|
||||
return -1
|
||||
|
||||
if(include_mobs && isliving(AM))
|
||||
var/mob/living/L = AM
|
||||
if(L.buckled)
|
||||
@@ -325,7 +324,9 @@
|
||||
if(opened)
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(!user.drop_item()) //couldn't drop the item
|
||||
user << "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in \the [src]!</span>"
|
||||
return
|
||||
if(W)
|
||||
W.loc = src.loc
|
||||
else if(istype(W, /obj/item/weapon/packageWrap))
|
||||
|
||||
@@ -146,7 +146,9 @@ FLOOR SAFES
|
||||
if(open)
|
||||
if(I.w_class + space <= maxspace)
|
||||
space += I.w_class
|
||||
user.drop_item()
|
||||
if(!user.drop_item())
|
||||
user << "<span class='notice'>\The [I] is stuck to your hand, you cannot put it in the safe!</span>"
|
||||
return
|
||||
I.loc = src
|
||||
user << "<span class='notice'>You put [I] in [src].</span>"
|
||||
updateUsrDialog()
|
||||
|
||||
@@ -708,7 +708,9 @@ Destroy type values:
|
||||
return
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(!user.drop_item())
|
||||
user << "<span class='notice'>\The [O] is stuck to your hand, you cannot put it in the rack!</span>"
|
||||
return
|
||||
if (O.loc != src.loc)
|
||||
step(O, get_dir(O, src))
|
||||
return
|
||||
@@ -722,7 +724,9 @@ Destroy type values:
|
||||
|
||||
if(isrobot(user))
|
||||
return
|
||||
user.drop_item()
|
||||
if(!user.drop_item())
|
||||
user << "<span class='notice'>\The [W] is stuck to your hand, you cannot put it in the rack!</span>"
|
||||
return
|
||||
if(W && W.loc) W.loc = src.loc
|
||||
return 1
|
||||
|
||||
|
||||
@@ -89,7 +89,9 @@
|
||||
if(w_items + I.w_class > 5)
|
||||
user << "<span class='notice'>The cistern is full.</span>"
|
||||
return
|
||||
user.drop_item()
|
||||
if(!user.drop_item())
|
||||
user << "<span class='notice'>\The [I] is stuck to your hand, you cannot put it in the cistern!</span>"
|
||||
return
|
||||
I.loc = src
|
||||
w_items += I.w_class
|
||||
user << "<span class='notice'>You carefully place [I] into the cistern.</span>"
|
||||
|
||||
Reference in New Issue
Block a user