Telescopic shield (#20048)

* telescopic shield

* research

* removed the shield from the locker

* sound

* eh

* fix

diff --git a/Resources/Audio/Weapons/attributions.yml b/Resources/Audio/Weapons/attributions.yml
index 6e59d34d59b7cef42c8e51bd6cc086b484a05ad6..a1e728b5d584a481d0975baa2724a02225266cde 100644 (file)
--- a/Resources/Audio/Weapons/attributions.yml
+++ b/Resources/Audio/Weapons/attributions.yml
@@ -8,7 +8,6 @@
   copyright: "User tosha73 on freesound.org"
   source: "https://freesound.org/people/tosha73/sounds/509902/"
 
-
 - files: ["chainsaw.ogg, chainsawidle.ogg, chainsawwield.ogg"]
   license: "Custom"
   copyright: "https://www.soundjay.com/tos.html"
@@ -28,3 +27,8 @@
   license: "CC-BY-SA-3.0"
   copyright: "Based on genhit3.ogg from tgstation, modified by deltanedas on github."
   source: "https://github.com/deltanedas"
+
+- files: ["telescopicon.ogg, telescopicoff.ogg"]
+  license: "CC-BY-SA-3.0"
+  copyright: "User Nimfar11 on GitHub."
+  source: "https://github.com/Nimfar11"

diff --git a/Resources/Audio/Weapons/telescopicoff.ogg b/Resources/Audio/Weapons/telescopicoff.ogg
new file mode 100644 (file)
index 0000000..3509ee6
Binary files /dev/null and b/Resources/Audio/Weapons/telescopicoff.ogg differ

diff --git a/Resources/Audio/Weapons/telescopicon.ogg b/Resources/Audio/Weapons/telescopicon.ogg
new file mode 100644 (file)
index 0000000..aec503d
Binary files /dev/null and b/Resources/Audio/Weapons/telescopicon.ogg differ

diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
index af1aa6612cd1bde98949b450f69ac6d6fe20a02b..ea5935957df13e63ace3831e430f916050828b9d 100644 (file)
--- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml
+++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml
@@ -400,3 +400,71 @@
       sprite: Objects/Weapons/Melee/e_shield.rsi
       size: 5
       heldPrefix: eshield
+
+- type: entity
+  name: telescopic shield
+  parent: BaseShield
+  id: TelescopicShield
+  description: An advanced riot shield made of lightweight materials that collapses for easy storage.
+  components:
+    - type: ItemToggle
+      activatedDisarmMalus: 0.6
+      activateSound:
+        path: /Audio/Weapons/telescopicon.ogg
+        params:
+          volume: -5
+      deActivateSound:
+        path: /Audio/Weapons/telescopicoff.ogg
+        params:
+          volume: -5
+      offSize: 10
+    - type: Sprite
+      sprite: Objects/Weapons/Melee/teleriot_shield.rsi
+      layers:
+        - state: teleriot-icon
+        - state: teleriot-on
+          visible: false
+          shader: unshaded
+          map: [ "shield" ]
+    - type: Item
+      size: 10
+      sprite: Objects/Weapons/Melee/teleriot_shield.rsi
+      heldPrefix: teleriot
+    - type: UseDelay
+      delay: 0.5
+    - type: ToggleableLightVisuals
+      spriteLayer: shield
+      inhandVisuals:
+        left:
+          - state: inhand-left-shield
+            shader: unshaded
+        right:
+          - state: inhand-right-shield
+            shader: unshaded
+    - type: Appearance
+    - type: Destructible
+      thresholds:
+        - trigger:
+            !type:DamageTrigger
+            damage: 100
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+        - trigger:
+            !type:DamageTrigger
+            damage: 70
+          behaviors:
+            - !type:DoActsBehavior
+              acts: [ "Destruction" ]
+            - !type:PlaySoundBehavior
+              sound: /Audio/Effects/metalbreak.ogg
+            - !type:SpawnEntitiesBehavior
+              spawn:
+                SheetSteel:
+                  min: 1
+                  max: 1
+                SheetGlass:
+                  min: 2
+                  max: 2
+    - type: StaticPrice
+      price: 250

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
index 8d41bcab2cfecaaa0b9c5570eef4f6d2b9767379..238416040327e8c4c3cfd5c2bc8281e320bafd8e 100644 (file)
--- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -558,6 +558,7 @@
       - VoiceTrigger
       - TimerTrigger
       - Truncheon
+      - TelescopicShield
       - FlashPayload
       - ExplosivePayload
       - WeaponLaserCarbine

diff --git a/Resources/Prototypes/Recipes/Lathes/security.yml b/Resources/Prototypes/Recipes/Lathes/security.yml
index 50940deab1b7010a75d939876aaef03adafb093a..c8260dc33f49a864961be94f3fe43381b917ebf7 100644 (file)
--- a/Resources/Prototypes/Recipes/Lathes/security.yml
+++ b/Resources/Prototypes/Recipes/Lathes/security.yml
@@ -106,6 +106,14 @@
     Steel: 400
     Glass: 400
 
+- type: latheRecipe
+  id: TelescopicShield
+  result: TelescopicShield
+  completetime: 4
+  materials:
+    Steel: 300
+    Glass: 800
+
 - type: latheRecipe
   id: Flash
   result: Flash

diff --git a/Resources/Prototypes/Research/arsenal.yml b/Resources/Prototypes/Research/arsenal.yml
index 3b5a5d67bbf1f3b9007a2716cc1b153b7fe2c507..ea073954a3e1fb7141ee5f4490575467d91e6b41 100644 (file)
--- a/Resources/Prototypes/Research/arsenal.yml
+++ b/Resources/Prototypes/Research/arsenal.yml
@@ -121,6 +121,7 @@
   cost: 8000
   recipeUnlocks:
   - Truncheon
+  - TelescopicShield
 
 # Tier 3
 

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png
new file mode 100644 (file)
index 0000000..02fc793
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-left-shield.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png
new file mode 100644 (file)
index 0000000..0174ec5
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/inhand-right-shield.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json
new file mode 100644 (file)
index 0000000..0966573
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/meta.json
@@ -0,0 +1,33 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/84223c65f5caf667a84f3c0f49bc2a41cdc6c4e3",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "teleriot-icon"
+    },
+    {
+      "name": "teleriot-inhand-right",
+      "directions": 4
+    },
+    {
+      "name": "teleriot-inhand-left",
+      "directions": 4
+    },
+    {
+      "name": "teleriot-on"
+    },
+    {
+      "name": "inhand-right-shield",
+      "directions": 4
+    },
+    {
+      "name": "inhand-left-shield",
+      "directions": 4
+    }
+  ]
+}

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png
new file mode 100644 (file)
index 0000000..c64786b
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-icon.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png
new file mode 100644 (file)
index 0000000..e2e170d
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-left.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png
new file mode 100644 (file)
index 0000000..9d56b04
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-inhand-right.png differ

diff --git a/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-on.png b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-on.png
new file mode 100644 (file)
index 0000000..1c0bd13
Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-on.png differ