cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allows ashtrays to go in the trash.

Browse Source
This commit is contained in:
Anewbe
2016-11-15 19:12:19 -06:00
parent 8bba88cd66
commit 06fa3927a1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
code/modules/recycling/disposal.dm
View File

@@ -108,16 +108,13 @@
if(istype(I, /obj/item/weapon/material/ashtray)) if(istype(I, /obj/item/weapon/material/ashtray))
var/obj/item/weapon/material/ashtray/A = I var/obj/item/weapon/material/ashtray/A = I
if(A.contents.len == 0) if(A.contents.len > 0)
user.visible_message("<span class='notice'>\The [user] places \the [A.name] into [src].</span>")
I.forceMove(src)
else
user.visible_message("<span class='notice'>\The [user] empties \the [A.name] into [src].</span>") user.visible_message("<span class='notice'>\The [user] empties \the [A.name] into [src].</span>")
for(var/obj/item/O in A.contents) for(var/obj/item/O in A.contents)
O.forceMove(src) O.forceMove(src)
A.update_icon() A.update_icon()
update() update()
return return
var/obj/item/weapon/grab/G = I var/obj/item/weapon/grab/G = I
if(istype(G)) // handle grabbed mob if(istype(G)) // handle grabbed mob