Merge branch 'Space-Stories:master' into CorvaxMapsAdding

Resources/Prototypes/Stories/Catalog/uplink_catalog.yml

@@ -0,0 +1,9 @@
+- type: listing
+  id: UplinkRadioJammerIndustrial
+  name: Экспериментальный глушитель связи
+  description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше. (Замаскирован под %%%%%%%)
+  productEntity: RadioJammerIndustrial
+  cost:
+    Telecrystal: 6
+  categories:
+  - UplinkDisruption

Resources/Prototypes/Stories/Decals/crayons.yml

@@ -0,0 +1,133 @@
+# Cyrillic letters
+- type: decal # Б
+  id: cyr_b
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_b
+
+- type: decal # Ч
+  id: cyr_ch
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_ch
+
+- type: decal # Ц
+  id: cyr_c
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_c
+
+- type: decal # Д
+  id: cyr_d
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_d
+
+- type: decal # Э
+  id: cyr_eh
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_eh
+
+- type: decal # Ф
+  id: cyr_f
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_f
+
+- type: decal # Г
+  id: cyr_g
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_g
+
+- type: decal # И
+  id: cyr_i
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_i
+
+- type: decal # Л
+  id: cyr_l
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_l
+
+- type: decal # Ь
+  id: cyr_soft_sign
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_soft_sign
+
+- type: decal # П
+  id: cyr_p
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_p
+
+- type: decal # Щ
+  id: cyr_shh
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_shh
+
+- type: decal # Ш
+  id: cyr_sh
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_sh
+
+- type: decal # Ъ
+  id: cyr_hard_sign
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_hard_sign
+
+- type: decal # Ю
+  id: cyr_u
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_u
+
+- type: decal # Я
+  id: cyr_ya
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_ya
+
+- type: decal # Ы
+  id: cyr_y
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_y
+
+- type: decal # Ж
+  id: cyr_zh
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_zh
+
+- type: decal # З
+  id: cyr_z
+  tags: ["crayon"]
+  sprite:
+    sprite: Stories/Effects/crayondecals.rsi
+    state: cyr_z

Resources/Prototypes/Stories/Entities/Objects/Tools/jammer.yml

@@ -0,0 +1,27 @@
+- type: entity
+  name: экспериментальный глушитель связи
+  parent: RadioJammer
+  id: RadioJammerIndustrial
+  description: Это устройство является улучшенной версией обычного глушителя связи. Радиус действия увеличен, но и потребление больше.
+  components:
+  - type: Sprite
+    sprite: Stories/Objects/Devices/jammer_ind.rsi
+  - type: RadioJammer
+    settings:
+    - wattage: 3
+      range: 6
+      message: radio-jammer-component-set-message-low
+      name: radio-jammer-component-setting-low
+    - wattage: 6
+      range: 12
+      message: radio-jammer-component-set-message-medium
+      name: radio-jammer-component-setting-medium
+    - wattage: 12
+      range: 24
+      message: radio-jammer-component-set-message-high
+      name: radio-jammer-component-setting-high
+  - type: ItemSlots
+    slots:
+      cell_slot:
+        name: power-cell-slot-component-slot-name-default
+        startingItem: PowerCellHigh

Resources/Textures/Stories/Effects/crayondecals.rsi/meta.json

@@ -0,0 +1,68 @@
+{
+    "version": 1,
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "license": "CC0-1.0",
+    "copyright": "discord:temporary-ga#3856",
+    "states": [
+        {
+            "name": "cyr_b"
+        },
+        {
+            "name": "cyr_ch"
+        },
+        {
+            "name": "cyr_c"
+        },
+        {
+            "name": "cyr_d"
+        },
+        {
+            "name": "cyr_eh"
+        },
+        {
+            "name": "cyr_f"
+        },
+        {
+            "name": "cyr_g"
+        },
+        {
+            "name": "cyr_i"
+        },
+        {
+            "name": "cyr_l"
+        },
+        {
+            "name": "cyr_soft_sign"
+        },
+        {
+            "name": "cyr_p"
+        },
+        {
+            "name": "cyr_shh"
+        },
+        {
+            "name": "cyr_sh"
+        },
+        {
+            "name": "cyr_hard_sign"
+        },
+        {
+            "name": "cyr_u"
+        },
+        {
+            "name": "cyr_ya"
+        },
+        {
+            "name": "cyr_y"
+        },
+        {
+            "name": "cyr_zh"
+        },
+        {
+            "name": "cyr_z"
+        }
+    ]
+}

Resources/Textures/Stories/Objects/Devices/jammer_ind.rsi/meta.json

@@ -0,0 +1,53 @@
+{
+    "version": 1,
+    "license": "CC-BY-SA-3.0",
+    "copyright": "Created by RustedTim(discord:helloo4771) for SpaceStories(Server SS14)",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "jammer",
+            "directions": 1
+        },
+        {
+            "name": "jammer_high_charge",
+            "directions": 1,
+			"delays": [
+            [
+            0.1,
+            0.1
+            ]
+		]
+        },
+        {
+            "name": "jammer_medium_charge",
+            "directions": 1,
+			"delays": [
+            [
+            0.2,
+            0.2
+            ]
+		]
+        },
+        {
+            "name": "jammer_low_charge",
+            "directions": 1,
+			"delays": [
+            [
+            0.3,
+            0.3
+            ]
+		]
+        },
+		{
+			"name": "inhand-left",
+			"directions": 4
+		},
+		{
+			"name": "inhand-right",
+			"directions": 4
+		}
+    ]
+}