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
Leon Friedrich
52cb6dab3e
Atmos device performance improvements ( #26493 )
...
* Atmos device performance improvements
* AtmosDirection perf improvements
* Fix errors
* Add GasTileOverlayComponent arguments
* Make excite no longer invalidate a tile
2024-07-11 20:40:16 -07:00
VMSolidus
30fa1207b2
Update Submodule to 219.2.0 ( #536 )
...
Uses the following Cherry-Picks:
https://github.com/space-wizards/space-station-14/pull/26994
https://github.com/space-wizards/space-station-14/pull/26518
https://github.com/space-wizards/space-station-14/pull/26279
https://github.com/space-wizards/space-station-14/pull/24946
https://github.com/space-wizards/space-station-14/pull/27188
Requires:
https://github.com/Simple-Station/Einstein-Engines/pull/535
https://github.com/Simple-Station/Einstein-Engines/pull/534
---------
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
Co-authored-by: Jake Huxell <JakeHuxell@pm.me >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: 0x6273 <0x40@keemail.me >
Co-authored-by: DEATHB4DEFEAT <zachcaffee@outlook.com >
2024-07-11 17:40:02 -07:00
Ed
25dbae8f9c
Lock Anomaly generator to research access ( #24464 )
...
* small patch
* fix
* remove garbage
* fix
* moved to shared events
* fix
* LocId
---------
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
(cherry picked from commit 498ad2d5d714c73d9212bda9d3d89d53b2001e04)
2024-02-08 12:11:07 +01:00
Kara
03b3e36d43
Examine prediction ( #23565 )
...
* Initial prediction
* new group handling
* groups for all examines that use multiple rn
* compile
* why was it doing this??
* handle newlines with sorting properly
(cherry picked from commit 0ae3858b69b695697ea9300609460f8ddb70ebbf)
2024-01-26 21:48:02 +01:00
tgrkzus
f2258e2611
tanks only produce noise with sufficient valve pressure ( #22401 )
2023-12-16 20:30:32 +01:00
Vyacheslav Kovalevsky
e4ec612f62
Add gas tanks throw damage ( #20035 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-12-16 19:13:50 +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
themias
58eb6420dd
Fix negative tank pressure ( #21401 )
2023-11-12 20:31:38 +01:00
Leon Friedrich
e66c0b5035
Un-revert IPlayerManager refactor ( #21244 )
2023-10-31 19:00:44 +01:00
DrSmugleaf
9cc8a7fc81
Remove 700 usages of Component.Owner ( #21100 )
2023-10-20 15:31:13 +02:00
metalgearsloth
c9648da984
Content update for NetEntities ( #18935 )
2023-09-27 21:59:12 +02:00
DrSmugleaf
c71f97e3a2
Refactor actions to be entities with components ( #19900 )
2023-09-08 18:16:05 -07:00
Errant
63c7bca04e
Add pressure limit to gas tanks ( #19879 )
2023-09-06 21:37:23 -08:00
Slava0135
81388f77ed
Add gas tank valve ( #19830 )
2023-09-05 09:20:05 -08:00
Ilya246
ca6a92a746
[tweak] make maxcaps sqrt-scaling ( #16016 )
2023-05-02 16:12:09 -06:00
keronshb
f6e1dc15ac
Adds delay to internals alert ( #13195 )
...
closes https://github.com/space-wizards/space-station-14/issues/12721
2023-01-01 16:03:19 -08:00
Leon Friedrich
6917b0fe17
Misc audio and related changes for replays ( #12578 )
2022-11-22 11:49:48 +11:00
corentt
37997d4dda
Stop reducing output pressure of gastank when low pressure ( #11818 )
...
* stop reducing output of gastank when low pressure
* fix display internal alert
* rephrase moles quantity check
2022-11-08 14:23:41 -06:00
Kognise
aba2462a97
Internals improvements ( #11677 )
2022-10-03 18:01:20 -07:00
metalgearsloth
bb0229e391
Add gas selling to tanks too ( #11304 )
2022-09-16 07:04:25 -07:00
theashtronaut
868abaca5c
Gas Analyzer can now scan pipes/devices along with the environment ( #10976 )
2022-09-08 07:22:14 -07:00
Leon Friedrich
55665766cf
Fix gas tank bug ( #10197 )
...
* Fix gas tank bug
* avoid partial connects
* Revert "avoid partial connects"
This reverts commit 598a871442b74bfe05948e3df8ed47722315722d.
2022-08-01 17:43:20 +10:00
Leon Friedrich
bae540ab2f
Fix gas tank and other hand-interaction bugs ( #9700 )
2022-07-30 19:56:26 -07:00
metalgearsloth
40a7584c2f
Gas tank internals alerts ( #9567 )
2022-07-25 14:42:25 +10:00
Leon Friedrich
ba75934512
Re-add action prototypes ( #7508 )
...
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com >
2022-04-14 06:17:34 +02:00
Rane
7900abb888
Literally Murder IExamine ( #7352 )
2022-04-08 14:17:25 -07:00
mirrorcult
d1c980fe41
Gas tank minor opts ( #7424 )
2022-04-05 15:08:41 +10:00
Leon Friedrich
25cf0eac08
fix gas tank UI ( #7135 )
2022-03-16 14:30:40 -07:00
Leon Friedrich
e3ead6a3ba
Remove IDropped ( #7075 )
2022-03-13 19:47:28 +11:00
Leon Friedrich
ff7d4ed9f6
Patched Actions Rework ( #6899 )
...
* Rejig Actions
* fix merge errors
* lambda-b-gon
* fix PAI, add innate actions
* Revert "fix PAI, add innate actions"
This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.
* Just fix by making nullable.
if only require: true actually did something somehow.
* Make AddActions() ensure an actions component
and misc comments
* misc cleanup
* Limit range even when not checking for obstructions
* remove old guardian code
* rename function and make EntityUid nullable
* fix magboot bug
* fix action search menu
* make targeting toggle all equivalent actions
* fix combat popups (enabling <-> disabling)
* fix networking
* Allow action locking
* prevent telepathy
2022-02-25 23:24:08 -06:00
Leon Friedrich
49ae383f06
Revert "Actions Rework" ( #6888 )
2022-02-25 16:55:18 +11:00
Leon Friedrich
5ac5dd6a64
Actions Rework ( #6791 )
...
* Rejig Actions
* fix merge errors
* lambda-b-gon
* fix PAI, add innate actions
* Revert "fix PAI, add innate actions"
This reverts commit 4b501ac083e979e31ebd98d7b98077e0dbdd344b.
* Just fix by making nullable.
if only require: true actually did something somehow.
* Make AddActions() ensure an actions component
and misc comments
* misc cleanup
* Limit range even when not checking for obstructions
* remove old guardian code
* rename function and make EntityUid nullable
* fix magboot bug
* fix action search menu
* make targeting toggle all equivalent actions
* fix combat popups (enabling <-> disabling)
2022-02-24 22:12:29 -06:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
Leon Friedrich
1c9ffdc78c
Replace VerbTypes with verb classes ( #6525 )
2022-02-10 13:30:59 +11:00
Vera Aguilera Puerto
c8b65be747
Replace IEntityManager resolves in systems for cached EntityManager
2021-12-08 13:00:43 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
69b270017b
Inline TryGetComponent completely, for real
2021-12-03 14:17:01 +01:00
Leon Friedrich
6cb58e608b
ECS verbs and update context menu ( #4594 )
...
* Functioning ECS verbs
Currently only ID card console works.
* Changed verb types and allow ID card insertions
* Verb GUI sorting and verb networking
* More networking, and shared components
* Clientside verbs work now.
* Verb enums changed to bitmask flags
* Verb Categories redo
* Fix range check
* GasTank Verb
* Remove unnecessary bodypart verb
* Buckle Verb
* buckle & unbuckle verbs
* Updated range checks
* Item cabinet verbs
* Add range user override
* construction verb
* Chemistry machine verbs
* Climb Verb
* Generalise pulled entity verbs
* ViewVariables Verb
* rejuvenate, delete, sentient, control verbs
* Outfit verb
* inrangeunoccluded and tubedirection verbs
* attach-to verbs
* remove unused verbs and move VV
* Rename DebugVerbSystem
* Ghost role and pointing verbs
* Remove global verbs
* Allow verbs to raise events
* Changing categories and simplifying debug verbs
* Add rotate and flip verbs
* fix rejuvenate test
* redo context menu
* new Add Gas debug verb
* Add Set Temperature debug verb
* Uncuff verb
* Disposal unit verbs
* Add pickup verb
* lock/unlock verb
* Remove verb type, add specific verb events
* rename verb messages -> events
* Context menu displays verbs by interaction type
* Updated context menu HandleMove
previously, checked if entities moved 1 tile from click location.
Now checks if entities moved out of view.
Now you can actually right-click interact with yourself while walking!
* Misc Verb menu GUI changes
* Fix non-human/ghost verbs
* Update types and categories
* Allow non-ghost/human to open context menu
* configuration verb
* tagger verb
* Morgue Verbs
* Medical Scanner Verbs
* Fix solution refactor merge issues
* Fix context menu in-view check
* Remove prepare GUI
* Redo verb restrictions
* Fix context menu UI
* Disposal Verbs
* Spill verb
* Light verb
* Hand Held light verb
* power cell verbs
* storage verbs
and adding names to insert/eject
* Pulling verb
* Close context menu on verb execution
* Strip verb
* AmmoBox verb
* fix pull verb
* gun barrel verbs
revolver verb
energy weapon verbs
Bolt action verb
* Magazine gun barrel verbs
* Add charger verbs
* PDA verbs
* Transfer amount verb
* Add reagent verb
* make alt-click use ECS verbs
* Delete old verb files
* Magboot verb
* finalising tweaks
* context menu visibility changes
* code cleanup
* Update AdminAddReagentUI.cs
* Remove HasFlag
* Consistent verb keys
* Remove Linq, add comment
* Fix in-inventory check
* Update GUI text alignment and padding
* Added close-menu option
* Changed some "interaction" verbs to "activation"
* Remove verb keys, use sorted sets
* fix master merge
* update some verb text
* Undo Changes
Remove some new verbs that can be added later
undid some .ftl bugfixes, can and should be done separately
* fix merge
* Undo file rename
* fix merge
* Misc Cleanup
* remove contraction
* Fix keybinding issue
* fix comment
* merge fix
* fix merge
* fix merge
* fix merge
* fix merge
* fix open-close verbs
* adjust uncuff verb
* fix merge
and undo the renaming of SharedPullableComponent to PullableComponent. I'm tired of all of those merge conflicts
2021-10-04 20:29:03 -07:00
Vera Aguilera Puerto
0be5ff829b
Gets rid of all ComponentManager usages. ( #4707 )
2021-09-28 13:35:29 +02:00
Vera Aguilera Puerto
1033d8bbe5
Use EntitySystem dependencies in a bunch of systems.
2021-07-26 13:01:47 +02:00
Vera Aguilera Puerto
34e457b854
Gas Tanks no longer use NodeContainer, Gas Canisters no longer use passive gates.
2021-06-23 12:02:28 +02:00
Vera Aguilera Puerto
263c9ef974
ECS Atmos Part 2: Moves a lot of Gas Mixture methods to AtmosphereSystem. ( #4218 )
2021-06-23 11:35:30 +02:00
Vera Aguilera Puerto
a2b737d945
Atmos pipe rework ( #3833 )
...
* Initial
* Cleanup a bunch of things
* some changes dunno
* RequireAnchored
* a
* stuff
* more work
* Lots of progress
* delete pipe visualizer
* a
* b
* pipenet and pipenode cleanup
* Fixes
* Adds GasValve
* Adds GasMiner
* Fix stuff, maybe?
* More fixes
* Ignored components on the client
* Adds thermomachine behavior, change a bunch of stuff
* Remove Anchored
* some work, but it's shitcode
* significantly more ECS
* ECS AtmosDevices
* Cleanup
* fix appearance
* when the pipe direction is sus
* Gas tanks and canisters
* pipe anchoring and stuff
* coding is my passion
* Unsafe pipes take longer to unanchor
* turns out we're no longer using eris canisters
* Gas canister inserted tank appearance, improvements
* Work on a bunch of appearances
* Scrubber appearance
* Reorganize AtmosphereSystem.Piping into a bunch of different systems
* Appearance for vent/scrubber/pump turns off when leaving atmosphere
* ThermoMachine appearance
* Cleanup gas tanks
* Remove passive gate unused imports
* remove old canister UI functionality
* PipeNode environment air, make everything use AssumeAir instead of merging manually
* a
* Reorganize atmos to follow new structure
* ?????
* Canister UI, restructure client
* Restructure shared
* Fix build tho
* listen, at least the canister UI works entirely...
* fix build : )
* Atmos device prototypes have names and descriptions
* gas canister ui slider doesn't jitter
* trinary prototypes
* sprite for miners
* ignore components
* fix YAML
* Fix port system doing useless thing
* Fix build
* fix thinking moment
* fix build again because
* canister direction
* pipenode is a word
* GasTank Air will throw on invalid states
* fix build....
* Unhardcode volume pump thresholds
* Volume pump and filter take time into account
* Rename Join/Leave atmosphere events to AtmosDeviceEnabled/Disabled Event
* Gas tank node volume is set by initial mixtuer
* I love node container
2021-06-19 13:25:05 +02:00
