Mervill
e6fa747f95
Don't show Station Event announcements to players in the lobby. ( #30886 )
2025-07-19 15:08:00 +10:00
AJCM-git
1e1b7fa468
Fix mid round antags not starting ( #28523 )
...
(cherry picked from commit 9a23a6c695400d2b583b1a77e503cd366fb28cdc)
2025-07-19 15:08:00 +10:00
MilenVolf
efd0b66036
Station event component and system tweaks ( #28331 )
2025-07-12 02:20:46 +10:00
Remuchi
1e363c7346
Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
...
This reverts commit 092dba42e5e6315c2320
2025-04-20 11:15:45 +07:00
DVONIKS
6c19771020
Revert "Upstream 04.04-18.04"
2025-04-20 06:34:09 +03:00
ilmenwe
8338b0c699
Removed Duplicate Using. Removed Unused Using. ( #2163 )
...
# Description
Removed duplicate using statements, removed unused using statements.
this will decrease the number of warnings a small bit, and decrease
unused dependency references in general.
---
# TODO
- [x] Remove double references.
- [x] Remove unused references.
---
# Changelog
🆑
- remove: double references in code
- remove: unused references in code that had double references.
Co-authored-by: ilmenwe <no@mail.com >
(cherry picked from commit 9b73c88feefff68223f083893505826dc021ddee)
2025-04-18 17:04:50 +03:00
sleepyyapril
08c1cc95e5
Prevent SecretRule From Picking Invalid Presets ( #27456 ) ( #1805 )
...
trying to fix the prelobby heisentest
we use votes anyway! fuck it, we ball
---------
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
(cherry picked from commit d5d071a6d974a72357830821364dd906fa4d948d)
2025-02-28 16:23:29 +03:00
Spatison
a2557f75a6
Upstream ( #129 )
2024-11-21 17:49:04 +07:00
DEATHB4DEFEAT
47b10a01b0
Catch-Up Cherry Pick 2 ( #944 )
...
# Description
Picked 400 commits (and skipped many, many more) from WizDen since #540 .
Stopped at commit 332f54a3aebe669f6e50d26e7b047f0bdc28e0fb (Lobby
Refactor).
---
# TODO
- [x] Pick
- [x] Compile
- [x] Fix runtime errors
- [ ] Fix up humanoid profile editor
- [ ] Test everything
---
# Changelog
🆑
- add: Merged 400 WizDen PRs. Happy testing!
---------
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com >
Co-authored-by: FungiFellow <151778459+FungiFellow@users.noreply.github.com >
Co-authored-by: osjarw <62134478+osjarw@users.noreply.github.com >
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com >
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Magnus Larsen <i.am.larsenml@gmail.com >
Co-authored-by: Hanz <41141796+Hanzdegloker@users.noreply.github.com >
Co-authored-by: Kukutis96513 <146854220+Kukutis96513@users.noreply.github.com >
Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com >
Co-authored-by: Gotimanga <127038462+Gotimanga@users.noreply.github.com >
Co-authored-by: Mangohydra <156087924+Mangohydra@users.noreply.github.com >
Co-authored-by: TsjipTsjip <19798667+TsjipTsjip@users.noreply.github.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com >
Co-authored-by: Morb <14136326+Morb0@users.noreply.github.com >
Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com >
Co-authored-by: KrasnoshchekovPavel <119816022+KrasnoshchekovPavel@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com >
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: KittenColony <149278380+KittenColony@users.noreply.github.com >
Co-authored-by: ShadowCommander <shadowjjt@gmail.com >
Co-authored-by: Mr. 27 <45323883+Dutch-VanDerLinde@users.noreply.github.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ERROR404 <100093430+ERORR404V1@users.noreply.github.com >
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: Jezithyr <jezithyr@gmail.com >
Co-authored-by: Psychpsyo <60073468+Psychpsyo@users.noreply.github.com >
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com >
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com >
Co-authored-by: Ciac32 <aknoxlor@gmail.com >
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com >
Co-authored-by: NotSoDana <75203942+NotSoDana@users.noreply.github.com >
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com >
Co-authored-by: Repo <47093363+Titian3@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
Co-authored-by: Michael <107807667+Doc-Michael@users.noreply.github.com >
Co-authored-by: Vasilis <vasilis@pikachu.systems >
Co-authored-by: Lamrr <96937466+Lamrr@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
Co-authored-by: Jay <67732946+DuskyJay@users.noreply.github.com >
Co-authored-by: Just-a-Unity-Dev <67359748+Just-a-Unity-Dev@users.noreply.github.com >
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com >
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com >
Co-authored-by: Tyzemol <85772526+Tyzemol@users.noreply.github.com >
Co-authored-by: Alzore <140123969+Blackern5000@users.noreply.github.com >
Co-authored-by: Pok <113675512+Pok27@users.noreply.github.com >
Co-authored-by: RumiTiger <154005209+RumiTiger@users.noreply.github.com >
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: Killerqu00 <47712032+Killerqu00@users.noreply.github.com >
Co-authored-by: Ty Ashley <42426760+TyAshley@users.noreply.github.com >
Co-authored-by: exincore <me@exin.xyz >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: Ygg01 <y.laughing.man.y@gmail.com >
Co-authored-by: Łukasz Mędrek <lukasz@lukaszm.xyz >
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: TurboTracker <130304754+TurboTrackerss14@users.noreply.github.com >
Co-authored-by: OnsenCapy <101037138+LGRuthes@users.noreply.github.com >
Co-authored-by: pigeonpeas <147350443+pigeonpeas@users.noreply.github.com >
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com >
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Rio <110139251+Riolume@users.noreply.github.com >
Co-authored-by: vorkathbruh <152932728+vorkathbruh@users.noreply.github.com >
Co-authored-by: Sphiral <145869023+SphiraI@users.noreply.github.com >
Co-authored-by: PrPleGoo <PrPleGoo@users.noreply.github.com >
Co-authored-by: Moomoobeef <62638182+Moomoobeef@users.noreply.github.com >
Co-authored-by: username <113782077+whateverusername0@users.noreply.github.com >
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com >
Co-authored-by: Джексон Миссиссиппи <tripwiregamer@gmail.com >
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com >
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com >
Co-authored-by: RiceMar1244 <138547931+RiceMar1244@users.noreply.github.com >
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com >
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com >
Co-authored-by: ike709 <ike709@users.noreply.github.com >
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com >
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
Co-authored-by: VMSolidus <evilexecutive@gmail.com >
Co-authored-by: Geekyhobo <66805063+Geekyhobo@users.noreply.github.com >
Co-authored-by: FoxxoTrystan <45297731+FoxxoTrystan@users.noreply.github.com >
# Conflicts:
# Content.Client/Input/ContentContexts.cs
# Content.Client/Lobby/LobbyState.cs
# Content.Client/Lobby/UI/HumanoidProfileEditor.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml
# Content.Client/Lobby/UI/LobbyGui.xaml.cs
# Content.Client/Preferences/UI/CharacterSetupGui.xaml.cs
# Content.Client/UserInterface/Systems/MenuBar/Widgets/GameTopMenuBar.xaml
# Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Spillable.cs
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Content.Shared/Alert/AlertType.cs
# Content.Shared/Input/ContentKeyFunctions.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
# Resources/ConfigPresets/EinsteinEngines/default.toml
# Resources/Prototypes/Alerts/alerts.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/coats.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
# Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
# Resources/Prototypes/Recipes/Crafting/Graphs/improvised/makeshiftstunprod.yml
# Resources/Prototypes/Voice/speech_emotes.yml
# Resources/keybinds.yml
2024-10-19 14:53:37 +07:00
VMSolidus
08822e34ba
Cherry-Pick Antag Refactor ( #734 )
...
This cherry-pick's Wizden's Antag Refactor, which is needed for all
future antag updates, as well as for me to cherry-pick over Cultists(Who
are going to need some editing to fit the antag refactor), Changelings,
Heretics, and Wizards. I actually selected the White-Dream-Public
version of the Antag Refactor, due to it having commits made tailored to
our repository, so it comes prepackaged with all the changes necessary
for our repo-specific content.
https://github.com/frosty-dev/ss14-wwdp/pull/10
Signed-off-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com >
Co-authored-by: ThereDrD <88589686+ThereDrD0@users.noreply.github.com >
Co-authored-by: Jeff <velcroboy333@hotmail.com >
Co-authored-by: Timemaster99 <57200767+Timemaster99@users.noreply.github.com >
Co-authored-by: Timemaster99 <elijahrobot@gmail.com >
Co-authored-by: luckywill339@gmail.com <luckywill339@gmail.com >
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com >
Co-authored-by: Azzy <azzydev@icloud.com >
2024-08-15 10:11:48 -07:00
DEATHB4DEFEAT
e3bc8d4c0e
Random Announcer System ( #415 )
...
# Description
Replaces every instance of station announcements with an announcer
system meant to handle audio and messages for various announcers defined
in prototypes instead of each server replacing the scattered files
inconsistently with whatever singular thing they want to hear announce
messages.
# TODO
- [x] Systems
- [x] CVars
- [x] Sounds
- [x] Client volume slider
- [x] Collections
- [x] Prototypes
- [x] Events
- [x] Commands
- [x] PR media
- [x] Deglobalize
- [x] Passthrough localization parameters to overrides
- [x] Make every announcer follow the template
- [x] Move sounds into subdirectories
- [x] Make announcement IDs camelCased
- [x] Test announcement localizations
- [x] Weighted announcer lists
---
<details><summary><h1>Media</h1></summary>
<p>
https://github.com/Simple-Station/Parkstation-Friendly-Chainsaw/assets/77995199/caf5805d-acb0-4140-b344-875a8f79e5ee
</p>
</details>
---
# Changelog
🆑
- add: Added 4 new announcers that will randomly be selected every shift
2024-07-12 16:13:50 -04:00
Rainfey
b9d2f5a409
Refactor antag rule code ( #23445 )
...
* Initial Pass, Rev, Thief
* Zombie initial pass
* Rebase, Traitor
* Nukeops, More overloads
* Revert RevolutionaryRuleComponent
* Use TryRoundStartAttempt, Rewrite nukie spawning
* Comments, Add task scheduler to GameRuleSystem
* Zombie initial testing done
* Sort methods, rework GameRuleTask
* Add CCVar, Initial testing continues
* Might as well get rid of the obsolete logging
* Oops, i dont know how to log apparently
* Suggested formatting fixes
* Suggested changes
* Fix merge issues
* Minor optimisation
* Allowed thief to choose other antags
* Review changes
* Spawn items on floor first, then inserting
* minor tweaks
* Shift as much as possible to ProtoId<>
* Remove unneeded
* Add exclusive antag attribute
* Fix merge issues
* Minor formatting fix
* Convert to struct
* Cleanup
* Review cleanup (need to test a lot)
* Some fixes, (mostly) tested
* oop
* Pass tests (for real)
---------
Co-authored-by: Rainfall <rainfey0+git@gmail.com >
Co-authored-by: AJCM <AJCM@tutanota.com >
(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
Kara
fc393559e4
Don't double-dip survival intensity scaling ( #25570 )
...
(cherry picked from commit de36ebe2dfbcba11866b61a69d46c2d27077ee76)
2024-03-07 00:52:54 +01:00
Kara
d35e2f39a7
Roundstart variation game rules ( #24397 )
...
* Raise `StationPostInitEvent` broadcast
* Basic variation pass handling
* standardize names + rule entities
* why does it work like that?
* add to defaults
* light break variation pass
* ent spawn entry
* move some stationevent utility functions to gamerule + add one for finding random tile on specified station
* forgot how statistics works
* powered light variation pass is good now
* station tile count function
* public method to ensure all solutions (for procedural use before mapinit)
* move gamerulesystem utility funcs to partial
* ensure all solutions before spilling in puddlesystem. for use when spilling before mapinit
* trash & puddle variation passes!
* oh yeah
* ehh lets live a little
* std
* utility for game rule check based on comp
* entprotoid the trash spawner oops
* generalize trash variation
* use added instead of started for secret rule
* random cleanup
* generic replacement variation system
* Wall rusting variation rule
* account for modifying while enumerating
* use localaabb
* fix test
* minor tweaks
* reinforced wall replacer + puddletweaker
(cherry picked from commit cc24ba6a317c4bee84ffa1eda8397c255ca92be9)
2024-02-08 12:03:43 +01:00
metalgearsloth
b1ee2d48ff
Unrevert audio ( #21330 )
...
Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com >
2023-12-02 20:16:36 +01:00
DrSmugleaf
6bb3ad25f6
Replace all T : Component constraints with T : IComponent ( #21073 )
2023-10-20 15:30:20 +02:00
Leon Friedrich
5e737cdb4d
Add new entity spawn test & fix misc bugs ( #19953 )
2023-10-20 15:29:43 +02:00
DrSmugleaf
a88e747a0b
Refactor serialization copying to use source generators ( #19412 )
2023-08-22 18:14:33 -07:00
metalgearsloth
b0b1597aad
Fix cargo gifts ( #18449 )
...
Some of the IDs were invalid and no typeserializer.
2023-07-30 12:53:54 -06:00
metalgearsloth
d4a85afb88
Update GetComponents for IEnumerable ( #18395 )
2023-07-30 03:34:41 +10:00
Moony
e92a8fedab
Refactor stations to properly use entity prototypes. (stationsv3) ( #16570 )
...
* Update StationSpawningSystem.cs
Web-edit to allow feeding in an existing entity.
* Update StationSpawningSystem.cs
value type moment
* Update StationSpawningSystem.cs
* Oh goddamnit this is a refactor now.
* awawawa
* aaaaaaaaaaa
* ee
* forgot records.
* no records? no records.
* What's in a name?
* Sloth forcing me to do the refactor properly smh.
* e
* optional evac in test.
* tests pls work
* awa
---------
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com >
2023-05-19 15:45:09 -05:00
Nemanja
51506e3d30
Fix station events that use update loops ( #15834 )
2023-04-29 13:15:06 +10:00
Nemanja
59349b1b9b
Gamerule Entities, Take 2 ( #15765 )
2023-04-25 20:23:14 -04:00
metalgearsloth
d3552dae00
Revert "Gamerule Entities" ( #15724 )
2023-04-24 16:21:05 +10:00
Nemanja
39cc02b8f9
Gamerule Entities ( #15513 )
2023-04-24 15:20:51 +10:00
metalgearsloth
3b3963083b
Replace GridEntityId with Owner ( #12743 )
2022-12-12 14:59:02 +11:00
metalgearsloth
6c76061887
Content changes for mapgrid kill ( #12567 )
2022-11-22 13:12:04 +11:00
metalgearsloth
c0abea8047
Content side for removing IMap / IMapGrid comps ( #12357 )
2022-11-04 10:12:25 +11:00
metalgearsloth
c9a2ab1cee
Remove transform methods from mapgrid ( #12233 )
2022-11-01 11:27:18 +11:00
Kara
3fd226d9f0
Extended rework & ramping event scheduler ( #11362 )
2022-10-18 19:51:47 -07:00
Morber
efb17f1e98
Nuke ops war anounce sound ( #9035 )
2022-07-15 02:16:41 -07:00
Kara
b9a0894d7c
Event refactor ( #9589 )
...
* Station event refactor
* Remove clientside `IStationEventManager`
we can just use prototypes
* Basic API idea
* Cruft
* first attempt at epicness
* okay yeah this shit is really clean
* sort out minor stuff
* Convert `BreakerFlip`
* `BureaucraticError` + general cleanup
* `DiseaseOutbreak`
* `FalseAlarm`
* `GasLeak`
* `KudzuGrowth`
* `MeteorSwarm`
* `MouseMigration`
* misc errors
* `PowerGridCheck`
* `RandomSentience`
* `VentClog`
* `VentCritters`
* `ZombieOutbreak`
* Rewrite basic event scheduler
* Minor fixes and logging
* ooooops
* errors + fix
* linter
* completions, `RuleStarted` property, update loop fixes
* Tweaks
* Fix #9462
* Basic scheduler update fix, and fixes #8174
* Add test
* UI cleanup
* really this was just for testing
2022-07-10 20:48:41 -05:00
