diff --git a/Resources/Audio/DeltaV/Misc/license.txt b/Resources/Audio/DeltaV/Misc/license.txt index dfc79979a75..bf948c32219 100644 --- a/Resources/Audio/DeltaV/Misc/license.txt +++ b/Resources/Audio/DeltaV/Misc/license.txt @@ -1 +1,2 @@ -reducedtoatmos.ogg is modified from https://www.youtube.com/watch?v=X2QMN0a_TrA \ No newline at end of file +reducedtoatmos.ogg is modified from https://www.youtube.com/watch?v=X2QMN0a_TrA +sound_health_slowbeat.ogg is taken from https://github.com/tgstation/tgstation/pull/28858 \ No newline at end of file diff --git a/Resources/Audio/DeltaV/Misc/miami_music.ogg b/Resources/Audio/DeltaV/Misc/miami_music.ogg new file mode 100644 index 00000000000..cce257b9c94 Binary files /dev/null and b/Resources/Audio/DeltaV/Misc/miami_music.ogg differ diff --git a/Resources/Audio/DeltaV/Misc/sound_health_slowbeat.ogg b/Resources/Audio/DeltaV/Misc/sound_health_slowbeat.ogg new file mode 100644 index 00000000000..a44b609eeb7 Binary files /dev/null and b/Resources/Audio/DeltaV/Misc/sound_health_slowbeat.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Melee/drawknife.ogg b/Resources/Audio/DeltaV/Weapons/Melee/drawknife.ogg new file mode 100644 index 00000000000..08ac6fe5ce8 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Melee/drawknife.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Melee/hit.ogg b/Resources/Audio/DeltaV/Weapons/Melee/hit.ogg new file mode 100644 index 00000000000..a5bf57de140 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Melee/hit.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Melee/licenses.txt b/Resources/Audio/DeltaV/Weapons/Melee/licenses.txt new file mode 100644 index 00000000000..a47196d114c --- /dev/null +++ b/Resources/Audio/DeltaV/Weapons/Melee/licenses.txt @@ -0,0 +1 @@ +punch.ogg, hit.ogg and pickupweapon.ogg from hotline miami \ No newline at end of file diff --git a/Resources/Audio/DeltaV/Weapons/Melee/pickupweapon.ogg b/Resources/Audio/DeltaV/Weapons/Melee/pickupweapon.ogg new file mode 100644 index 00000000000..8fa577d9a61 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Melee/pickupweapon.ogg differ diff --git a/Resources/Audio/DeltaV/Weapons/Melee/punch.ogg b/Resources/Audio/DeltaV/Weapons/Melee/punch.ogg new file mode 100644 index 00000000000..cf9533b7980 Binary files /dev/null and b/Resources/Audio/DeltaV/Weapons/Melee/punch.ogg differ diff --git a/Resources/Prototypes/DeltaV/Entities/Clothing/Head/misc.yml b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/misc.yml new file mode 100644 index 00000000000..cba93552043 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Clothing/Head/misc.yml @@ -0,0 +1,19 @@ +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatTony + name: tony + description: 'Man, this party stinks, I fucking hate these people.' + components: + - type: Sprite + sprite: DeltaV/Clothing/Head/Misc/tony.rsi + - type: Clothing + sprite: DeltaV/Clothing/Head/Misc/tony.rsi + equipSound: + path: /Audio/DeltaV/Weapons/Melee/pickupweapon.ogg + - type: IngestionBlocker + - type: IdentityBlocker + - type: EmitSoundOnPickup + sound: /Audio/DeltaV/Weapons/Melee/pickupweapon.ogg + - type: Tag + tags: + - HidesHair \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knuckle_dusters.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knuckle_dusters.yml new file mode 100644 index 00000000000..c8cc8184be2 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Melee/knuckle_dusters.yml @@ -0,0 +1,43 @@ +- type: entity + name: bloody knuckle dusters + parent: BaseItem + id: BloodyKnuckleDuster + description: You get a certain rush wearing these gloves while tearing flesh off with each swing. It is very bloody. + components: + - type: Sprite + sprite: DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi + state: wielded-inhand-left + - type: Item + size: 10 + - type: EmitSoundOnLand + sound: + path: /Audio/Items/wrench_drop.ogg + params: + volume: 2 + - type: EmitSoundOnPickup + sound: /Audio/DeltaV/Weapons/Melee/pickupweapon.ogg + - type: MeleeWeapon + attackRate: 1 + range: 1.1 + damage: + types: + Blunt: 5 + soundHit: + collection: KnuckleDuster + animation: WeaponArcFist + - type: Wieldable + wieldSound: !type:SoundPathSpecifier + path: /Audio/DeltaV/Weapons/Melee/drawknife.ogg + params: + volume: -6 + animation: WeaponArcFist + - type: IncreaseDamageOnWield + damage: + types: + Blunt: 10 + Slash: 5 + bluntStaminaDamageFactor: 1.35 + - type: AmbientSound + range: 0.01 + volume: -6 + sound: /Audio/DeltaV/Misc/miami_music.ogg \ No newline at end of file diff --git a/Resources/Prototypes/DeltaV/SoundCollections/hotline.yml b/Resources/Prototypes/DeltaV/SoundCollections/hotline.yml new file mode 100644 index 00000000000..371b8e488a7 --- /dev/null +++ b/Resources/Prototypes/DeltaV/SoundCollections/hotline.yml @@ -0,0 +1,5 @@ +- type: soundCollection + id: KnuckleDuster + files: + - /Audio/DeltaV/Weapons/Melee/punch.ogg + - /Audio/DeltaV/Weapons/Melee/hit.ogg \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/equipped-HELMET.png b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..4d7662be5ba Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/icon.png b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/icon.png new file mode 100644 index 00000000000..c4efff221d9 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-left.png b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-left.png new file mode 100644 index 00000000000..9259ef02393 Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-right.png b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-right.png new file mode 100644 index 00000000000..5bd682a319e Binary files /dev/null and b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/meta.json b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/meta.json new file mode 100644 index 00000000000..b8a696a450a --- /dev/null +++ b/Resources/Textures/DeltaV/Clothing/Head/Misc/tony.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by ps3moira.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png new file mode 100644 index 00000000000..aac3e6b5dd5 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/icon.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png new file mode 100644 index 00000000000..f1831fc6bad Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png new file mode 100644 index 00000000000..f6c25d2b7b2 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/inhand-right.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json new file mode 100644 index 00000000000..b2cdf979731 --- /dev/null +++ b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/meta.json @@ -0,0 +1,108 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Sprited by ps3moira", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "wielded-inhand-right", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "wielded-inhand-left", + "directions": 4, + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ], + [ + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-left.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-left.png new file mode 100644 index 00000000000..d68f1996224 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-left.png differ diff --git a/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-right.png b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-right.png new file mode 100644 index 00000000000..105768d4d20 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Weapons/Melee/brass_knuckles.rsi/wielded-inhand-right.png differ