Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter

2025-12-10 01:49:19 +00:00 · 2023-01-28 01:20:26 -03:00
parent a56247f828 2d5e163916
commit 44913d5fff
171 changed files with 863 additions and 7090 deletions
--- a/icons/effects/96x32.dmi
+++ b/icons/effects/96x32.dmi
--- a/icons/mob/actions/actions_mod.dmi
+++ b/icons/mob/actions/actions_mod.dmi
--- a/icons/mob/clothing/head.dmi
+++ b/icons/mob/clothing/head.dmi
--- a/icons/mob/clothing/modsuit/mod_clothing.dmi
+++ b/icons/mob/clothing/modsuit/mod_clothing.dmi
--- a/icons/mob/clothing/modsuit/mod_clothing_anthro.dmi
+++ b/icons/mob/clothing/modsuit/mod_clothing_anthro.dmi
--- a/icons/mob/clothing/modsuit/mod_modules.dmi
+++ b/icons/mob/clothing/modsuit/mod_modules.dmi
--- a/icons/obj/clothing/hats.dmi
+++ b/icons/obj/clothing/hats.dmi
--- a/icons/obj/clothing/modsuit/mod_clothing.dmi
+++ b/icons/obj/clothing/modsuit/mod_clothing.dmi
--- a/icons/obj/clothing/modsuit/mod_construction.dmi
+++ b/icons/obj/clothing/modsuit/mod_construction.dmi
--- a/icons/obj/clothing/modsuit/mod_modules.dmi
+++ b/icons/obj/clothing/modsuit/mod_modules.dmi
--- a/icons/obj/defibrillators.dmi
+++ b/icons/obj/defibrillators.dmi
--- a/icons/obj/drinks.dmi
+++ b/icons/obj/drinks.dmi
--- a/icons/obj/storage.dmi
+++ b/icons/obj/storage.dmi