[MIRROR] Icon folder cleaning wave one [MDB IGNORE] (#22374)

* Icon folder cleaning wave one

* Fixe a merge conflict

* Fixes some more merge conflicts

* Fixes some modular icon paths

* Fixes even more modular icon paths...

Hopefully that's the last of them

* Fixes some merge discrepencies

* More merge issues

* ok

* not ok

---------

Co-authored-by: YesterdaysPromise <122572637+YesterdaysPromise@users.noreply.github.com>
Co-authored-by: Giz <vinylspiders@gmail.com>
This commit is contained in:
SkyratBot
2023-07-13 16:24:33 -04:00
committed by GitHub
co-authored by YesterdaysPromise Giz
parent bc40d9d4b0
commit 2f5c7f8389
284 changed files with 317 additions and 297 deletions
+3 -2
View File
@@ -1,6 +1,6 @@
/obj/structure/displaycase
name = "display case"
icon = 'icons/obj/stationobjs.dmi'
icon = 'icons/obj/structures.dmi'
icon_state = "glassbox"
desc = "A display case for prized possessions."
density = TRUE
@@ -226,7 +226,7 @@
/obj/structure/displaycase_chassis
name = "display case chassis"
desc = "The wooden base of a display case."
icon = 'icons/obj/stationobjs.dmi'
icon = 'icons/obj/structures.dmi'
icon_state = "glassbox_chassis"
resistance_flags = FLAMMABLE
anchored = TRUE
@@ -440,6 +440,7 @@
/obj/structure/displaycase/forsale
name = "vend-a-tray"
icon = 'icons/obj/machines/basic_machines.dmi'
icon_state = "laserbox"
custom_glass_overlay = TRUE
desc = "A display case with an ID-card swiper. Use your ID to purchase the contents."