diff --git a/Resources/Audio/White/Items/equip/sabre_equip.ogg b/Resources/Audio/White/Items/equip/sabre_equip.ogg new file mode 100644 index 0000000000..f441c8bbae Binary files /dev/null and b/Resources/Audio/White/Items/equip/sabre_equip.ogg differ diff --git a/Resources/Audio/White/Items/equip/sabre_hide.ogg b/Resources/Audio/White/Items/equip/sabre_hide.ogg new file mode 100644 index 0000000000..b4cad3a0ba Binary files /dev/null and b/Resources/Audio/White/Items/equip/sabre_hide.ogg differ diff --git a/Resources/Audio/White/Items/handling/ammobox_drop.ogg b/Resources/Audio/White/Items/handling/ammobox_drop.ogg new file mode 100644 index 0000000000..13fce70fe3 Binary files /dev/null and b/Resources/Audio/White/Items/handling/ammobox_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/ammobox_pickup.ogg b/Resources/Audio/White/Items/handling/ammobox_pickup.ogg new file mode 100644 index 0000000000..9532a7697b Binary files /dev/null and b/Resources/Audio/White/Items/handling/ammobox_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/bodydrop1.ogg b/Resources/Audio/White/Items/handling/bodydrop1.ogg new file mode 100644 index 0000000000..a60834300c Binary files /dev/null and b/Resources/Audio/White/Items/handling/bodydrop1.ogg differ diff --git a/Resources/Audio/White/Items/handling/bodydrop2.ogg b/Resources/Audio/White/Items/handling/bodydrop2.ogg new file mode 100644 index 0000000000..966cea90e8 Binary files /dev/null and b/Resources/Audio/White/Items/handling/bodydrop2.ogg differ diff --git a/Resources/Audio/White/Items/handling/bodydrop3.ogg b/Resources/Audio/White/Items/handling/bodydrop3.ogg new file mode 100644 index 0000000000..09a24ab3a5 Binary files /dev/null and b/Resources/Audio/White/Items/handling/bodydrop3.ogg differ diff --git a/Resources/Audio/White/Items/handling/bodydrop4.ogg b/Resources/Audio/White/Items/handling/bodydrop4.ogg new file mode 100644 index 0000000000..45bbba6e5e Binary files /dev/null and b/Resources/Audio/White/Items/handling/bodydrop4.ogg differ diff --git a/Resources/Audio/White/Items/handling/book_drop.ogg b/Resources/Audio/White/Items/handling/book_drop.ogg new file mode 100644 index 0000000000..b492b665f5 Binary files /dev/null and b/Resources/Audio/White/Items/handling/book_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/book_pickup.ogg b/Resources/Audio/White/Items/handling/book_pickup.ogg new file mode 100644 index 0000000000..120a4e4721 Binary files /dev/null and b/Resources/Audio/White/Items/handling/book_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/cardboardbox_drop.ogg b/Resources/Audio/White/Items/handling/cardboardbox_drop.ogg new file mode 100644 index 0000000000..7070ba1c34 Binary files /dev/null and b/Resources/Audio/White/Items/handling/cardboardbox_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/cardboardbox_pickup.ogg b/Resources/Audio/White/Items/handling/cardboardbox_pickup.ogg new file mode 100644 index 0000000000..aa4e72129b Binary files /dev/null and b/Resources/Audio/White/Items/handling/cardboardbox_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/cloth_drop.ogg b/Resources/Audio/White/Items/handling/cloth_drop.ogg new file mode 100644 index 0000000000..5bf734caba Binary files /dev/null and b/Resources/Audio/White/Items/handling/cloth_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/cloth_pickup.ogg b/Resources/Audio/White/Items/handling/cloth_pickup.ogg new file mode 100644 index 0000000000..f46988887d Binary files /dev/null and b/Resources/Audio/White/Items/handling/cloth_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/component_drop.ogg b/Resources/Audio/White/Items/handling/component_drop.ogg new file mode 100644 index 0000000000..5366629ecf Binary files /dev/null and b/Resources/Audio/White/Items/handling/component_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/component_pickup.ogg b/Resources/Audio/White/Items/handling/component_pickup.ogg new file mode 100644 index 0000000000..b0759b87d3 Binary files /dev/null and b/Resources/Audio/White/Items/handling/component_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/crowbar_pickup.ogg b/Resources/Audio/White/Items/handling/crowbar_pickup.ogg new file mode 100644 index 0000000000..79b276f845 Binary files /dev/null and b/Resources/Audio/White/Items/handling/crowbar_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/disk_drop.ogg b/Resources/Audio/White/Items/handling/disk_drop.ogg new file mode 100644 index 0000000000..3174b88117 Binary files /dev/null and b/Resources/Audio/White/Items/handling/disk_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/disk_pickup.ogg b/Resources/Audio/White/Items/handling/disk_pickup.ogg new file mode 100644 index 0000000000..8f67406a5f Binary files /dev/null and b/Resources/Audio/White/Items/handling/disk_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/drinkglass_drop.ogg b/Resources/Audio/White/Items/handling/drinkglass_drop.ogg new file mode 100644 index 0000000000..43bb732db3 Binary files /dev/null and b/Resources/Audio/White/Items/handling/drinkglass_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/drinkglass_pickup.ogg b/Resources/Audio/White/Items/handling/drinkglass_pickup.ogg new file mode 100644 index 0000000000..fcd1c7d312 Binary files /dev/null and b/Resources/Audio/White/Items/handling/drinkglass_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/genetics.ogg b/Resources/Audio/White/Items/handling/genetics.ogg new file mode 100644 index 0000000000..9b28be68b5 Binary files /dev/null and b/Resources/Audio/White/Items/handling/genetics.ogg differ diff --git a/Resources/Audio/White/Items/handling/matchbox_drop.ogg b/Resources/Audio/White/Items/handling/matchbox_drop.ogg new file mode 100644 index 0000000000..8e4e276c9e Binary files /dev/null and b/Resources/Audio/White/Items/handling/matchbox_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/matchbox_pickup.ogg b/Resources/Audio/White/Items/handling/matchbox_pickup.ogg new file mode 100644 index 0000000000..82c23410e1 Binary files /dev/null and b/Resources/Audio/White/Items/handling/matchbox_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/matchbox_use.ogg b/Resources/Audio/White/Items/handling/matchbox_use.ogg new file mode 100644 index 0000000000..07a21c86f3 Binary files /dev/null and b/Resources/Audio/White/Items/handling/matchbox_use.ogg differ diff --git a/Resources/Audio/White/Items/handling/multitool_drop.ogg b/Resources/Audio/White/Items/handling/multitool_drop.ogg new file mode 100644 index 0000000000..67e0a41042 Binary files /dev/null and b/Resources/Audio/White/Items/handling/multitool_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/multitool_pickup.ogg b/Resources/Audio/White/Items/handling/multitool_pickup.ogg new file mode 100644 index 0000000000..cbd598ce89 Binary files /dev/null and b/Resources/Audio/White/Items/handling/multitool_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/paper_drop.ogg b/Resources/Audio/White/Items/handling/paper_drop.ogg new file mode 100644 index 0000000000..27ce2b3d1a Binary files /dev/null and b/Resources/Audio/White/Items/handling/paper_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/paper_pickup.ogg b/Resources/Audio/White/Items/handling/paper_pickup.ogg new file mode 100644 index 0000000000..55ae2b3d2d Binary files /dev/null and b/Resources/Audio/White/Items/handling/paper_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/paper_throw.ogg b/Resources/Audio/White/Items/handling/paper_throw.ogg new file mode 100644 index 0000000000..5c6a005b3e Binary files /dev/null and b/Resources/Audio/White/Items/handling/paper_throw.ogg differ diff --git a/Resources/Audio/White/Items/handling/paper_use.ogg b/Resources/Audio/White/Items/handling/paper_use.ogg new file mode 100644 index 0000000000..f2c07f993c Binary files /dev/null and b/Resources/Audio/White/Items/handling/paper_use.ogg differ diff --git a/Resources/Audio/White/Items/handling/sabre_drop.ogg b/Resources/Audio/White/Items/handling/sabre_drop.ogg new file mode 100644 index 0000000000..b5ccde81e8 Binary files /dev/null and b/Resources/Audio/White/Items/handling/sabre_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/screwdriver_pickup.ogg b/Resources/Audio/White/Items/handling/screwdriver_pickup.ogg new file mode 100644 index 0000000000..e15c4f1e3f Binary files /dev/null and b/Resources/Audio/White/Items/handling/screwdriver_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/toolbelt_drop.ogg b/Resources/Audio/White/Items/handling/toolbelt_drop.ogg new file mode 100644 index 0000000000..2a3c4655c4 Binary files /dev/null and b/Resources/Audio/White/Items/handling/toolbelt_drop.ogg differ diff --git a/Resources/Audio/White/Items/handling/toolbelt_pickup.ogg b/Resources/Audio/White/Items/handling/toolbelt_pickup.ogg new file mode 100644 index 0000000000..58e5d25979 Binary files /dev/null and b/Resources/Audio/White/Items/handling/toolbelt_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/toolbox_pickup.ogg b/Resources/Audio/White/Items/handling/toolbox_pickup.ogg new file mode 100644 index 0000000000..01a4ab4b3f Binary files /dev/null and b/Resources/Audio/White/Items/handling/toolbox_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/weldingtool_pickup.ogg b/Resources/Audio/White/Items/handling/weldingtool_pickup.ogg new file mode 100644 index 0000000000..da78b06b84 Binary files /dev/null and b/Resources/Audio/White/Items/handling/weldingtool_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/wirecutter_pickup.ogg b/Resources/Audio/White/Items/handling/wirecutter_pickup.ogg new file mode 100644 index 0000000000..078faaf432 Binary files /dev/null and b/Resources/Audio/White/Items/handling/wirecutter_pickup.ogg differ diff --git a/Resources/Audio/White/Items/handling/wrench_pickup.ogg b/Resources/Audio/White/Items/handling/wrench_pickup.ogg new file mode 100644 index 0000000000..860e0d7087 Binary files /dev/null and b/Resources/Audio/White/Items/handling/wrench_pickup.ogg differ diff --git a/Resources/Audio/White/Items/hit/sabre_hit1.ogg b/Resources/Audio/White/Items/hit/sabre_hit1.ogg new file mode 100644 index 0000000000..3253c7718f Binary files /dev/null and b/Resources/Audio/White/Items/hit/sabre_hit1.ogg differ diff --git a/Resources/Audio/White/Items/hit/sabre_hit2.ogg b/Resources/Audio/White/Items/hit/sabre_hit2.ogg new file mode 100644 index 0000000000..e74c7e550c Binary files /dev/null and b/Resources/Audio/White/Items/hit/sabre_hit2.ogg differ diff --git a/Resources/Audio/White/Items/hit/sabre_hit3.ogg b/Resources/Audio/White/Items/hit/sabre_hit3.ogg new file mode 100644 index 0000000000..afa73fee6f Binary files /dev/null and b/Resources/Audio/White/Items/hit/sabre_hit3.ogg differ diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml index ba8fd6fb25..c272adcbcd 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/ammunition.yml @@ -268,6 +268,139 @@ - id: MagazineShotgunIncendiary amount: 4 +# base BallisticAmmoProvider dispensers +- type: entity + parent: BaseItem + id: BaseAmmoProvider + abstract: true + components: + - type: ContainerContainer + containers: + ballistic-ammo: !type:Container + - type: Item + size: 30 + - type: Sprite + sprite: Objects/Storage/boxes.rsi + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cardboardbox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + # WD edit sounds end + +- type: entity + parent: BaseAmmoProvider + id: AmmoProviderShotgunShell + abstract: true + components: + - type: BallisticAmmoProvider + whitelist: + tags: + - ShellShotgun + capacity: 12 + +# Shotgun Shells +- type: entity + name: shotgun beanbag cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxBeanbag + description: A dispenser box full of beanbag shots, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunBeanbag + - type: Sprite + layers: + - state: boxwide + - state: shellbeanbag + +- type: entity + name: shotgun lethal cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxLethalshot + description: A dispenser box full of lethal pellet shots, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgun + - type: Sprite + layers: + - state: boxwide + - state: shelllethal + +- type: entity + name: shotgun slug cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxShotgunSlug + description: A dispenser box full of slugs, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunSlug + - type: Sprite + layers: + - state: boxwide + - state: shellslug + +- type: entity + name: shotgun flare cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxShotgunFlare + description: A dispenser box full of flare cartridges, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunFlare + - type: Sprite + layers: + - state: boxwide + - state: shellflare + +- type: entity + name: shotgun incendiary cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxShotgunIncendiary + description: A dispenser box full of incendiary cartridges, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunIncendiary + - type: Sprite + layers: + - state: boxwide + - state: shellincendiary + +- type: entity + name: shotgun practice cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxShotgunPractice + description: A dispenser box full of practice cartridges, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellShotgunPractice + - type: Sprite + layers: + - state: boxwide + - state: shellpractice + +- type: entity + name: tranquilizer cartridges dispenser + parent: AmmoProviderShotgunShell + id: BoxShellTranquilizer + description: A dispenser box full of tranquilizer cartridges, designed for riot shotguns. + components: + - type: BallisticAmmoProvider + proto: ShellTranquilizer + - type: Sprite + layers: + - state: boxwide + - state: shellslug + +>>>>>>> 640bbaf329 (Куча звуков из сс13 (#457)) + # Rifle - type: entity name: box of .20 rifle magazines diff --git a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml index 09525e7931..72c52b91e1 100644 --- a/Resources/Prototypes/Catalog/Fills/Boxes/general.yml +++ b/Resources/Prototypes/Catalog/Fills/Boxes/general.yml @@ -14,6 +14,20 @@ - 0,0,2,2 - type: Sprite state: box + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cardboardbox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/cardboardbox_drop.ogg + # WD edit sounds end - type: entity name: mousetrap box diff --git a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml index c70a2e2bbd..eadc08a8ea 100644 --- a/Resources/Prototypes/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/Entities/Clothing/Belt/belts.yml @@ -10,7 +10,21 @@ sprite: Clothing/Belt/utility.rsi - type: Clothing sprite: Clothing/Belt/utility.rsi + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/toolbelt_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/toolbelt_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/toolbelt_drop.ogg - type: Storage + storageInsertSound: + path: /Audio/Items/belt_equip.ogg + # WD edit sounds end + # TODO: Fill this out more. maxItemSize: Normal # TODO: Fill this out more. whitelist: @@ -125,27 +139,27 @@ drill: whitelist: tags: - - Powerdrill + - Powerdrill cutters_red: whitelist: tags: - - Wirecutter + - Wirecutter crowbar: whitelist: tags: - - Crowbar + - Crowbar crowbar_red: whitelist: tags: - - CrowbarRed + - CrowbarRed jaws: whitelist: tags: - - JawsOfLife + - JawsOfLife screwdriver_nuke: whitelist: tags: - - Screwdriver + - Screwdriver multitool: whitelist: tags: @@ -153,12 +167,25 @@ wrench: whitelist: tags: - - Wrench + - Wrench sprite: Clothing/Belt/belt_overlay.rsi - type: Appearance - type: entity - parent: ClothingBeltStorageBase + parent: ClothingBeltUtility # WD edit + id: ClothingBeltChiefEngineer + name: chief engineer's toolbelt + description: Holds tools, looks snazzy. + components: + - type: Sprite + sprite: Clothing/Belt/ce.rsi + - type: Clothing + sprite: Clothing/Belt/ce.rsi + - type: Storage + capacity: 105 + +- type: entity + parent: ClothingBeltSecurity # WD edit id: ClothingBeltAssault name: assault belt description: A tactical assault belt. @@ -169,9 +196,6 @@ sprite: Clothing/Belt/assault.rsi - type: Storage whitelist: - tags: - - CigPack - - Taser components: - Stunbaton - FlashOnTrigger @@ -441,11 +465,26 @@ name: security belt description: Can hold security gear like handcuffs and flashes. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/toolbelt_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/toolbelt_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/toolbelt_drop.ogg + # WD edit sounds end - type: Sprite sprite: Clothing/Belt/security.rsi - type: Clothing sprite: Clothing/Belt/security.rsi + # WD edit sounds start - type: Storage + storageInsertSound: + path: /Audio/Items/belt_equip.ogg + # WD edit sounds end whitelist: tags: - CigPack @@ -493,6 +532,12 @@ - type: ItemSlots slots: item: + # WD edit sounds start + insertSound: + path: /Audio/White/Items/equip/sabre_hide.ogg + ejectSound: + path: /Audio/White/Items/equip/sabre_equip.ogg + # WD edit sounds end name: Sabre insertVerbText: sheath-insert-verb ejectVerbText: sheath-eject-verb diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml index 76283da5fb..f74f2e6001 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml @@ -21,6 +21,17 @@ Heat: 0.80 - type: ExplosionResistance damageCoefficient: 0.90 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end #Alternate / slim basic armor vest - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml index 38c1fa1126..d69bfa7731 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml @@ -23,6 +23,17 @@ walkModifier: 0.9 sprintModifier: 0.9 - type: HeldSpeedModifier + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end - type: entity abstract: true @@ -42,6 +53,17 @@ type: StorageBoundUserInterface - type: StaticPrice price: 80 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml index 1a5688b6a7..2d2fda5c5c 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/misc.yml @@ -1,3 +1,20 @@ +- type: entity + parent: ClothingOuterBase + id: ClothingOuterMiscBase + abstract: true + components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end + - type: entity parent: ClothingOuterStorageBase id: ClothingOuterApron @@ -57,7 +74,7 @@ sprite: Clothing/OuterClothing/Misc/chef.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterHoodieBlack name: black hoodie description: Oh my God, it's a black hoodie! @@ -68,7 +85,7 @@ sprite: Clothing/OuterClothing/Misc/black_hoodie.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterHoodieGrey name: grey hoodie description: A grey hoodie. @@ -79,7 +96,7 @@ sprite: Clothing/OuterClothing/Misc/grey_hoodie.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterCardborg name: cardborg costume description: An ordinary cardboard box with holes cut in the sides. @@ -105,7 +122,7 @@ clothingPrototype: ClothingHeadHatHoodChaplainHood - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterPonchoClassic name: classic poncho description: A warm and comfy classic poncho. @@ -118,7 +135,7 @@ accent: SpanishAccent - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterRobesCult name: cult robes description: There's no cult without classic red/crimson cult robes. @@ -129,7 +146,7 @@ sprite: Clothing/OuterClothing/Misc/cultrobes.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterRobesJudge name: judge robes description: This robe commands authority. @@ -140,7 +157,7 @@ sprite: Clothing/OuterClothing/Misc/judge.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterPoncho name: poncho description: A warm and comfy poncho. @@ -153,7 +170,7 @@ accent: SpanishAccent - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterSanta name: santa suit description: Ho ho ho! @@ -165,7 +182,7 @@ # Is this wizard wearing a fanny pack??? - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterWizardViolet name: violet wizard robes description: A bizarre gem-encrusted violet robe that radiates magical energies. @@ -176,7 +193,7 @@ sprite: Clothing/OuterClothing/Misc/violetwizard.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterWizard name: wizard robes description: A bizarre gem-encrusted blue robe that radiates magical energies. @@ -187,7 +204,7 @@ sprite: Clothing/OuterClothing/Misc/wizard.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterWizardRed name: red wizard robes description: Strange-looking, red, hat-wear that most certainly belongs to a real magic user. @@ -198,7 +215,7 @@ sprite: Clothing/OuterClothing/Misc/redwizard.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterSkub name: skub suit description: 'Skub is crudely written on the outside of this cylindrical suit.' @@ -209,7 +226,7 @@ sprite: Clothing/OuterClothing/Misc/skubbody.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterPlagueSuit name: plague doctor suit description: A bad omen. @@ -220,7 +237,7 @@ sprite: Clothing/OuterClothing/Misc/plaguedoctorsuit.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterNunRobe name: nun robe description: Maximum piety in this star system. @@ -231,7 +248,7 @@ sprite: Clothing/OuterClothing/Misc/nunrobe.rsi - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterGhostSheet name: ghost sheet description: Spooky!!! @@ -246,7 +263,7 @@ - type: IdentityBlocker - type: entity - parent: ClothingOuterBase + parent: ClothingOuterMiscBase # WD edit id: ClothingOuterHospitalGown name: Hospital Gown description: Made from the wool of slaughtered baby lambs. The cruelty makes it softer. @@ -362,4 +379,4 @@ - state: equipped-OUTERCLOTHING-lines color: "#000000" - type: TemperatureProtection - coefficient: 0.3 \ No newline at end of file + coefficient: 0.3 diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml index 0329f82b5b..e4c5c5a704 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/base_clothinguniforms.yml @@ -27,6 +27,17 @@ tags: - ClothMade - WhitelistChameleon + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end - type: entity abstract: true diff --git a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml index d2be6be078..61a454c46a 100644 --- a/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml +++ b/Resources/Prototypes/Entities/Objects/Consumable/Drinks/drinks.yml @@ -41,6 +41,14 @@ id: DrinkGlassBase abstract: true components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/drinkglass_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/drinkglass_drop.ogg + # WD edit sounds end - type: Damageable damageContainer: Inorganic damageModifierSet: Glass diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml index 2a0b5ba118..14de6ed2c9 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/signaller.yml @@ -19,3 +19,14 @@ - type: Tag tags: - Payload + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml index c462a3cb03..24487dba9d 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/Electronics/triggers.yml @@ -29,6 +29,17 @@ volume: -2 - type: StaticPrice price: 40 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end - type: entity parent: TimerTrigger @@ -50,6 +61,17 @@ - type: DeviceLinkSink - type: StaticPrice price: 40 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end - type: entity parent: BaseItem @@ -68,3 +90,14 @@ - type: Tag tags: - VoiceTrigger + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Devices/geiger.yml b/Resources/Prototypes/Entities/Objects/Devices/geiger.yml index de4178ce7f..7a66d1dc97 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/geiger.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/geiger.yml @@ -31,4 +31,14 @@ Med: {state: geiger_on_med} High: {state: geiger_on_high} Extreme: {state: geiger_on_ext} - + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/multitool_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/multitool_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Misc/botparts.yml b/Resources/Prototypes/Entities/Objects/Misc/botparts.yml index fbbdca3909..9cf01c2630 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/botparts.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/botparts.yml @@ -12,3 +12,14 @@ - ProximitySensor - type: StaticPrice price: 40 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml index e389bc6b37..6a93f02c0f 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/dat_fukken_disk.yml @@ -5,6 +5,17 @@ description: A nuclear auth disk, capable of arming a nuke if used along with a code. Note from nanotrasen reads "THIS IS YOUR MOST IMPORTANT POSESSION, SECURE DAT FUKKEN DISK!" components: - type: NukeDisk + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + # WD edit sounds end - type: SpecialRespawn prototype: NukeDisk - type: Sprite @@ -35,3 +46,14 @@ state: icon - type: StaticPrice price: 1 # it's worth even less than normal items. Perfection. + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml index 2e33ef24a3..636032cd3c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/handcuffs.yml @@ -157,3 +157,14 @@ - type: Sprite sprite: Clothing/OuterClothing/Misc/straight_jacket.rsi state: icon + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/cloth_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/cloth_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Misc/paper.yml b/Resources/Prototypes/Entities/Objects/Misc/paper.yml index 1b5fc024b4..a28b8b673e 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/paper.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/paper.yml @@ -4,6 +4,23 @@ id: Paper description: 'A piece of white paper.' components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/paper_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/paper_drop.ogg + - type: EmitSoundOnUse + sound: + path: /Audio/White/Items/handling/paper_use.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/paper_drop.ogg + - type: EmitSoundOnThrow + sound: + path: /Audio/White/Items/handling/paper_throw.ogg + # WD edit sounds end - type: Sprite sprite: Objects/Misc/bureaucracy.rsi layers: diff --git a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml index 0cb605cee6..432eda8164 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Research/disk.yml @@ -11,6 +11,17 @@ - type: GuideHelp guides: - Science + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + # WD edit sounds end - type: entity parent: ResearchDisk @@ -61,6 +72,17 @@ price: 100 - type: StealTarget stealGroup: TechnologyDisk + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/disk_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/disk_drop.ogg + # WD edit sounds end - type: entity parent: TechnologyDisk diff --git a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml index ff946aefe9..daf19f5781 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/atmos.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/atmos.yml @@ -35,3 +35,14 @@ materialComposition: Steel: 400 Glass: 100 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/multitool_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/multitool_drop.ogg + # WD edit sounds end diff --git a/Resources/Prototypes/Entities/Objects/Tools/matches.yml b/Resources/Prototypes/Entities/Objects/Tools/matches.yml index e8601fcf35..620189fce9 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/matches.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/matches.yml @@ -59,6 +59,17 @@ id: Matchbox description: A small box of Almost But Not Quite Plasma Premium Matches. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/matchbox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/matchbox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/matchbox_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/matchbox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml index 71032290b1..ae9d865ba7 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/t-ray.yml @@ -24,3 +24,15 @@ - DroneUsable - type: StaticPrice price: 60 + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/multitool_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/Items/multitool_drop.ogg + # WD edit sounds end + diff --git a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml index 64efe53f43..f1dd587d18 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/toolbox.yml @@ -4,6 +4,14 @@ abstract: true components: - type: Sprite + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/toolbox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/toolbox_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/toolbox_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 8d85a13429..14742a3560 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -4,6 +4,14 @@ id: Wirecutter description: This kills the wire. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/wirecutter_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/wirecutter_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/wirecutter_drop.ogg @@ -50,6 +58,14 @@ id: Screwdriver description: Industrial grade torque in a small screwdriving package. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/screwdriver_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/screwdriver_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/screwdriver_drop.ogg @@ -94,6 +110,14 @@ id: Wrench description: 'A common tool for assembly and disassembly. Remember: righty tighty, lefty loosey.' components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/wrench_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/wrench_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/wrench_drop.ogg @@ -131,6 +155,14 @@ id: Crowbar description: A multipurpose tool to pry open doors and fight interdimensional invaders. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/crowbar_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/crowbar_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/crowbar_drop.ogg @@ -187,6 +219,14 @@ id: Multitool description: An advanced tool to copy, store, and send electrical pulses and signals through wires and machines components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/multitool_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/multitool_drop.ogg @@ -235,6 +275,14 @@ id: NetworkConfigurator description: A tool for linking devices together. Has two modes, a list mode for mass linking devices and a linking mode for advanced device linking. components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/multitool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/multitool_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/multitool_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 5606e4cbac..e3a56d2fdf 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -5,6 +5,14 @@ description: "Melts anything as long as it's fueled, don't forget your eye protection!" noSpawn: true components: + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/weldingtool_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/Items/welder_drop.ogg + # WD edit sounds end - type: EmitSoundOnLand sound: path: /Audio/Items/welder_drop.ogg diff --git a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml index 916aa068ae..c8e936ace0 100644 --- a/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml +++ b/Resources/Prototypes/Entities/Objects/Vehicles/buckleable.yml @@ -8,6 +8,13 @@ range: 10 volume: -10 enabled: false + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: MovementSpeedModifier weightlessModifier: 0 acceleration: 2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml index 94867fc7aa..458e9721a8 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/light_rifle.yml @@ -23,6 +23,20 @@ steps: 2 zeroVisible: false - type: Appearance + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/ammobox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + # WD edit sounds end # Boxes - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml index 04f9b7b238..e4412d8ca6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/magnum.yml @@ -22,6 +22,20 @@ steps: 2 zeroVisible: false - type: Appearance + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/ammobox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + # WD edit sounds end # Boxes - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml index 5e970b2b0b..af34c03aaf 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/pistol.yml @@ -23,6 +23,20 @@ steps: 2 zeroVisible: false - type: Appearance + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/ammobox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + # WD edit sounds end # Boxes - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml index f974dbb2ad..8163ad458f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Boxes/rifle.yml @@ -22,6 +22,20 @@ steps: 2 zeroVisible: false - type: Appearance + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/ammobox_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + - type: EmitSoundOnCollide + sound: + path: /Audio/White/Items/handling/ammobox_drop.ogg + # WD edit sounds end # Boxes - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml index 028c7713c0..2a27c8525f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml @@ -13,9 +13,14 @@ attackRate: 1.5 damage: types: - Slash: 17 #cmon, it has to be at least BETTER than the rest. + Slash: 19 #cmon, it has to be at least BETTER than the rest. + # WD edit sounds start soundHit: - path: /Audio/Weapons/bladeslice.ogg + path: /Audio/White/Items/hit/sabre_hit2.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/sabre_drop.ogg + # WD edit sounds start - type: Item size: Normal sprite: Objects/Weapons/Melee/captain_sabre.rsi diff --git a/Resources/Prototypes/Entities/Objects/Weapons/security.yml b/Resources/Prototypes/Entities/Objects/Weapons/security.yml index 93bc0a2dd3..ff5ad46e4f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/security.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/security.yml @@ -146,6 +146,17 @@ - type: StaticPrice price: 40 - type: Appearance + # WD edit sounds start + - type: EmitSoundOnPickup + sound: + path: /Audio/White/Items/handling/component_pickup.ogg + - type: EmitSoundOnDrop + sound: + path: /Audio/White/Items/handling/component_drop.ogg + - type: EmitSoundOnLand + sound: + path: /Audio/White/Items/handling/component_drop.ogg + # WD edit sounds end - type: GenericVisualizer visuals: enum.FlashVisuals.Burnt: diff --git a/Resources/Prototypes/Entities/Objects/base_item.yml b/Resources/Prototypes/Entities/Objects/base_item.yml index bcc8e0dce4..4f25a64ee4 100644 --- a/Resources/Prototypes/Entities/Objects/base_item.yml +++ b/Resources/Prototypes/Entities/Objects/base_item.yml @@ -8,6 +8,13 @@ - type: Clickable - type: InteractionOutline - type: MovedByPressure + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: EmitSoundOnCollide sound: path: /Audio/Effects/wall_bonk.ogg diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 44cac067d6..7460c52080 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -10,6 +10,13 @@ - type: InteractionOutline - type: Physics bodyType: Dynamic + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds start - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml index b4665a9b79..98a2cf349e 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/base_structuremachines.yml @@ -62,6 +62,13 @@ containers: machine_board: !type:Container machine_parts: !type:Container + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: Construction graph: Machine node: machine diff --git a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml index d4b7c1d3c9..b7bbc26d2b 100644 --- a/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml +++ b/Resources/Prototypes/Entities/Structures/Piping/Disposal/pipes.yml @@ -14,6 +14,13 @@ - type: SubFloorHide - type: Clickable - type: InteractionOutline + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: Physics bodyType: Static canCollide: false diff --git a/Resources/Prototypes/Entities/Structures/Power/apc.yml b/Resources/Prototypes/Entities/Structures/Power/apc.yml index ff8b7752ef..5522d2752f 100644 --- a/Resources/Prototypes/Entities/Structures/Power/apc.yml +++ b/Resources/Prototypes/Entities/Structures/Power/apc.yml @@ -135,6 +135,13 @@ priority: 1 - type: StaticPrice price: 500 + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end # APC under construction - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Power/cables.yml b/Resources/Prototypes/Entities/Structures/Power/cables.yml index de66dfc66d..60b41d53be 100644 --- a/Resources/Prototypes/Entities/Structures/Power/cables.yml +++ b/Resources/Prototypes/Entities/Structures/Power/cables.yml @@ -19,6 +19,13 @@ - type: Sprite drawdepth: ThinWire visible: false + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds start - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml index e7d938a3c9..10b136c093 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/base_structuresigns.yml @@ -13,6 +13,13 @@ - type: Physics bodyType: Static canCollide: false + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml index ad3997fe6d..131c03cd81 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml @@ -83,6 +83,13 @@ - type: Construction graph: AirAlarm node: air_alarm + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml index 60e097a46d..b1c0e8250b 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/switch.yml @@ -1,5 +1,42 @@ +# WD edit start +- type: entity + id: SwitchBase + abstract: true + components: + - type: Clickable + - type: InteractionOutline + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + - type: Damageable + damageContainer: Inorganic + damageModifierSet: Metallic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 80 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 40 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/metalbreak.ogg + - type: UseDelay + delay: 0.2 # prevent light-toggling auto-clickers. +# WD edit start + - type: entity id: SignalSwitch + parent: SwitchBase # WD edit name: signal switch description: It's a switch for toggling power to things. placement: @@ -9,22 +46,15 @@ components: - type: WallMount arc: 360 - - type: Clickable - - type: InteractionOutline - - type: Physics - canCollide: false - type: Sprite drawdepth: SmallObjects sprite: Structures/Wallmounts/switch.rsi state: on - type: SignalSwitch - - type: UseDelay - delay: 0.5 # prevent light-toggling auto-clickers. - type: Rotatable - type: Construction graph: SignalSwitchGraph node: SignalSwitchNode - - type: Fixtures - type: DeviceNetwork deviceNetId: Wireless - type: WirelessNetworkConnection @@ -34,9 +64,15 @@ - On - Off - Status + # WD edit start + - type: Physics + canCollide: false + - type: Fixtures + # WD edit end - type: entity id: SignalButton + parent: SwitchBase # WD edit name: signal button description: It's a button for activating something. placement: @@ -46,16 +82,10 @@ components: - type: WallMount arc: 360 - - type: Clickable - - type: InteractionOutline - - type: Physics - canCollide: false - type: Sprite drawdepth: SmallObjects sprite: Structures/Wallmounts/switch.rsi state: dead - - type: UseDelay - delay: 0.5 # prevent light-toggling auto-clickers. - type: SignalSwitch onPort: Pressed offPort: Pressed @@ -64,7 +94,6 @@ - type: Construction graph: SignalButtonGraph node: SignalButtonNode - - type: Fixtures - type: DeviceNetwork deviceNetId: Wireless - type: WirelessNetworkConnection @@ -94,9 +123,13 @@ path: /Audio/Effects/metalbreak.ogg params: volume: -8 + - type: Physics + canCollide: false + - type: Fixtures - type: entity id: ApcNetSwitch + parent: SwitchBase # WD edit name: apc net switch description: It's a switch for toggling lights that are connected to the same apc. placement: @@ -106,10 +139,6 @@ components: - type: WallMount arc: 360 - - type: Clickable - - type: InteractionOutline - - type: Physics - canCollide: false - type: Transform anchored: true - type: Sprite @@ -126,17 +155,15 @@ - type: Construction graph: LightSwitchGraph node: LightSwitchNode - - type: Fixtures - type: entity id: TwoWayLever + parent: SwitchBase # WD edit name: two way lever description: A two way lever. placement: mode: SnapgridCenter components: - - type: Clickable - - type: InteractionOutline - type: Sprite drawdepth: FloorObjects sprite: Structures/conveyor.rsi @@ -144,8 +171,6 @@ - state: switch-off map: ["enabled", "enum.TwoWayLeverState.Middle"] - type: TwoWayLever - - type: UseDelay - delay: 0.2 # prevent light-toggling auto-clickers. - type: Appearance - type: GenericVisualizer visuals: @@ -154,17 +179,6 @@ Right: { state: switch-fwd } Middle: { state: switch-off } Left: { state: switch-rev } - - type: Damageable - damageContainer: Inorganic - damageModifierSet: Metallic - - type: Destructible - thresholds: - - trigger: - !type:DamageTrigger - damage: 100 - behaviors: - - !type:DoActsBehavior - acts: [ "Destruction" ] - type: Construction graph: LeverGraph node: LeverNode diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml index b5356674aa..5068de6596 100644 --- a/Resources/Prototypes/Entities/Structures/base_structure.yml +++ b/Resources/Prototypes/Entities/Structures/base_structure.yml @@ -9,6 +9,13 @@ - type: Clickable - type: Physics bodyType: Static + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds end - type: Fixtures fixtures: fix1: diff --git a/Resources/Prototypes/Entities/Structures/conveyor.yml b/Resources/Prototypes/Entities/Structures/conveyor.yml index 4dc879b0f6..990da6fbc0 100644 --- a/Resources/Prototypes/Entities/Structures/conveyor.yml +++ b/Resources/Prototypes/Entities/Structures/conveyor.yml @@ -15,6 +15,13 @@ sprite: Structures/conveyor.rsi state: conveyor_started_cw drawdepth: FloorObjects + # WD edit sounds start + - type: MeleeSound + soundGroups: + Brute: + path: + "/Audio/Weapons/smash.ogg" + # WD edit sounds start - type: ApcPowerReceiver - type: ExtensionCableReceiver - type: Physics