From e67a7188ccedd11668bca2d77ba1a7223ef0891e Mon Sep 17 00:00:00 2001
From: "Wowzewow (Wezzy)" <42310821+alsoandanswer@users.noreply.github.com>
Date: Tue, 19 Sep 2023 04:38:12 +0800
Subject: [PATCH] Wrapping paper fix (#17362)

* Wrapping paper fix

Fixes #17360

* almost forgor
---
 code/modules/admin/verbs/pray.dm           |   2 +-
 code/modules/recycling/sortingmachinery.dm |   8 ++--
 html/changelogs/wezzy_WrappingPaperFix.yml |  41 +++++++++++++++++++++
 icons/obj/storage.dmi                      | Bin 997 -> 0 bytes
 icons/obj/storage/misc.dmi                 | Bin 1877 -> 2712 bytes
 5 files changed, 46 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/wezzy_WrappingPaperFix.yml
 delete mode 100644 icons/obj/storage.dmi

diff --git a/code/modules/admin/verbs/pray.dm b/code/modules/admin/verbs/pray.dm
index 16cff0bd989..203a5c3f33e 100644
--- a/code/modules/admin/verbs/pray.dm
+++ b/code/modules/admin/verbs/pray.dm
@@ -12,7 +12,7 @@
 	if(client && client.handle_spam_prevention(msg,MUTE_PRAY))
 		return
 
-	var/image/cross = image('icons/obj/storage.dmi',"bible")
+	var/image/cross = image('icons/obj/library.dmi',"bible")
 	msg = "<span class='notice'>[icon2html(cross, src)] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) ([admin_jump_link(src, src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]</span>"
 
 	for(var/s in staff)
diff --git a/code/modules/recycling/sortingmachinery.dm b/code/modules/recycling/sortingmachinery.dm
index 08dc0e41f97..fa030072674 100755
--- a/code/modules/recycling/sortingmachinery.dm
+++ b/code/modules/recycling/sortingmachinery.dm
@@ -83,7 +83,7 @@
 /obj/structure/bigDelivery/update_icon()
 	cut_overlays()
 	if(nameset || examtext)
-		var/image/I = new/image('icons/obj/storage.dmi',"delivery_label")
+		var/image/I = new/image('icons/obj/storage/misc.dmi',"delivery_label")
 		if(icon_state == "deliverycloset")
 			I.pixel_x = 2
 			if(label_y == null)
@@ -96,7 +96,7 @@
 			I.pixel_y = -3
 		add_overlay(I)
 	if(src.sortTag)
-		var/image/I = new/image('icons/obj/storage.dmi',"delivery_tag")
+		var/image/I = new/image('icons/obj/storage/misc.dmi',"delivery_tag")
 		if(icon_state == "deliverycloset")
 			if(tag_x == null)
 				tag_x = rand(-2, 3)
@@ -207,12 +207,12 @@
 /obj/item/smallDelivery/update_icon()
 	cut_overlays()
 	if((nameset || examtext) && icon_state != "deliverycrate1")
-		var/image/I = new/image('icons/obj/storage.dmi',"delivery_label")
+		var/image/I = new/image('icons/obj/storage/misc.dmi',"delivery_label")
 		if(icon_state == "deliverycrate5")
 			I.pixel_y = -1
 		add_overlay(I)
 	if(src.sortTag)
-		var/image/I = new/image('icons/obj/storage.dmi',"delivery_tag")
+		var/image/I = new/image('icons/obj/storage/misc.dmi',"delivery_tag")
 		switch(icon_state)
 			if("deliverycrate1")
 				I.pixel_y = -5
diff --git a/html/changelogs/wezzy_WrappingPaperFix.yml b/html/changelogs/wezzy_WrappingPaperFix.yml
new file mode 100644
index 00000000000..d349c3466f7
--- /dev/null
+++ b/html/changelogs/wezzy_WrappingPaperFix.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: 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, 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 wrapping paper turning things invisible."
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
deleted file mode 100644
index 9114fe6f7cba250db987444747f08a08ac29c644..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 997
zcmV<B0~-8^P)<h;3K|Lk000e1NJLTq004jh003YJ0{{R3;-rdu0000pP)t-stE;QI
zc0{CTJd|EG#f)RVzP`}V(6MnrtE;R3|Cx4UWAM=c;^N|$mzUJk)O2)orlzJE-7oh5
z0004WQchC<K<3zH0001?dQ@0+L}hbha%pgMX>V=-0C=2JR&a84_w-Y6@%7{?OD!tS
z%+FJ>RWQ*r;NmRLOex6#a*U0*I5Sc+(=$pSoZ^zil2jm5DJ3;06R4*$xd<qr#KoDC
zSyT)ZH{{|>D@x2wg|IPI=j0csmJqKTWO#6HVonZeT1-h(ZbF)JW73oxk*3^`Xyx%a
ziAkx%hfI7)VmdCx$_lQ2F5q+k0E9oEW&|#9BLDybvq?ljRA_<ineBF@APj~l3F_&z
z-R=EfZGoTzn!t>roZ02=kIp#?dCZqaZ?|_5AVosB8~}|m5M+Pi<p5;7VK4iO{zrf$
z1lI$gNpyV<048cv1vwAEQlclZ;gSJ93pM~WAK#N6X_JwgjRhEnvjEbola1JO#_=ow
zk^z#PY5=GOL`KvaAe#dyFH7v>WM#`~a|Rg{^cnyZE7VNhzSRcd$q?i{FuMSi9%U~d
zf_=MHdQuetgTTAX00zk)C*+-087^vF1qA?b1SlM0`*V!!VptP^lmfWv10?`!9i>BT
zKUxev78ozC;sNkJkO4yYfy*HLj~0tn@G?Ng0}K$#0AWQ?2_TaLt^^<|!&MM!0MJqe
zQX|6n`jH#}R1N{nX}0ZiZgsFf*?q|u<0=U&gy3-(RXpIW^YY2HgUSE}p)>E(gtHM6
zP8+{r7&ZVeb;5$U0Xp{w0El<D0OL5G3Se)=)+(ohPlsgl8h67YfXhG%rLeLeJy0e}
zT5)>A+VR+fG;s#F4s`gjZO>f573gbm&sbAsI-ZyBTHMuju0U@9*C=T-4c<Py1Hj4i
ze;MG=^!o+?s1F3s0>GgNrL&Q=M-d>Lu+u>pyFi?8i}U|MfM|G==iB1^Uj%?$h{9as
z?JKiQY5p$)@CnLsp6uAZ0#KO$m-jsT0sPFQ&bNj6{}Cg#3d#Vp6EuL#^m|)kq(x|P
z(GdWB{=dyJQX{muNKL}S9x%>A=6RV1L&ZZCa)5#d^dxi}AndIIGW@DowGifW{h1&2
z;n`>C5Z*<jax=p4rdG2s&kg%NW$<_!I+6T}Av^yc7Cky~&Wq<M{a|qY2cfR6uCA`G
zuCDjc$KC$51o*t)@1HFJy8e9)tcCzz-@~7;rT|V&0sj7cHw9>&16^HRU2XIWC_5E&
T8M~@I00000NkvXXu0mjf?XbP!

diff --git a/icons/obj/storage/misc.dmi b/icons/obj/storage/misc.dmi
index 040953d16ea03e6766b4bbfee03589958ea2f7ed..65a39cf7731cc2e15a8925948b7c752024ecc357 100644
GIT binary patch
delta 2521
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

delta 1680
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
avcms|uz&0KHzo@J0000<MNUMnLSTX`Gb*(J