Fixes bugs

- Tables can't have NODROP or ABSTRACT items placed on them anymore,
same for lockers and crates.
- Fixes a runtime with trying to strip a NODROP or ABSTRACT item.
This commit is contained in:
DZD
2015-02-19 19:32:58 -05:00
parent a299793ab8
commit c11bb0d283
8 changed files with 28 additions and 16 deletions
@@ -261,7 +261,8 @@
return
if(isrobot(user))
return
usr.drop_item()
if(!usr.drop_item())
return
if(W)
W.loc = src.loc
else if(istype(W, /obj/item/weapon/packageWrap))
@@ -133,7 +133,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))
+9 -5
View File
@@ -421,7 +421,9 @@
O.show_message("\blue The [src] was sliced apart by [user]!", 1, "\red You hear [src] coming apart.", 2)
destroy()
user.drop_item(src)
if(!(W.flags & ABSTRACT))
if(user.drop_item())
W.Move(loc)
return
/obj/structure/table/proc/straight_table_check(var/direction)
@@ -584,7 +586,9 @@
del(src)
return
user.drop_item(src)
if(!(I.flags & ABSTRACT))
if(user.drop_item())
I.Move(loc)
//if(W && W.loc) W.loc = src.loc
return 1
@@ -636,7 +640,9 @@
del(src)
return
user.drop_item(src)
if(!(W.flags & ABSTRACT))
if(user.drop_item())
W.Move(loc)
return 1
@@ -755,8 +761,6 @@
if(!(W.flags & ABSTRACT))
if(user.drop_item())
W.Move(loc)
if(W && W.loc)
W.loc = src.loc
return
/obj/structure/rack/meteorhit(obj/O as obj)