]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Автообновление SS14
authorMaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Sat, 11 Jan 2025 08:18:53 +0000 (18:18 +1000)
committerMaxSMokeSkaarj <vnazarov@smokeofanarchy.ru>
Sat, 11 Jan 2025 08:18:53 +0000 (18:18 +1000)
16 files changed:
Resources/Prototypes/SMoA/Entities/Objects/Devices/encryption_keys.yml [deleted file]
Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml [deleted file]
Resources/Prototypes/SMoA/Entities/Objects/Misc/paper.yml [deleted file]
Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml [deleted file]
Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml [deleted file]
Resources/Prototypes/SMoA/radio_channels.yml [deleted file]
Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png [deleted file]
Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png [deleted file]
Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png [deleted file]
Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/meta.json [deleted file]
Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/meta.json [deleted file]
Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/paper_stamp-dominion.png [deleted file]
Resources/Textures/SMoA/Objects/Misc/stamps.rsi/meta.json [deleted file]
Resources/Textures/SMoA/Objects/Misc/stamps.rsi/stamp-dominion.png [deleted file]
Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png [deleted file]
Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json [deleted file]

diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Devices/encryption_keys.yml b/Resources/Prototypes/SMoA/Entities/Objects/Devices/encryption_keys.yml
deleted file mode 100644 (file)
index 9dc5e4f..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-- type: entity
-  parent: EncryptionKey
-  id: EncryptionKeyDominion
-  suffix: Кастом
-  name: Ключ шифрования Доминиона
-  description: Если ты нашел этот ключ - советую выбросить подальше из-за возможных неприятностей.
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: EncryptionKey
-    channels:
-    - Dominion
-    defaultChannel: Dominion
-  - type: Sprite
-    layers:
-    - state: crypt_gold
-    - state: pirate_label
diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/handy_flags.yml
deleted file mode 100644 (file)
index 5fe865c..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-- 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/Objects/Misc/paper.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/paper.yml
deleted file mode 100644 (file)
index 34538f4..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-- type: entity
-  name: Договор о союзе
-  categories: [ HideSpawnMenu ]
-  parent: Paper
-  id: PaperDominionOPZUnion
-  description: 'Лист белой оффисной бумаги.'
-  components:
-  - type: PaperVisuals
-    backgroundImagePath: "/Textures/Interface/Paper/paper_background_default.svg.96dpi.png"
-    contentImagePath: "/Textures/Interface/Paper/paper_content_lined.svg.96dpi.png"
-    backgroundPatchMargin: 16.0, 16.0, 16.0, 16.0
-    contentMargin: 16.0, 16.0, 16.0, 16.0
-  - type: Paper
-    content: "[head=2]Заключение союза[/head]\n1 Сторона: Доминион\n2 Сторона: Посольство ОПЗ\n\nУсловия 1 Стороны:\n1. Военный нейтралитет\n2. Нейтралитет связанный с политикой относительно рас.\n\nУсловия 2 Стороны:\n1. Военный нейтралитет\n2. Ненападение на структуры Посольства ОПЗ\n3. В случае надобности, помощь в обороне структур Посольства ОПЗ.\n\n\nПодпись 1 стороны: [italic]Макс Дымов.[/italic]\nПодпись 2 стороны: [italic]Алексей Артуров, Представитель Посольства ОПЗ[/italic]"
-    stampState: paper_stamp-lawyer
-    stampedBy:
-    - stampedColor: '#233D57FF'
-      stampedName: "Посольство ОПЗ"
-    - stampedColor: "#8b0000FF"
-      stampedName: "Доминион"
diff --git a/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml b/Resources/Prototypes/SMoA/Entities/Objects/Misc/rubber_stamp.yml
deleted file mode 100644 (file)
index e486531..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-- type: entity
-  name: Печать Доминиона
-  description: Если вы нашли это, то не советую носить это с собой
-  categories: [ HideSpawnMenu ]
-  parent: RubberStampBaseAlt
-  id: RubberStampDominion
-  components:
-  - type: Stamp
-    stampedName: Доминион
-    stampedColor: "#8b0000"
-    stampState: "paper_stamp-dominion"
-  - type: Sprite
-    sprite: SMoA/Objects/Misc/stamps.rsi
-    state: stamp-dominion
-
diff --git a/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml b/Resources/Prototypes/SMoA/Entities/Structures/Wallmounts/Signs/flags.yml
deleted file mode 100644 (file)
index 4e938e4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-- type: entity
-  parent: BaseFlag
-  id: DominionFlag
-  name: Флаг Доминиона
-  description: Символ единства станций
-  components:
-  - type: Sprite
-    sprite: SMoA/Structures/Wallmounts/flags.rsi/
-    state: dominion_flag
diff --git a/Resources/Prototypes/SMoA/radio_channels.yml b/Resources/Prototypes/SMoA/radio_channels.yml
deleted file mode 100644 (file)
index 93d1f55..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-- type: radioChannel
-  id: Dominion
-  name: Доминион
-  keycode: "d"
-  frequency: 1251
-  color: "#8b0000"
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
deleted file mode 100644 (file)
index 5ddc8ef..0000000
Binary files a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/icon.png and /dev/null 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
deleted file mode 100644 (file)
index 1863e62..0000000
Binary files a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-left.png and /dev/null 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
deleted file mode 100644 (file)
index 2963932..0000000
Binary files a/Resources/Textures/SMoA/Objects/Misc/Handy_Flags/dominion_handy_flag.rsi/inhand-right.png and /dev/null 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
deleted file mode 100644 (file)
index 439243d..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "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/Objects/Misc/bureaucracy.rsi/meta.json b/Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/meta.json
deleted file mode 100644 (file)
index 8ec0c9d..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by MaxSMokeSkaarj",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "paper_stamp-dominion"
-    }
-  ]
-}
diff --git a/Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/paper_stamp-dominion.png b/Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/paper_stamp-dominion.png
deleted file mode 100644 (file)
index e2625a4..0000000
Binary files a/Resources/Textures/SMoA/Objects/Misc/bureaucracy.rsi/paper_stamp-dominion.png and /dev/null differ
diff --git a/Resources/Textures/SMoA/Objects/Misc/stamps.rsi/meta.json b/Resources/Textures/SMoA/Objects/Misc/stamps.rsi/meta.json
deleted file mode 100644 (file)
index f3f218d..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by MaxSMokeSkaarj",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "stamp-dominion"
-    }
-  ]
-}
diff --git a/Resources/Textures/SMoA/Objects/Misc/stamps.rsi/stamp-dominion.png b/Resources/Textures/SMoA/Objects/Misc/stamps.rsi/stamp-dominion.png
deleted file mode 100644 (file)
index 33b4149..0000000
Binary files a/Resources/Textures/SMoA/Objects/Misc/stamps.rsi/stamp-dominion.png and /dev/null differ
diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png
deleted file mode 100644 (file)
index 4a099fa..0000000
Binary files a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/dominion_flag.png and /dev/null differ
diff --git a/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json b/Resources/Textures/SMoA/Structures/Wallmounts/flags.rsi/meta.json
deleted file mode 100644 (file)
index c52ea29..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Created by MaxSMokeSkaarj",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "dominion_flag"
-    }
-  ]
-}