Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Куча говна (#539)

Browse Source
This commit is contained in:
ThereDrD0
2023-11-07 08:23:27 +03:00
committed by Aviu00
parent 0fcefc84f5
commit 7ede02488c
16 changed files with 141 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Content.Shared/Sound/SharedEmitSoundSystem.cs
View File

@@ -6,6 +6,7 @@ using Content.Shared.Popups;
using Content.Shared.Sound.Components;
using Content.Shared.Throwing;
using Content.Shared.White.EndOfRoundStats.EmitSoundStatSystem;
using Content.Shared.White.Sounds;
using JetBrains.Annotations;
using Robust.Shared.Audio;
using Robust.Shared.Audio.Systems;
@@ -43,6 +44,9 @@ public abstract class SharedEmitSoundSystem : EntitySystem
SubscribeLocalEvent<EmitSoundOnPickupComponent, GotEquippedHandEvent>(OnEmitSoundOnPickup);
SubscribeLocalEvent<EmitSoundOnDropComponent, DroppedEvent>(OnEmitSoundOnDrop);
// WD edit
SubscribeLocalEvent<EmitSoundOnPickupComponent, GotRemovedEvent>(EmitSoundOnGotRemoved);
SubscribeLocalEvent<EmitSoundOnCollideComponent, EntityUnpausedEvent>(OnEmitSoundUnpaused);
SubscribeLocalEvent<EmitSoundOnCollideComponent, StartCollideEvent>(OnEmitSoundOnCollide);
}
@@ -99,6 +103,12 @@ public abstract class SharedEmitSoundSystem : EntitySystem
TryEmitSound(uid, component, args.User);
}
// WD edit
private void EmitSoundOnGotRemoved(EntityUid uid, EmitSoundOnPickupComponent component, GotRemovedEvent args)
{
TryEmitSound(uid, component, args.User, false);
}
private void OnEmitSoundOnDrop(EntityUid uid, EmitSoundOnDropComponent component, DroppedEvent args)
{
TryEmitSound(uid, component, args.User);
@@ -120,7 +130,7 @@ public abstract class SharedEmitSoundSystem : EntitySystem
}
if (_netMan.IsServer)
RaiseLocalEvent(new EmitSoundStatEvent(component.Owner, component.Sound));
RaiseLocalEvent(new EmitSoundStatEvent(uid, component.Sound));
}
private void OnEmitSoundUnpaused(EntityUid uid, EmitSoundOnCollideComponent component, ref EntityUnpausedEvent args)

8
Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
View File

@@ -17,6 +17,7 @@ using Content.Shared.Stacks;
using Content.Shared.Storage.Components;
using Content.Shared.Timing;
using Content.Shared.Verbs;
using Content.Shared.White.Sounds;
using Robust.Shared.Audio.Systems;
using Robust.Shared.Containers;
using Robust.Shared.Map;
@@ -389,6 +390,13 @@ public abstract class SharedStorageSystem : EntitySystem
&& storageComp.StorageRemoveSound != null)
Audio.PlayPredicted(storageComp.StorageRemoveSound, uid, player);
{
// WD edit
if (hands.ActiveHand != null)
{
var gotRemoved = new GotRemovedEvent(player, entity, hands.ActiveHand);
RaiseLocalEvent(entity, gotRemoved, false);
}
return;
}
}

10
Content.Shared/White/Sounds/GotRemovedEvent.cs Normal file
View File

@@ -0,0 +1,10 @@
using Content.Shared.Hands;
using Content.Shared.Hands.Components;
namespace Content.Shared.White.Sounds;
public sealed class GotRemovedEvent : EquippedHandEvent
{
public GotRemovedEvent(EntityUid user, EntityUid unequipped, Hand hand) : base(user, unequipped, hand) { }
}

BIN
Resources/Audio/White/Web/attack.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/White/Web/walk1.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/White/Web/walk2.ogg Normal file
View File

Binary file not shown.

BIN
Resources/Audio/White/Web/walk3.ogg Normal file
View File

Binary file not shown.

2
Resources/Prototypes/Entities/Objects/Materials/shards.yml
View File

@@ -49,7 +49,7 @@
- type: Tag
tags:
- Trash
- type: SpaceGarbage
# - type: SpaceGarbage # WD edit
- type: Damageable
damageContainer: Inorganic
damageModifierSet: Glass

15
Resources/Prototypes/Entities/Objects/Misc/spider_web.yml
View File

@@ -11,7 +11,12 @@
soundGroups:
Brute:
path:
"/Audio/Weapons/slash.ogg"
"/Audio/White/Web/attack.ogg" # WD edit start
- type: FootstepModifier
footstepSoundCollection:
collection: FootstepWeb
params:
volume: 1 # WD edit end
- type: Sprite
sprite: Objects/Misc/spiderweb.rsi
layers:
@@ -40,9 +45,15 @@
layer:
- MidImpassable
- type: Damageable
damageModifierSet: Wood
damageModifierSet: Web
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 10

