Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
icon = 'icons/obj/storage.dmi'
|
||||
icon_state = "evidenceobj"
|
||||
item_state = ""
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
w_class = 1
|
||||
|
||||
/obj/item/weapon/evidencebag/afterattack(obj/item/I, mob/user,proximity)
|
||||
if(!proximity || loc == I)
|
||||
@@ -25,7 +25,7 @@
|
||||
user << "<span class='notice'>You find putting an evidence bag in another evidence bag to be slightly absurd.</span>"
|
||||
return 1 //now this is podracing
|
||||
|
||||
if(I.w_class > WEIGHT_CLASS_NORMAL)
|
||||
if(I.w_class > 3)
|
||||
user << "<span class='notice'>[I] won't fit in [src].</span>"
|
||||
return
|
||||
|
||||
@@ -37,8 +37,10 @@
|
||||
if(istype(I.loc,/obj/item/weapon/storage)) //in a container.
|
||||
var/obj/item/weapon/storage/U = I.loc
|
||||
U.remove_from_storage(I, src)
|
||||
if(user.is_holding(I))
|
||||
user.unEquip(I)
|
||||
else if(user.l_hand == I) //in a hand
|
||||
user.drop_l_hand()
|
||||
else if(user.r_hand == I) //in a hand
|
||||
user.drop_r_hand()
|
||||
else
|
||||
return
|
||||
|
||||
@@ -69,7 +71,7 @@
|
||||
"<span class='italics'>You hear someone rustle around in a plastic bag, and remove something.</span>")
|
||||
cut_overlays() //remove the overlays
|
||||
user.put_in_hands(I)
|
||||
w_class = WEIGHT_CLASS_TINY
|
||||
w_class = 1
|
||||
icon_state = "evidenceobj"
|
||||
desc = "An empty evidence bag."
|
||||
|
||||
@@ -90,4 +92,4 @@
|
||||
new /obj/item/weapon/evidencebag(src)
|
||||
new /obj/item/weapon/evidencebag(src)
|
||||
..()
|
||||
return
|
||||
return
|
||||
Reference in New Issue
Block a user