diff --git a/code/game/objects/items/devices/lighting/flashlight.dm b/code/game/objects/items/devices/lighting/flashlight.dm
index b694c1d600a..8c9f14927aa 100644
--- a/code/game/objects/items/devices/lighting/flashlight.dm
+++ b/code/game/objects/items/devices/lighting/flashlight.dm
@@ -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
diff --git a/code/game/objects/items/weapons/RFD.dm b/code/game/objects/items/weapons/RFD.dm
index 87ef208beb4..b5074616bb3 100644
--- a/code/game/objects/items/weapons/RFD.dm
+++ b/code/game/objects/items/weapons/RFD.dm
@@ -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
diff --git a/code/game/objects/items/weapons/chaplain_items.dm b/code/game/objects/items/weapons/chaplain_items.dm
index b3c48e14dbb..d9bd8dcf85a 100644
--- a/code/game/objects/items/weapons/chaplain_items.dm
+++ b/code/game/objects/items/weapons/chaplain_items.dm
@@ -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
diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
index afea43ec338..a11142aebfd 100644
--- a/code/modules/clothing/head/helmet.dm
+++ b/code/modules/clothing/head/helmet.dm
@@ -2,10 +2,7 @@
name = "helmet"
desc = "Standard Security gear. Protects the head from impacts."
icon_state = "helmet"
- item_state_slots = list(
- slot_l_hand_str = "helmet",
- slot_r_hand_str = "helmet"
- )
+ item_state = "helmet"
item_flags = ITEM_FLAG_THICK_MATERIAL
armor = list(
melee = ARMOR_MELEE_KEVLAR,
@@ -417,10 +414,7 @@
name = "emergency response team helmet"
desc = "An in-atmosphere helmet worn by members of the Emergency Response Team. Protects the head from impacts."
icon_state = "erthelmet_cmd"
- item_state_slots = list(
- slot_l_hand_str = "syndicate-helm-green",
- slot_r_hand_str = "syndicate-helm-green"
- )
+ item_state = "erthelmet_cmd"
armor = list(
melee = ARMOR_MELEE_MAJOR,
bullet = ARMOR_BALLISTIC_RIFLE,
diff --git a/code/modules/clothing/head/pilot_helmet.dm b/code/modules/clothing/head/pilot_helmet.dm
index e12ecfdd104..c0bbd165593 100644
--- a/code/modules/clothing/head/pilot_helmet.dm
+++ b/code/modules/clothing/head/pilot_helmet.dm
@@ -16,12 +16,6 @@
)
siemens_coefficient = 0.35
action_button_name = "Toggle Visor"
-
- sprite_sheets = list(
- BODYTYPE_TAJARA = 'icons/mob/species/tajaran/helmet.dmi',
- BODYTYPE_UNATHI = 'icons/mob/species/unathi/helmet.dmi'
- )
-
var/visor_toggled = FALSE
var/obj/machinery/computer/shuttle_control/linked_console
var/obj/machinery/computer/ship/helm/linked_helm
diff --git a/code/modules/clothing/head/winter_hats.dm b/code/modules/clothing/head/winter_hats.dm
index 5bda46acc5a..d4e57b8a509 100644
--- a/code/modules/clothing/head/winter_hats.dm
+++ b/code/modules/clothing/head/winter_hats.dm
@@ -27,6 +27,7 @@
else
src.icon_state = initial(icon_state)
to_chat(user, "You lower the ear flaps on the ushanka.")
+ item_state = icon_state
update_icon()
update_clothing_icon()
diff --git a/code/modules/cooking/machinery/cooking_machines/_appliance.dm b/code/modules/cooking/machinery/cooking_machines/_appliance.dm
index 249a4486ce6..b3d7e7c6d69 100644
--- a/code/modules/cooking/machinery/cooking_machines/_appliance.dm
+++ b/code/modules/cooking/machinery/cooking_machines/_appliance.dm
@@ -91,21 +91,21 @@
return null
if (!CI.cookwork)
- return "It is cold."
+ return "it is cold."
var/progress = CI.cookwork / CI.max_cookwork
var/half_overcook = (CI.overcook_mult - 1)*0.5
switch(progress)
if (0 to 0.25)
- return "It's barely started cooking."
+ return "it's barely started cooking."
if (0.25 to 0.75)
- return SPAN_NOTICE("It's cooking away nicely.")
+ return SPAN_NOTICE("it's cooking away nicely.")
if (0.75 to 1)
- return SPAN_NOTICE("It's almost ready!")
+ return SPAN_NOTICE("it's almost ready!")
if (progress < 1+half_overcook)
- return SPAN_SOGHUN("It is done!")
+ return SPAN_SOGHUN("it is done!")
if (progress < CI.overcook_mult)
- return SPAN_WARNING("It looks overcooked, get it out!")
- return SPAN_DANGER("It is burning!")
+ return SPAN_WARNING("it looks overcooked, get it out!")
+ return SPAN_DANGER("it is burning!")
/obj/machinery/appliance/proc/get_cooking_item_from_container(var/obj/item/reagent_containers/cooking_container/CC)
for(var/C in cooking_objs)
@@ -465,7 +465,7 @@
//Filling overlay
var/image/I = image(result.icon, "[result.icon_state]_filling")
I.color = totalcolour
- result.overlays += I
+ result.AddOverlays(I)
result.filling_color = totalcolour
//Set the name.
diff --git a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
index 5858b3eb916..36d66c4aa11 100644
--- a/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
+++ b/code/modules/cooking/machinery/cooking_machines/_cooker_output.dm
@@ -64,6 +64,7 @@
var/matrix/M = matrix()
M.Scale(scale)
transform = M
+ . = ..()
if (!prefix || overwrite)
update_prefix()
@@ -105,13 +106,6 @@
w_class = WEIGHT_CLASS_SMALL
size = 8
-/obj/item/reagent_containers/food/snacks/variable/cakeslice/update_icon()
- . = ..()
- //Filling overlay
- var/image/I = image(icon, "[icon_state]_filling")
- I.color = filling_color
- overlays += I
-
/obj/item/reagent_containers/food/snacks/variable/pocket
name = "hot pocket"
desc = "You wanna put a bangin- oh, nevermind."
diff --git a/code/modules/games/gamehelm.dm b/code/modules/games/gamehelm.dm
index 0d43b87dcec..3f809818d74 100644
--- a/code/modules/games/gamehelm.dm
+++ b/code/modules/games/gamehelm.dm
@@ -154,7 +154,7 @@
case_color = "yellow"
/obj/item/gamehelm/turquoise
- case_color = "turqoise"
+ case_color = "turquoise"
/obj/item/gamehelm/weathered
case_color = "weathered"
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index 65341ae3765..a5b854d8ec4 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -378,7 +378,8 @@
B.title = title
B.author = author
B.dat = content
- B.icon_state = "book[rand(1,7)]"
+ B.icon_state = "book[rand(1,16)]"
+ B.item_state = B.icon_state
src.visible_message("\The [src]\s printer hums as it produces a book.")
break
if(href_list["orderbyid"])
diff --git a/html/changelogs/wezzy-moarCNYbugfixes.yml b/html/changelogs/wezzy-moarCNYbugfixes.yml
new file mode 100644
index 00000000000..2d212262741
--- /dev/null
+++ b/html/changelogs/wezzy-moarCNYbugfixes.yml
@@ -0,0 +1,68 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+# bugfix
+# - (fixes bugs)
+# wip
+# - (work in progress)
+# qol
+# - (quality of life)
+# soundadd
+# - (adds a sound)
+# sounddel
+# - (removes a sound)
+# rscadd
+# - (adds a feature)
+# rscdel
+# - (removes a feature)
+# imageadd
+# - (adds an image or sprite)
+# imagedel
+# - (removes an image or sprite)
+# spellcheck
+# - (fixes spelling or grammar)
+# experiment
+# - (experimental change)
+# balance
+# - (balance changes)
+# code_imp
+# - (misc internal code change)
+# refactor
+# - (refactors code)
+# config
+# - (makes a change to the config files)
+# admin
+# - (makes changes to administrator tools)
+# server
+# - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Wowzewow (Wezzy)
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit.
+# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - bugfix: "Fixes RFDs not initalizing with ammo overlay."
+ - bugfix: "Fixes variable foodstuffs not spawning with filling overlay."
+ - bugfix: "Fixes black pants color."
+ - bugfix: "Fixes softsuit helmet inhands."
+ - bugfix: "Fixes turquoise game helm."
+ - bugfix: "Fixes flight helmets for Tajarans and Unathi."
+ - bugfix: "Fixes large syringe fill states."
+ - bugfix: "Fixes Azubarre torch not extinguishing inhand."
+ - bugfix: "Fixes Visegradi Nyakas ear flaps not flapping while on-mob."
+ - bugfix: "Fixes Unathi Lore accessories."
+ - bugfix: "Fixes invisible glowing slime extracts."
diff --git a/icons/obj/item/clothing/pants/pants.dmi b/icons/obj/item/clothing/pants/pants.dmi
index 91f62561f36..75cef17addd 100644
Binary files a/icons/obj/item/clothing/pants/pants.dmi and b/icons/obj/item/clothing/pants/pants.dmi differ
diff --git a/icons/obj/item/reagent_containers/large_syringe.dmi b/icons/obj/item/reagent_containers/large_syringe.dmi
index e214b0e013a..b1fc4b5c859 100644
Binary files a/icons/obj/item/reagent_containers/large_syringe.dmi and b/icons/obj/item/reagent_containers/large_syringe.dmi differ
diff --git a/icons/obj/unathi_items.dmi b/icons/obj/unathi_items.dmi
index 24e62f14e3c..2543a3d1800 100644
Binary files a/icons/obj/unathi_items.dmi and b/icons/obj/unathi_items.dmi differ