From a4ce195bf328625fcee86a532f1e7749564e99d4 Mon Sep 17 00:00:00 2001 From: hazelrat <83198434+hazelrat@users.noreply.github.com> Date: Fri, 28 Mar 2025 23:23:44 +0000 Subject: [PATCH] Nanopaste bugfix (#20669) Shifts nanopaste to use contained sprites, resolves a bug in live in which nanopaste inhands disappeared if you used any of it to repair anything. --- code/game/objects/items/stacks/nanopaste.dm | 7 +-- html/changelogs/hazelmouse-nanopastefix.yml | 59 ++++++++++++++++++ icons/mob/items/stacks/lefthand_nanopaste.dmi | Bin 499 -> 0 bytes .../mob/items/stacks/righthand_nanopaste.dmi | Bin 520 -> 0 bytes icons/obj/item/stacks/nanopaste.dmi | Bin 673 -> 2318 bytes 5 files changed, 62 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/hazelmouse-nanopastefix.yml delete mode 100644 icons/mob/items/stacks/lefthand_nanopaste.dmi delete mode 100644 icons/mob/items/stacks/righthand_nanopaste.dmi diff --git a/code/game/objects/items/stacks/nanopaste.dm b/code/game/objects/items/stacks/nanopaste.dm index 78f11baa352..c1a2bf0f473 100644 --- a/code/game/objects/items/stacks/nanopaste.dm +++ b/code/game/objects/items/stacks/nanopaste.dm @@ -3,11 +3,9 @@ singular_name = "nanite swarm" desc = "A tube of paste containing swarms of repair nanites. Very effective in repairing robotic machinery." icon = 'icons/obj/item/stacks/nanopaste.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/stacks/lefthand_nanopaste.dmi', - slot_r_hand_str = 'icons/mob/items/stacks/righthand_nanopaste.dmi', - ) icon_state = "tube" + item_state = "tube" + contained_sprite = TRUE origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 3) amount = 10 surgerysound = 'sound/items/surgery/bonegel.ogg' @@ -82,6 +80,7 @@ singular_name = "nanite swarm" desc = "A tube of paste containing swarms of repair nanites. This one appears to contain different nanites." icon_state = "tube-surge" + item_state = "tube-surge" origin_tech = list(TECH_MATERIAL = 4, TECH_ENGINEERING = 4, TECH_MAGNET = 5, TECH_POWER = 5, TECH_COMBAT = 3, TECH_ILLEGAL = 4) amount = 20 var/used = FALSE diff --git a/html/changelogs/hazelmouse-nanopastefix.yml b/html/changelogs/hazelmouse-nanopastefix.yml new file mode 100644 index 00000000000..e1bbc34a080 --- /dev/null +++ b/html/changelogs/hazelmouse-nanopastefix.yml @@ -0,0 +1,59 @@ +################################ +# 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: hazelmouse + +# 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: "Nanopaste no longer becomes invisible on character sprites after being partially used." + - refactor: "Nanopaste now uses contained sprites." diff --git a/icons/mob/items/stacks/lefthand_nanopaste.dmi b/icons/mob/items/stacks/lefthand_nanopaste.dmi deleted file mode 100644 index 50ee391f4175f426ed7132e4b51c5e7823dd841d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 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 literal 673 zcmV;S0$%-zP)YVm^fud#3?f*PFZShK}jWXN{dU2(uwpjSShjohA1Y| z_YlQIh5|j633wnFw7B|$J#V

2`-2u z_V&(u?_zw6^UE|p*7a&dZ~y#?*ePxwYaHXB3#K`4oA3ds->u-=gw9=GLfoe$_;v#4 z9pHB>`#Qk2Zzrg~6u_qh_}2-qA6D&zqOT|Xy?@=qejBI*m=t!KgiDk{NPY5A|5Iw(Z<8En5JCtc{~a{nYhK+S%=c>k*I+-uegMn&)t?3E7vOx4_6v9N{aLX7K=gO=J=!0r z?+?`U3iSh!e@8z6zdz9R@A*6L4~!k4`}+ax2iOk~@+bKOwt6R~87ZcT00000NkvXX Hu0mjfkUBA7