rollback wizden textures

diff --git a/Corvax-SS14 b/Corvax-SS14
index 17ebe53faffe8f9862fde9c987652ed95fdb19d7..bfa80bf86f5c8a97c648e07923406b684b15935f 160000 (submodule)
--- 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 394df1c700079063a2d1100bdbeebfabc0cf12a7..e486531b5c0eeb74db32c46625f0355c5c6f12eb 100644 (file)
--- 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 acdaa8ba1d6b7030ce8a995fb0a4770824dc47d1..f8b9345bd13405a78c05cf94bfcbc588bda527ef 100644 (file)
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 b57c2288be5a743796185a64ddc8ea793baa18da..a02d968cea63e1bf3bee6d84c719c1d00f093cb6 100644 (file)
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 95ad998c8f9eba526609d4bbd07e7dacd7a222b6..0fe5c3c58797fecd9e54414a844349a148517950 100644 (file)
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 d95d24344cf6d977c07f41f161eb2f0d79ba7d75..6bbe1ef4b41ed19e78602b7ef45b9cf5cc714194 100644 (file)
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 8137f8637fd9fd20860cc1d5f8a3a54f4934ced1..5081ca7fb13bf62d4253ad77b505959a5df60a5c 100644 (file)
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 d8459d14c020e9aa111a893573ba3c0c0e670d51..002c729897366b5396f23f31c1d3dc7866ca8a6e 100644 (file)
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 c669ef482404beaed7c3756799c9159c2365a26d..9958b5492ceba1d5cb51cd7bacde87cd0eb3de8c 100644 (file)
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 777ed2e6f890d213d6eabd77d99bdb9db75ccc8c..dedf697562a9c6f556b0c2f10f02113d93bd9126 100644 (file)
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 (file)
index 0000000..4a099fa
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 (file)
index 0000000..36d69f0
--- /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 a4477ab54845f9c6900b31ae2582c3f0d071cca0..ad9cd3bbd54bdd2de80c12f9a38c10cc88cf2f8f 100644 (file)
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 2806586167a05572d88c46e6ea7768be5ff3be50..7f3e3d70c5076bcdbc5c7426426ad519fc48ffd2 100644 (file)
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 d1ece9751a773b48f73a7295ae50fc0239b7dcdd..34f12710aec09aff666b013009a12c8cb903c062 100644 (file)
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 30ad17577c0ec6277726738cab1b31efdecb8577..1c1d333e8d5f918e7481c993c1ad7164ae9c9d34 100644 (file)
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 2d1c1e7740488b72040ead5d56d2eb180bd65d29..b6119064afe13437717ed485f73b076dc0f842c1 100644 (file)
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 8efae593570203f1857fe968756af98ba1dde66e..dc342dce6764cf24a12bdc074a967911fe6ba169 100644 (file)
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 e5ae5d54eb1d8eb55f29e94039c2be8bc156b751..3ee8b449d36b3ebb8e0e284e1da4d153f739dae9 100644 (file)
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 6e33d4dab335d1aece94a0db4dbef4ea84ab47e7..56ea5fbadd2347f9470b357bcc2d12eee0982f36 100644 (file)
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 e33a4a07e1b3be5e5b215fa244b664ebb2940216..7807607b0fd1850eff499180abee6d3733d18c17 100644 (file)
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 dc6a923c77c4d0c1ec03297b330c4334b52696e8..dc1eb795e8048d31e1d8980c723d6d9803010dae 100644 (file)
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 da9fee707e20f6ed7bc1efc1787ab40aa36e7882..f2f0212b4c21af495970ad320ef88fb57a7b1c95 100644 (file)
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 729922e5e0d00664a71b4b72ef1fb80497d6fb7a..d4095e9a276a15722586c0acabd9f75cbfa22a04 100644 (file)
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 9eeb785b871c0fa307e6dd163357f5caca196e77..6272e3fd71a98374302d448bc7203c4fc65c609d 100644 (file)
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 f4714c4691b5e6b3bc341a1230d06374ee3b6be6..c81effa2266cfd59db696462d8fb0fc2127c6d51 100644 (file)
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 34777178555a700e6bc9c62364ba2f21e6f1fe10..d4d2e4cd5762be87ebe0539d27f4bf984f365749 100644 (file)
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 5ce9ab5ffe0017f17b7ad61b8532f2f195f29472..cc50450fb99116432beb3f958cc503ef9e4581b8 100644 (file)
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 b56cf322915dce51ddd35fa15fe1002871c1c9b7..bd4c2fae27799c65801ff37b61f6b11b9eaae095 100644 (file)
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 188b8ec617f98a7e9b01ec4a55218b0ae15e3bee..b6b2899dcd622b454a63d996c45cea356b073b6a 100644 (file)
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 cb1080b99506780e2c0942fc66836c7e4713ad07..3f0d3dbf4253e9338cbdd289be196aac5dbc993c 100644 (file)
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 7669ab537f13f2504a1685480a31b5cb6e869f22..731a2011401722fbe0101e3b18fd809ce7ad19d9 100644 (file)
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 9f4229c13d0bdc88a132495968279a319fe51cb4..d025350b9a321c74a0d8f2681cbe43e8de76c2b4 100644 (file)
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 83d9c5dfc11ade1344fc3b9c3d29f8e1c8dfd4df..9af0616816c9084cf87ef18d4b014be2c2dce69a 100644 (file)
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 ac68a451a900ff6513f0338abdeb06d24de8a2e3..0f4df4caa5064ef2042df670139754e98feb5d61 100644 (file)
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 eab7edab1094a98838712df22c0df1d618819fc8..af31c3057d858f55840318bab6e4c57eac3dedd4 100644 (file)
Binary files a/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png and b/Resources/Textures/Structures/Wallmounts/signs.rsi/direction_wash.png differ