Mob inventory cleanup

Replaces three item removal procs with one
Adds a proc to delete an item on the mob
This commit is contained in:
Kelenius
2016-03-24 01:23:08 +03:00
parent 463eb3a4b6
commit df5a0d7941
152 changed files with 296 additions and 423 deletions

View File

@@ -27,7 +27,7 @@
if(istype(W, /obj/item/organ/external))
continue
//don't strip organs
H.drop_from_inventory(W)
H.removeItem(W)
//teleport person to cell
H.loc = pick(prisonwarp)
H.equip_to_slot_or_del(new /obj/item/clothing/under/color/orange(H), slot_w_uniform)

View File

@@ -973,7 +973,7 @@
//strip their stuff and stick it in the crate
for(var/obj/item/I in M)
M.drop_from_inventory(I, locker)
M.removeItem(I, locker)
M.update_icons()
//so they black out before warping
@@ -1006,7 +1006,7 @@
return
for(var/obj/item/I in M)
M.drop_from_inventory(I)
M.removeItem(I, force = 1)
M.Paralyse(5)
sleep(5)
@@ -1031,7 +1031,7 @@
return
for(var/obj/item/I in M)
M.drop_from_inventory(I)
M.removeItem(I, force = 1)
M.Paralyse(5)
sleep(5)
@@ -1078,7 +1078,7 @@
return
for(var/obj/item/I in M)
M.drop_from_inventory(I)
M.removeItem(I, force = 1)
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/observer = M

View File

@@ -426,7 +426,7 @@
for (var/obj/item/I in M)
if (istype(I, /obj/item/weapon/implant))
continue
M.drop_from_inventory(I)
M.removeItem(I)
if(I.loc != M)
qdel(I)
switch(dresscode)

View File

@@ -10,7 +10,7 @@
return
for(var/obj/item/W in M)
M.drop_from_inventory(W)
M.removeItem(W, force = 1)
log_admin("[key_name(usr)] made [key_name(M)] drop everything!")
message_admins("[key_name_admin(usr)] made [key_name_admin(M)] drop everything!", 1)
@@ -28,7 +28,7 @@
return
//strip their stuff before they teleport into a cell :downs:
for(var/obj/item/W in M)
M.drop_from_inventory(W)
M.removeItem(W, force = 1)
//teleport person to cell
M.Paralyse(5)
sleep(5) //so they black out before warping