Reverts the second mob clean up because of incomplete implementation.

This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
This commit is contained in:
Datraen
2016-05-04 00:24:55 -04:00
parent fbcf5bd530
commit beda3185eb
152 changed files with 458 additions and 303 deletions
+7 -5
View File
@@ -34,7 +34,7 @@
// merging bundles
else if(istype(W, /obj/item/weapon/paper_bundle))
user.removeItem(W)
user.drop_from_inventory(W)
for(var/obj/O in W)
O.loc = src
O.add_fingerprint(usr)
@@ -61,7 +61,8 @@
else if(istype(sheet, /obj/item/weapon/photo))
user << "<span class='notice'>You add [(sheet.name == "photo") ? "the photo" : sheet.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].</span>"
user.removeItem(sheet, src)
user.drop_from_inventory(sheet)
sheet.loc = src
pages.Insert(index, sheet)
@@ -84,7 +85,7 @@
"<span class='[class]'>You burn right through \the [src], turning it to ash. It flutters through the air before settling on the floor in a heap.</span>")
if(user.get_inactive_hand() == src)
user.removeItem(src)
user.drop_from_inventory(src)
new /obj/effect/decal/cleanable/ash(src.loc)
qdel(src)
@@ -167,7 +168,7 @@
if(pages.len <= 1)
var/obj/item/weapon/paper/P = src[1]
usr.removeItem(src)
usr.drop_from_inventory(src)
usr.put_in_hands(P)
qdel(src)
@@ -205,7 +206,8 @@
O.loc = usr.loc
O.layer = initial(O.layer)
O.add_fingerprint(usr)
usr.deleteItem(src)
usr.drop_from_inventory(src)
qdel(src)
return