14
Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
View File

@@ -221,18 +221,26 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger # WD edit end
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 3
max: 5
- type: MeleeSound # WD edit start
soundGroups:
Brute:
path:
"/Audio/Weapons/slash.ogg" # WD edit end
- type: Damageable
damageModifierSet: Web
- type: Door

35
Resources/Prototypes/Entities/Structures/Furniture/Tables/tables.yml
View File

@@ -31,7 +31,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 25
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -88,7 +88,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -172,7 +172,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 125
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -210,7 +210,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 150
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -263,7 +263,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 25
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -309,7 +309,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
damage: 300 # WD edit
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -358,7 +358,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 250
damage: 300 # WD edit
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -401,7 +401,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
damage: 300 # WD edit
behaviors: #excess damage (nuke?). avoid computational cost of spawning entities.
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -500,12 +500,23 @@
sprite: Structures/Furniture/Tables/web.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 50
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 1
max: 2
- type: MeleeSound
soundGroups:
Brute:
@@ -558,7 +569,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 100
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -572,7 +583,7 @@
- !type:SpawnEntitiesBehavior
spawn:
MaterialWoodPlank1:
min: 0
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -598,7 +609,7 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 125
damage: 300 # WD edit
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
@@ -614,7 +625,7 @@
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 0
min: 1
max: 1
- !type:DoActsBehavior
acts: [ "Destruction" ]

21
Resources/Prototypes/Entities/Structures/Furniture/beds.yml
View File

@@ -138,18 +138,29 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger # WD edit end
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
# - !type:PlaySoundBehavior WD edit - govno
# sound:
# path: /Audio/Effects/woodhit.ogg
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 1
max: 1
min: 3 # WD edit start
max: 4
- type: MeleeSound
soundGroups:
Brute:
path:
"/Audio/Weapons/slash.ogg" # WD edit end
- type: Construction
graph: WebStructures
node: bed

11
Resources/Prototypes/Entities/Structures/Furniture/chairs.yml
View File

@@ -291,18 +291,21 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger # WD edit end
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 1
max: 1
max: 2
- type: Construction
graph: WebStructures
node: chair

14
Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml
View File

@@ -145,18 +145,26 @@
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities. # WD edit start
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger # WD edit end
damage: 50
behaviors:
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 3
max: 5
- type: MeleeSound # WD edit start
soundGroups:
Brute:
path:
"/Audio/Weapons/slash.ogg" # WD edit end
- type: EntityStorage
closeSound:
path: /Audio/Effects/rustle1.ogg

27
Resources/Prototypes/Entities/Structures/Walls/walls.yml
View File

@@ -526,6 +526,11 @@
node: girder
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:SpawnEntitiesBehavior # WD edit start
spawn:
SheetPlasteel1:
min: 1
max: 2 # WD edit end
destroySound:
path: /Audio/Effects/metalbreak.ogg
- type: IconSmooth
@@ -816,6 +821,11 @@
path: /Audio/Effects/metalbreak.ogg
- !type:ChangeConstructionNodeBehavior
node: girder
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 2
- !type:DoActsBehavior
acts: ["Destruction"]
destroySound:
@@ -870,7 +880,7 @@
acts: ["Destruction"]
- trigger:
!type:DamageTrigger
damage: 200
damage: 100
behaviors:
- !type:PlaySoundBehavior
sound:
@@ -879,6 +889,11 @@
node: girder
- !type:DoActsBehavior
acts: ["Destruction"]
- !type:SpawnEntitiesBehavior
spawn:
SheetSteel1:
min: 1
max: 1
destroySound:
path: /Audio/Effects/metalbreak.ogg
- type: IconSmooth
@@ -985,6 +1000,12 @@
sprite: Structures/Walls/web.rsi
- type: Destructible
thresholds:
- trigger:
!type:DamageTrigger
damage: 300 #excess damage (nuke?). avoid computational cost of spawning entities.
behaviors:
- !type:DoActsBehavior
acts: [ "Destruction" ]
- trigger:
!type:DamageTrigger
damage: 30
@@ -994,8 +1015,8 @@
- !type:SpawnEntitiesBehavior
spawn:
MaterialWebSilk:
min: 1
max: 1
min: 2
max: 3
- !type:PlaySoundBehavior
sound:
path: /Audio/Effects/woodhit.ogg

6
Resources/Prototypes/White/SoundCollections/web.yml Normal file
View File

@@ -0,0 +1,6 @@
- type: soundCollection
id: FootstepWeb
files:
- /Audio/White/Web/walk1.ogg
- /Audio/White/Web/walk2.ogg
- /Audio/White/Web/walk3.ogg