cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-26 22:42:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ashtray Emptying + Tweaks (#10798)

Browse Source
This commit is contained in:
MarinaGryphon
2020-12-17 14:07:14 +01:00
committed by GitHub
parent 7d84318e14
commit aaa067e237
3 changed files with 78 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal.dm
+6
View File
@@ -163,6 +163,12 @@
update()
return
else if (istype (I, /obj/item/material/ashtray) && user.a_intent != I_HURT)
var/obj/item/material/ashtray/A = I
if(A.emptyout(get_turf(src)))
user.visible_message("<b>[user]</b> pours [I] out into [src].", SPAN_NOTICE("You pour [I] out into [src]."))
return
else if (istype (I, /obj/item/device/lightreplacer))
var/count = 0
var/obj/item/device/lightreplacer/R = I