From: Nim <128169402+Nimfar11@users.noreply.github.com> Date: Thu, 14 Sep 2023 01:03:12 +0000 (+0300) Subject: Telescopic shield (#20048) X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=afd30c5c753ae0b1068c90ae1c0c8df08462cdaa;p=space-station-14.git 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 6e59d34d59..a1e728b5d5 100644 --- 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 index 0000000000..3509ee68c0 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 index 0000000000..aec503d3fa 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 af1aa6612c..ea5935957d 100644 --- 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 8d41bcab2c..2384160403 100644 --- 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 50940deab1..c8260dc33f 100644 --- 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 3b5a5d67bb..ea073954a3 100644 --- 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 index 0000000000..02fc79343e 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 index 0000000000..0174ec54bc 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 index 0000000000..0966573c00 --- /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 index 0000000000..c64786b868 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 index 0000000000..e2e170d529 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 index 0000000000..9d56b04c18 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 index 0000000000..1c0bd13d72 Binary files /dev/null and b/Resources/Textures/Objects/Weapons/Melee/teleriot_shield.rsi/teleriot-on.png differ