From 52f656da01833c54d7d509517662f152ab6cb912 Mon Sep 17 00:00:00 2001 From: Matt Atlas Date: Mon, 11 Jul 2022 13:59:32 +0200 Subject: [PATCH] Fixes duffel bag icons and master compile. (#14418) --- .../objects/items/weapons/storage/backpack.dm | 4 +- html/changelogs/mattatlas-ffs.yml | 41 ++++++++++++++++++ icons/obj/storage/duffelbag.dmi | Bin 7591 -> 7586 bytes .../generic/civilian_station_ghostroles.dm | 2 +- maps/away/ships/wildcard_ship_ghostroles.dm | 2 +- 5 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/mattatlas-ffs.yml diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm index ba784805422..d86917acdeb 100644 --- a/code/game/objects/items/weapons/storage/backpack.dm +++ b/code/game/objects/items/weapons/storage/backpack.dm @@ -301,8 +301,8 @@ /obj/item/storage/backpack/duffel/tox name = "scientist's duffel bag" desc = "Handy when it comes to storing volatile materials of the anomalous persuasion." - icon_state = "duffel-toxins" - item_state = "duffel-toxins" + icon_state = "duffel-tox" + item_state = "duffel-tox" /obj/item/storage/backpack/duffel/sec name = "security duffel bag" diff --git a/html/changelogs/mattatlas-ffs.yml b/html/changelogs/mattatlas-ffs.yml new file mode 100644 index 00000000000..67293184a86 --- /dev/null +++ b/html/changelogs/mattatlas-ffs.yml @@ -0,0 +1,41 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: MattAtlas + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes duffel bag icons. Again." diff --git a/icons/obj/storage/duffelbag.dmi b/icons/obj/storage/duffelbag.dmi index f00c356eeb4d705d8803a403fa771d6d07245654..e10d4ef571f7e9425bbe0312823fef1ff6d05001 100644 GIT binary patch delta 313 zcmV-90mlBPJEA+VhXH>fdQ@0+L}hbha%pgMX>V=-0C=30m9b94Fc3iJ_$#b-20`1E z1+_vQ=r15QzQiXbc4fOj{=QC~5Dy^kHamJxx_42OwR}Ci9Zz!qeiWbJ13D{TFKkm8n1tP$mieKkF#3v-T$~Z zEW9J*U|X~R9&JmVzfc$%rA4nPEqYWB8f(>2gC?92GaK}f*`P<%26_z957dkwff2Ge z^pwS+$3*u{%}6LCV5I4zk2K>As7q96$@|YZXZw@E*!^VCBg~+^yEuz=poSC*Bc`V=w@s LacXt5wgT}Q@aU7k delta 318 zcmV-E0m1&FJEuFahXH>kdQ@0+L}hbha%pgMX>V=-0C=30mCbI#Fc1dM@l#lErYbGh zUMdjcP+kGK@g`m=StHxf=I!hJw8^2Zc5exqk-mwQu-31KwEGz~Xk!Uf~AAsFA&{PCrO7Gnw>cm9tc z2$&sy#_aH8lK