cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-19 20:06:28 +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 17:06:40 +02: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/game/objects/items/weapons/material/ashtray.dm
+4
View File
@@ -134,6 +134,10 @@
update_icon()
return ..()
/obj/item/material/ashtray/mechanics_hints(mob/user, distance, is_adjacent)
. += ..()
. += "Use help intent to empty into a disposal. Use harm intent to put into a disposal."
/obj/item/material/ashtray/plastic/Initialize(newloc, material_key)
. = ..(newloc, MATERIAL_PLASTIC)
code/modules/clothing/wrists/watches.dm
+2 -2
View File
@@ -96,8 +96,8 @@
if(wired && screwed)
to_chat(usr, SPAN_NOTICE("You check your watch, spotting a digital collection of numbers reading '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [GLOB.game_year]'."))
if (GLOB.evacuation_controller.get_status_panel_eta())
to_chat(usr, SPAN_WARNING("Time until Bluespace Jump: [GLOB.evacuation_controller.get_status_panel_eta()]."))
if(GLOB.evacuation_controller.get_status_panel_eta())
to_chat(usr, SPAN_WARNING("Time until shift end: [GLOB.evacuation_controller.get_status_panel_eta()]."))
else if(wired && !screwed)
to_chat(usr, SPAN_NOTICE("You check your watch, realising it's still open."))
else
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()
/**
html/changelogs/SleepyGemmy-fixes.yml
+9
View File
@@ -0,0 +1,9 @@
author: SleepyGemmy
delete-after: True
changes:
- bugfix: "Fixed watches referring to bluespace transfer during the round end timer."
- bugfix: "Fixed ashtrays not having a examine hint about emptying vs putting it into a disposal."
- bugfix: "Fixed ashtrays not giving a feedback message when trying to empty a empty one."
- bugfix: "Fixed a duplicate \"the\" when putting something inside a disposal."