Commit graph

141 commits

Author SHA1 Message Date
VigersRay
aa38c32b65 upstream 2024-09-16 12:40:23 +03:00
pofitlo
ffc3912863
Syndicate teleporter (#376) 2024-09-16 11:09:57 +03:00
xprospero
aa6d5f9573
Rubber chicken toy (#29637)
* -added rubber chicken toy

* -Removed faulty SolutionContainerManager type

-Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide.

* fixed raw material cost

* adjusted material composition

* - Added rubber chicken to CrateFunToyBox
- Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml

---------

Co-authored-by: gambesun <116504990+gambesun@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2024-09-16 01:57:53 +02:00
VigersRay
2dea3ba1bc Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Resources/Prototypes/Voice/disease_emotes.yml
#	Resources/ServerInfo/Guidebook/ChemicalTabs/Pyrotechnic.xml
#	Resources/ServerInfo/Guidebook/Engineering/AccessConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
#	Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
#	Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
#	Resources/ServerInfo/Guidebook/Engineering/Fires.xml
#	Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
#	Resources/ServerInfo/Guidebook/Engineering/Networking.xml
#	Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
#	Resources/ServerInfo/Guidebook/Engineering/TEG.xml
#	Resources/ServerInfo/Guidebook/Glossary.xml
#	Resources/ServerInfo/Guidebook/Medical/Chemist.xml
#	Resources/ServerInfo/Guidebook/Medical/Cryogenics.xml
#	Resources/ServerInfo/Guidebook/NewPlayer/CharacterCreation.xml
#	Resources/ServerInfo/Guidebook/Science/APE.xml
#	Resources/ServerInfo/Guidebook/Security/Forensics.xml
#	Resources/ServerInfo/Guidebook/Survival.xml
#	Resources/Textures/Structures/Wallmounts/signs.rsi/meta.json
2024-08-18 19:27:44 +03:00
Unkn0wn_Gh0st
73331416e3
Coughing and coughing changes (#30893)
* Coughing

* Merge branch 'space-wizards:master' into coughing

* Coughing

* Coughing
2024-08-18 12:00:42 -04:00
VigersRay
012be1afc2 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Options/UI/Tabs/MiscTab.xaml.cs
#	Content.Server/Anomaly/Effects/BluespaceAnomalySystem.cs
2024-08-17 17:27:37 +03:00
Token
27793111bb
Plants scream mutation now have more scream variety (#30862)
* seed screams now SoundCollectionSpecifier
More types of scream sounds

* plants scream mutation have 10+ scream types

* plant scream reduce scream volume
And scream powerness get's from yml instead of hardcode, so from prototypes could be changed pretty much easilly

* plants review change
2024-08-16 22:09:25 -04:00
SplikZerys
2a6e0cd588 Idk why it's so 2024-07-17 15:33:05 -07:00
pacable
ea7b989540
Удалена музыка по требованию правообладателя (#206)
* у ОСЩ майндщилд

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

* Revert "у ОСЩ майндщилд"

This reverts commit 595f8867cc29c5cf248d9da06c03de22ed80eae4.

* удалил музыку qdzava

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>

---------

Signed-off-by: JDtrimble <igor.mamaev1@gmail.com>
2024-07-16 19:12:33 +03:00
pacable
498b64c13b
Накипевшие изменения (#156)
* - remove: Оружейка гамма кода убрана до переработки
- tweak: Пистолет ОСЩ обладает самозарядкой
- fix: Несколько мелких фиксов
Начал переводить меню крафта

* fix
2024-06-28 07:43:22 +03:00
VigersRay
8fedc6f64a Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Options/UI/Tabs/AudioTab.xaml
#	Content.Client/Options/UI/Tabs/AudioTab.xaml.cs
#	Content.Shared/Preferences/Loadouts/RoleLoadout.cs
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml
#	Resources/Prototypes/Loadouts/role_loadouts.yml
#	Resources/Prototypes/SoundCollections/NukeMusic.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/migration.yml
2024-06-23 21:07:25 +03:00
marbow
5ee79b51ca
Sound Station 14 like a nukie song (#29345)
Nukie song!!
2024-06-23 01:09:41 +10:00
VigersRay
f46fc25185 убрал title3.ogg 2024-06-13 16:43:29 +03:00
Rinary
3450799bc2
Фикс Ошибок Yaml linter, CRLF Check проекта (#109)
* Added Sound in Lobby

* Loadout Groups Locale Fix

* Может сначала укажем спрайт а потом указываем стейты с этого спрайта?

* Sprite in Icon

* Убрал лишнее из Audio

* SS13 Lobby Sound

* кто-то додумался запихнуть русские символы в название файла) Теперь git grep умирает от кодировки

* Прикольный вендомат(покупаешь за 1200, продаешь за 1290)

* backslash in file names fix

* No Cirilic in File Names
2024-06-13 16:35:57 +03:00
VigersRay
fc18c0a4a7 Удалил дубликаты музыки 2024-06-13 10:00:33 +03:00
VigersRay
f19ef320ea Убрал часть музыки 2024-06-13 09:16:26 +03:00
pacable
d196f50a67
Добавлена музызка от qdzava's(#57)
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-11 04:01:12 +03:00
VigersRay
5f10d21fa6 Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Commands/PlayTimeCommands.cs
#	Content.Server/Preferences/Managers/ServerPreferencesManager.cs
#	Content.Server/Station/Systems/StationSpawningSystem.cs
#	Content.Server/StationEvents/Events/BreakerFlipRule.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/backpack.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/duffelbag.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/StarterGear/satchel.yml
#	Resources/Prototypes/Catalog/Fills/Backpacks/duffelbag.yml
#	Resources/Prototypes/Entities/Mobs/base.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/tanks.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/Roles/Antags/traitor.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
#	Resources/Prototypes/Roles/Jobs/Cargo/salvage_specialist.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/clown.yml
#	Resources/Prototypes/Roles/Jobs/Civilian/musician.yml
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
#	Resources/Prototypes/Roles/Jobs/Medical/chemist.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Science/research_director.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
2024-06-04 09:41:27 +03:00
RenQ
3e2eb6cc7a
"Death gasp" for a moth (#28409) 2024-06-03 14:48:01 -04:00
Vigers Ray
5775d4cdef
Merge sunrise build (#2)
* commit
2024-05-31 02:16:18 +03:00
lzk
a2f4540cb5
Remake gasp popup to emote (#27736) 2024-05-28 19:56:41 -04:00
T-Stalker
104c2afe69
New Salvage song: Deadline (#27707)
Deadline
2024-05-06 13:51:33 +10:00
metalgearsloth
d1a5d35623
Expeditions audio tweaks (#27524)
- Now uses a SoundCollection.
- Now properly handles going between maps (audio rework mucho wow).
- GetAudioLength used so it can properly countdown ANY song (wow audio rework wow wow).
2024-05-06 10:19:43 +10:00
nao fujiwara
316a3d7f4d
added a bunch more fox noises (#27578)
* fuck it we ball

* added recommended copyright information

* revised copyright license

* revised copyright license x2

* finalized the fops

# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other

* added new sounds to the overall fox parent mob because we forgot oopsie
2024-05-02 14:35:10 +02:00
MilenVolf
7ee18433c8
New borg sounds (#27205)
* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor
2024-04-28 21:38:31 -07:00
Tayrtahn
b1ba6b5bb6
Arcade machine improvements (#24200)
* Give 'em something to talk about

* Wire panel visuals

* Wire graphics tweak

* More ads and thanks

* More ads for a noisy arcade

* New screen for space villain machines

* Implement EmitSoundIntervalComponent and a bunch of arcade noises

* Require power for sounds

* Allow earlier startup intervals

* Orange glow

* Audio attributions

* Include the PR link

* Replace EmitSoundInterval with expanded SpamEmitSound

* Remove pacman-themed arcade sounds

* Documentation good.

* Updated methods to use Entity<T>

* Refactored SpamEmitSound to get rid of accumulator and chance.

* Fixed prewarm logic

* Moved stuff to Shared

* Fix outdated YAML

* Better prediction, auto pause handling

* Make enable/disable reset the timer instead of trying to save it.
2024-03-28 17:28:45 +11:00
Sphiral
a0cc87c267
Church Bells (#26030)
* Adds Church Bells

* I'm dumb.

* The bell is no longer haunted.

* forgot attributions

* change sounds so scary law no hunt

* One day I'll stop needing to make an immediate micro-commit. One day.

* God damn it.
2024-03-26 00:24:00 +11:00
he1acdvv
806c0d162f
New Nukie Song (#25765)
made a new nukie song lel.
2024-03-09 12:44:54 +11:00
Firewatch
93d820f315
Syndicate Decoy Bundle + Snap Pops (#25333)
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake

⭐

* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
2024-02-28 16:53:46 -05:00
Whisper
1de102d08e
Juice that makes you Weh! (but real!) (#25132)
* Juice that makes you Weh!

* Remove dupe

* updated the localization files

* try to fix error
2024-02-26 00:54:07 +11:00
Krunklehorn
1de3f24f16
Add sfx for writing on paper (#25257)
* Initial commit

* Moved params to sound

* Removed type tag

* Removed null check

* Forced default
2024-02-16 16:48:18 -07:00
Tayrtahn
75e47fff9e
Add verbs to Open/Close Openable containers, and add optional seals (#24780)
* Implement closing; add open/close verbs

* Add breakable seals

* Allow custom verb names; make condiment bottles closeable

* Remove pointless VV annotations and false defaults

* Split Sealable off into a new component

* Should have a Closed event too

* Oh hey, there are icons I could use

* Ternary operator

* Add support for seal visualizers

* Moved Sealable to Shared, added networking

* Replaced bottle_close1.ogg
2024-02-13 17:08:07 -05:00
themias
5c75117749
Add cowboy hats and boots (#24299)
* Add cowboy hats and boots

* oops

* audio fix and attribution
2024-01-28 14:23:16 +11:00
Kara
a0804bed67
Readd Atomic Amnesia MMX (#24575) 2024-01-25 21:48:29 -08:00
Kara
ab47ad84a3
Prune lobby music slightly (#24480) 2024-01-25 09:08:29 -05:00
themias
557e5eb476
Add reagent specific footstep sounds (#24406)
* Add sticky footsteps

* Update Resources/Audio/Effects/Footsteps/attributions.yml

Co-authored-by: ike709 <ike709@users.noreply.github.com>

---------

Co-authored-by: ike709 <ike709@users.noreply.github.com>
2024-01-22 23:18:33 -05:00
Kara
818b07ecf8
Destruction & impact sound rework pass 1 (#24282)
* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist
2024-01-19 10:33:07 -05:00
Emisse
61704f009b
Title2 (#24254)
* title2

* Update lobby.yml

* Update attributions.yml

* real
2024-01-19 13:47:19 +11:00
Fahasor
fa3da1ab82
Whistle for security (second try) (#23945)
* Move Exclamation entity

* Add Whistle Component and Whistle System

* Add BaseWhistle prototype

* Add sound to BaseWhistle

* Add SecurityWhistle prototype

* Add Sprite and Icon to SecurityWhistle

* Add whistleExclamation prototype

* Fix SecurityWhistle prototype

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>

* Add whistles to sec vendingMachine

* Revert "Add sound to BaseWhistle"

This reverts commit 0c2eeab1286fb778ed7a845e59c642f667582a4a.

* Add sounds for BaseWhistle

* Make atributions compact

* Remove unnecessary spaces

* Make WhistleSystem class sealed

* Remove possibility to exclamate one person from WhistleComponent

* Remove delay from WhistleSystem

Increase delay

* Remove unnecessary HashSet

* Try replace Resolve

* Refactor sound emmiting

* Rework spawn of exclamation

* Move WhistleComponent from Server to Shared

* Edit WhistleComponent because of moving

* Move WhistleSystem from Server to Client

* Edit WhistleSystem because of moving

* Add new event

* Add server part of WhistleSystem

* Modify system for prediction

* Add documentation to WhistleComponent

* Revert "Modify system for prediction"

This reverts commit 89abb290571ff47deb5491b0f720f6bde079110b.

* Revert "Add server part of WhistleSystem"

This reverts commit ca52ca081f30fb164f401c1818d08531f02af284.

* Revert "Add new event"

This reverts commit 5ca9694757c94c03ca72d5b2f56f5f23503a3263.

* Move system from client to shared

* Modify whistle system because of moving

* Separate checks and action

* Organize file folders according to conventions

* Make component Networked

* Change trigger component for WhistleSystem

* Put indents betwen methods

* Rework WhistleExclamation prototype

* Change variable name

* Add serializer to WhistleComponent

* Rename one variable

* add predict possibility to Shared

* add Client part of prediction

* Add Server part of prediction

* Increase whistle distance

* Prevent spawn for invisible entities

* WhistleComponent now use file-scoped namespace

* Delete unnecessary part from MakeLoudWhistle

* Add Resolve check

* Delete Server and Client part for prediction

* Make system prediction properly

* Change prediction behaviour

* Fix unexpected error occured

* Avoid using obsolete methods

* Add comments

* Update DataField to make it shorter

* Update size for new size system

* Prevent ping for invisible entities for real now

* Avoid triggering unnecessary debug asserts

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
2024-01-12 01:05:28 -07:00
brainfood1183
b06d9cb64a
Adds Hellspawn (Nar'Sie demon mob) (#20291)
* HellSpawn Mob

* added spawner

* summary for the namespace

* larger collider, cannot enter single tile corridors.

* fix

* remove duplicate from yml, fix attributions.

* moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions

* removed flammable from hellspawn
removed the healing effect from firestarter ability (healing can be separate ability).

* Update attributions.yml

fix attributions

* fix

* fix
2024-01-04 05:53:15 -07:00
Darkie
1c8eb2f3de
Added a regular and an engraved zippo (flippo) lighter (#23020)
* Added the zippo and engraved zippo. Added the engraved zippo in the detective's coat.

* Added copyright.

* Renamed to Flippo

* Gave the Flippo new sounds. Moved the lighter sound collections to their own folder in Items.

* Fixed YAML issues that showed up with moving the lighter noises to their own folder.

* Added the detective's Flippo as a thief objective, with half the weight of the forensic scanner.
2023-12-27 15:47:35 -07:00
Kara
e4a227ff0d
Explosion SFX juicing + higher persistence (#22544) 2023-12-16 03:57:46 +11:00
Nim
460bfdc73c
Space cobra 1.1 (#20298)
* space cobra again

* didn't see

* fix

* Dirty

* space spider

* license

* component

* sprite update

* visibility

* fix

* fix visibility
2023-12-06 20:25:57 -05:00
brainfood1183
63bc4bf6b1
Banana Clown Outfit (#22068)
* Banana Clown Outfit

* Update SkatesComponent.cs
2023-12-04 16:12:02 -07:00
Whisper
5362ba3009
Add vibe ace to the lobby playlist (#21751) 2023-11-19 14:49:33 -08:00
brainfood1183
40b36d1dc5
Roller Skates (#20257)
* adds roller skates

* removed hascomp and changed addcomp to ensurecomp, modified to _random, _stun

* remove icon from type: sprite

* sorted dependencies

* skates no longer added skater component to user, movmeentspeedmodifier and damagehighspeedimpact had access removed.

* fixes

* fixes
2023-11-05 19:42:37 -07:00
Nim
3d1333280a
The Mobs of the Living Light (#21338)
* The Mobs of the Living Light

* fix

* sound

* radius

* minor sprite changes
2023-11-05 19:24:14 -07:00
deltanedas
4c9246589b
add flash and dash sounds to paracusia (#20983)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-10-13 22:49:04 -07:00
Pieter-Jan Briers
bf16698efa
Portable Generator Rework (#19302) 2023-08-25 11:40:42 -07:00
T-Stalker
322b5f71b4
Add two more reboot themes (#19219) 2023-08-18 23:58:44 +10:00