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

Fix Watches and Add Ashtrays Examine Hint (#22219)

Browse Source 
fixes watches referring to bluespace during the roundend timer, ashtrays
not having a examine hint about emptying vs putting it into a disposal,
and ashtrays not giving a feedback message when trying to empty a empty
one.

fixes #22209 and fixes #22215.
This commit is contained in:
SleepyGemmy
2026-04-15 15:06:40 +00:00
committed by GitHub
parent c50a2d9c69
commit d04d14532d
4 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/recycling/disposal.dm
+6 -4
View File
@@ -210,10 +210,12 @@
update()
return TRUE
else if (istype (attacking_item, /obj/item/material/ashtray) && user.a_intent != I_HURT)
else if(istype(attacking_item, /obj/item/material/ashtray) && user.a_intent != I_HURT) // If attacked with ashtray on harm intent.
var/obj/item/material/ashtray/A = attacking_item
if(A.emptyout(src))
user.visible_message("<b>[user]</b> pours [attacking_item] out into [src].", SPAN_NOTICE("You pour [attacking_item] out into [src]."))
if(A.emptyout(src)) // Ashtray has contents.
user.visible_message("<b>[user]</b> pours \the [attacking_item] out into \the [src].", SPAN_NOTICE("You pour \the [attacking_item] out into \the [src]."))
else // Ashtray has no contents.
to_chat(user, SPAN_NOTICE("\The [attacking_item] is empty."))
return TRUE
else if (istype (attacking_item, /obj/item/lightreplacer))
@@ -261,7 +263,7 @@
user.drop_from_inventory(attacking_item, src)
user.visible_message("<b>[user]</b> places \the [attacking_item] into \the [src].", SPAN_NOTICE("You place \the [attacking_item] into the [src]."), range = 3)
user.visible_message("<b>[user]</b> places \the [attacking_item] into \the [src].", SPAN_NOTICE("You place \the [attacking_item] into \the [src]."), range = 3)
update()
/**