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 = "[icon2html(cross, src)] PRAY: [key_name(src, 1)] (?) (PP) (VV) (SM) ([admin_jump_link(src, src)]) (CA) (SC): [msg]" 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 9114fe6f7cb..00000000000 Binary files a/icons/obj/storage.dmi and /dev/null differ diff --git a/icons/obj/storage/misc.dmi b/icons/obj/storage/misc.dmi index 040953d16ea..65a39cf7731 100644 Binary files a/icons/obj/storage/misc.dmi and b/icons/obj/storage/misc.dmi differ