From: MaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Date: Wed, 8 Jan 2025 13:34:31 +0000 (+1000)
Subject: rollback wizden textures
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=8260458036ace709256519ef8adcb6f45dc44663;p=space-station-14.git

rollback wizden textures
---

diff --git a/Corvax-SS14 b/Corvax-SS14
index 17ebe53faf..bfa80bf86f 160000
--- a/Corvax-SS14
+++ b/Corvax-SS14
@@ -1 +1 @@
-Subproject commit 17ebe53faffe8f9862fde9c987652ed95fdb19d7
+Subproject commit bfa80bf86f5c8a97c648e07923406b684b15935f
diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml
index 394df1c700..e486531b5c 100644
--- a/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml
+++ b/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml
@@ -1,5 +1,6 @@
 - type: entity
-  name: Штамп Доминиона
+  name: Печать Доминиона
+  description: Если вы нашли это, то не советую носить это с собой
   categories: [ HideSpawnMenu ]
   parent: RubberStampBaseAlt
   id: RubberStampDominion
@@ -9,4 +10,6 @@
     stampedColor: "#8b0000"
     stampState: "paper_stamp-dominion"
   - type: Sprite
-    state: stamp-deny
+    sprite: SMoA/Objects/Misc/stamps.rsi
+    state: stamp-dominion
+
diff --git a/Resources/Textures/Logo/icon/icon-128x128.png b/Resources/Textures/Logo/icon/icon-128x128.png
index acdaa8ba1d..f8b9345bd1 100644
Binary files a/Resources/Textures/Logo/icon/icon-128x128.png and b/Resources/Textures/Logo/icon/icon-128x128.png differ
diff --git a/Resources/Textures/Logo/icon/icon-16x16.png b/Resources/Textures/Logo/icon/icon-16x16.png
index b57c2288be..a02d968cea 100644
Binary files a/Resources/Textures/Logo/icon/icon-16x16.png and b/Resources/Textures/Logo/icon/icon-16x16.png differ
diff --git a/Resources/Textures/Logo/icon/icon-24x24.png b/Resources/Textures/Logo/icon/icon-24x24.png
index 95ad998c8f..0fe5c3c587 100644
Binary files a/Resources/Textures/Logo/icon/icon-24x24.png and b/Resources/Textures/Logo/icon/icon-24x24.png differ
diff --git a/Resources/Textures/Logo/icon/icon-256x256.png b/Resources/Textures/Logo/icon/icon-256x256.png
index d95d24344c..6bbe1ef4b4 100644
Binary files a/Resources/Textures/Logo/icon/icon-256x256.png and b/Resources/Textures/Logo/icon/icon-256x256.png differ
diff --git a/Resources/Textures/Logo/icon/icon-32x32.png b/Resources/Textures/Logo/icon/icon-32x32.png
index 8137f8637f..5081ca7fb1 100644
Binary files a/Resources/Textures/Logo/icon/icon-32x32.png and b/Resources/Textures/Logo/icon/icon-32x32.png differ
diff --git a/Resources/Textures/Logo/icon/icon-48x48.png b/Resources/Textures/Logo/icon/icon-48x48.png
index d8459d14c0..002c729897 100644
Binary files a/Resources/Textures/Logo/icon/icon-48x48.png and b/Resources/Textures/Logo/icon/icon-48x48.png differ
diff --git a/Resources/Textures/Logo/icon/icon-64x64.png b/Resources/Textures/Logo/icon/icon-64x64.png
index c669ef4824..9958b5492c 100644
Binary files a/Resources/Textures/Logo/icon/icon-64x64.png and b/Resources/Textures/Logo/icon/icon-64x64.png differ
diff --git a/Resources/Textures/Logo/logo.png b/Resources/Textures/Logo/logo.png
index 777ed2e6f8..dedf697562 100644
Binary files a/Resources/Textures/Logo/logo.png and b/Resources/Textures/Logo/logo.png differ
diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png
new file mode 100644
index 0000000000..4a099faa44
Binary files /dev/null and b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png differ
diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
new file mode 100644
index 0000000000..36d69f0e42
--- /dev/null
+++ b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
@@ -0,0 +1,26 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Derived by sprites from tgstation at https://github.com/tgstation/tgstation/commit/d0d81185f09ca30d3b0856d476544240dba0de53 and adapted by Saveliy360",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "blank_flag"
+    },
+    {
+      "name": "NT_flag"
+    },
+    {
+      "name": "syndie_flag"
+    },
+    {
+      "name": "lgbtq_flag"
+    },
+    {
+      "name": "pirate_flag"
+    }
+  ]
+}
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png
index a4477ab548..ad9cd3bbd5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png
index 2806586167..7f3e3d70c5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_bridge.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png
index d1ece9751a..34f12710ae 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_brig.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png
index 30ad17577c..1c1d333e8d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chapel.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png
index 2d1c1e7740..b6119064af 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_chemistry.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png
index 8efae59357..dc342dce67 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_cryo.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png
index e5ae5d54eb..3ee8b449d3 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_dorms.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png
index 6e33d4dab3..56ea5fbadd 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_eng.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png
index e33a4a07e1..7807607b0f 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_evac.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png
index dc6a923c77..dc1eb795e8 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_exam.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png
index da9fee707e..f2f0212b4c 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_food.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png
index 729922e5e0..d4095e9a27 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_gravity.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png
index 9eeb785b87..6272e3fd71 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hop.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png
index f4714c4691..c81effa226 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_hydro.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png
index 3477717855..d4d2e4cd57 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_icu.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png
index 5ce9ab5ffe..cc50450fb9 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_janitor.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png
index b56cf32291..bd4c2fae27 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_library.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png
index 188b8ec617..b6b2899dcd 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_med.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png
index cb1080b995..3f0d3dbf42 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_salvage.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png
index 7669ab537f..731a201140 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sci.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png
index 9f4229c13d..d025350b9a 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_sec.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png
index 83d9c5dfc1..9af0616816 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_solar.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png
index ac68a451a9..0f4df4caa5 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_supply.png differ
diff --git a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png
index eab7edab10..af31c3057d 100644
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png differ