add some flags

diff --git a/Corvax-SS14 b/Corvax-SS14
index bfa80bf86f5c8a97c648e07923406b684b15935f..ccd1fb1a58451016acfc44f6153fc872c32e8d39 160000 (submodule)
--- a/Corvax-SS14
+++ b/Corvax-SS14
@@ -1 +1 @@
-Subproject commit bfa80bf86f5c8a97c648e07923406b684b15935f
+Subproject commit ccd1fb1a58451016acfc44f6153fc872c32e8d39

diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml
new file mode 100644 (file)
index 0000000..5fe865c
--- /dev/null
+++ b/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml
@@ -0,0 +1,11 @@
+- type: entity
+  parent: BaseItem
+  id: DominionHandyFlag
+  name: Ручной флажок Доминиона
+  description: Символ едниства станций
+  components:
+  - type: Sprite
+    sprite: SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi
+    state: icon
+  - type: Item
+    sprite: SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi

diff --git a/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml
new file mode 100644 (file)
index 0000000..4e938e4
--- /dev/null
+++ b/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml
@@ -0,0 +1,9 @@
+- type: entity
+  parent: BaseFlag
+  id: DominionFlag
+  name: Флаг Доминиона
+  description: Символ единства станций
+  components:
+  - type: Sprite
+    sprite: SMoA/Structures/Wallmounts/flags.rsi/
+    state: dominion_flag

diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png
new file mode 100644 (file)
index 0000000..5ddc8ef
Binary files /dev/null and b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png differ

diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png
new file mode 100644 (file)
index 0000000..1863e62
Binary files /dev/null and b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png differ

diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png
new file mode 100644 (file)
index 0000000..2963932
Binary files /dev/null and b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png differ

diff --git a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json
new file mode 100644 (file)
index 0000000..439243d
--- /dev/null
+++ b/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json
@@ -0,0 +1,22 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Created by MaxSMokeSkaarj",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "icon"
+    },
+    {
+      "name": "inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "inhand-right",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png
similarity index 100%
rename from Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/blank_flag.png
rename to Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png

diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
index 36d69f0e428cf5a8702e7f5c9b102a86d087d76e..c52ea2964558098a5e466f28a4fa30f52da0d722 100644 (file)
--- a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
+++ b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
@@ -1,26 +1,14 @@
 {
   "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",
+  "copyright": "Created by MaxSMokeSkaarj",
   "size": {
     "x": 32,
     "y": 32
   },
   "states": [
     {
-      "name": "blank_flag"
-    },
-    {
-      "name": "NT_flag"
-    },
-    {
-      "name": "syndie_flag"
-    },
-    {
-      "name": "lgbtq_flag"
-    },
-    {
-      "name": "pirate_flag"
+      "name": "dominion_flag"
     }
   ]
 }