CNY Bugfixes (#20433)

Fixes #20421
Fixes #18097
Fixes #19989
Fixes #19950
Fixes #18933
Fixes #18060
Fixes #17723
Fixes #17497
Fixes #17113
Fixes #14905
Fixes #20202
Fixes #20439

---------

Signed-off-by: Wowzewow (Wezzy) <42310821+alsoandanswer@users.noreply.github.com>
Co-authored-by: hazelrat <83198434+hazelrat@users.noreply.github.com>
This commit is contained in:
Wowzewow (Wezzy)
2025-02-03 07:35:28 +00:00
committed by GitHub
co-authored by hazelrat
parent a13f33a6e3
commit 6166877f67
14 changed files with 93 additions and 38 deletions
@@ -364,9 +364,9 @@
name = "glowing slime extract"
desc = "A glowing ball of what appears to be amber."
desc_info = null
icon = 'icons/obj/lighting.dmi'
icon_state = "floor1" //not a slime extract sprite but... something close enough!
item_state = "slime"
icon = 'icons/mob/npc/slimes.dmi'
icon_state = "yellow slime extract"
item_state = "flashlight"
w_class = WEIGHT_CLASS_TINY
brightness_on = 6
uv_intensity = 200
+6 -2
View File
@@ -59,6 +59,10 @@ ABSTRACT_TYPE(/obj/item/rfd)
var/last_fail = 0
/obj/item/rfd/Initialize()
. = ..()
return INITIALIZE_HINT_LATELOAD
/obj/item/rfd/LateInitialize()
. = ..()
update_icon()
@@ -140,13 +144,13 @@ ABSTRACT_TYPE(/obj/item/rfd)
return TRUE
/obj/item/rfd/update_icon() // For the fancy "ammo" counter.
overlays.Cut()
CutOverlays()
var/ratio = 0
ratio = stored_matter / 30 //30 is the hardcoded max capacity of the RFD
ratio = max(round(ratio, 0.10) * 100, 10)
overlays += "[icon_state]-[ratio]"
AddOverlays("[icon_state]-[ratio]")
/**
* # RFD Compressed Matter Cartridge
@@ -139,12 +139,11 @@
/obj/item/nullrod/azubarre/update_icon()
if(lit)
icon_state = "azubarre_torch-on"
item_state = "azubarre_torch-on"
set_light(3, 1, LIGHT_COLOR_FIRE)
else
icon_state = "azubarre_torch-empty"
icon_state = "azubarre_torch-empty"
set_light(0)
item_state = icon_state
/obj/item/nullrod/azubarre/isFlameSource()
return lit