From 0700e1fb0b5abc40aeb35d82c7b918095573b0af Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Mon, 1 Aug 2022 12:34:50 -0300 Subject: [PATCH] lizz does the slashies (#10215) --- Resources/Audio/Weapons/licenses.txt | 2 ++ Resources/Audio/Weapons/pierce.ogg | Bin 0 -> 6435 bytes .../Entities/Mobs/Species/reptilian.yml | 9 +++++++++ 3 files changed, 11 insertions(+) create mode 100644 Resources/Audio/Weapons/pierce.ogg diff --git a/Resources/Audio/Weapons/licenses.txt b/Resources/Audio/Weapons/licenses.txt index f5b81bbdc3..b16fcd263a 100644 --- a/Resources/Audio/Weapons/licenses.txt +++ b/Resources/Audio/Weapons/licenses.txt @@ -11,3 +11,5 @@ BoxingPunch 1, 2, and 3 taken from Ryan Conway at https://freesound.org/people/r boxingbell.ogg taken from Herkules92 at https://freesound.org/people/Herkules92/sounds/520998/ under CC0 1.0 block_metal1.ogg taken from https://github.com/Citadel-Station-13/Citadel-Station-13/commit/31c5996a5db8cce0cb431cb1dc20d99cac83f268 under CC BY-SA 3.0 + +pierce.ogg taken from: https://github.com/tgstation/tgstation/commit/106cd26fc00851a51dd362f3131120318d848a53 \ No newline at end of file diff --git a/Resources/Audio/Weapons/pierce.ogg b/Resources/Audio/Weapons/pierce.ogg new file mode 100644 index 0000000000000000000000000000000000000000..d214892632487fcbec6ee64fb682833403edcef9 GIT binary patch literal 6435 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 C&jSbm literal 0 HcmV?d00001 diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml index e5219d5759..0d55184ad9 100644 --- a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml +++ b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml @@ -132,6 +132,15 @@ - type: Damageable damageContainer: Biological damageModifierSet: Scale + - type: MeleeWeapon + hitSound: + path: /Audio/Weapons/pierce.ogg + range: 0.8 + arcwidth: 30 + arc: fist + damage: + types: + Piercing: 5 - type: Temperature heatDamageThreshold: 400 coldDamageThreshold: 285