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
metalgearsloth
06f1aac2f4
Fix itemslots swapping ( #25634 )
...
Fix itemslots prediction
2024-07-11 20:40:03 -07:00
LordCarve
297c97d556
Make ItemSlots more verbose + AME proof of concept ( #25779 )
...
* Make itemslots more verbose with AME proof of concept.
* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.
* Change optional popup fields into LocId.
(cherry picked from commit 06d755a860fa60dd393bfece6495109af8b60c21)
2024-03-07 01:19:38 +01:00
Krunklehorn
1456ed8c0b
Revert "Fix ItemSlots prediction" ( #25610 )
...
Revert "Fix ItemSlots prediction (#25552 )"
This reverts commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46.
(cherry picked from commit 6485dd4f4de1167523c38d2aa7ffe79f440b4386)
2024-03-07 01:02:33 +01:00
metalgearsloth
398bbde497
Fix ItemSlots prediction ( #25552 )
...
IDK what this arg is for but seems okay with guns. Without it it always thinks the insertion can work.
(cherry picked from commit ad29dbe302ac921b9e3f6cbd3ded79788db27b46)
2024-03-07 00:52:44 +01:00
Nemanja
0060f2fc74
Fix small logic issue in item slot swapping ( #23378 )
...
fix swapping item slots sometimes failing
(cherry picked from commit 58d518a2a0c1a74d92a5a5f8dfc1c8c62d209f4a)
2024-01-26 21:27:26 +01:00
TemporalOroboros
aebae6fab7
Content ecs containers ( #22484 )
...
(cherry picked from commit 7a77d6d5dd73a34be238fdebc284da5bc2917c67)
2024-01-22 18:47:55 +01:00
Debug
18f0af1f68
Implement gridinv, proper ( #703 )
...
* Implement gridinv, 1500 squashed commits :elp:
* Me when
* Linter errors
* Fix katana belts
2024-01-21 19:58:28 +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
metalgearsloth
52104a45c1
Revert Arch testmerge 2 ( #21901 )
2023-12-02 19:05:12 +01:00
metalgearsloth
39ad6db5c3
Update submodule to 182.1.0 ( #21900 )
2023-12-02 19:05:11 +01:00
metalgearsloth
9741d9916c
Revert the other arch changes ( #21871 )
2023-12-02 19:05:11 +01:00
metalgearsloth
333096b19e
Content arch ( #20107 )
...
Co-authored-by: DrSmugleaf <drsmugleaf@gmail.com >
2023-12-02 19:04:08 +01:00
Doru991
faa7c96886
Potato battery update + potato AI ( #21142 )
...
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com >
2023-10-31 18:45:37 +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
metalgearsloth
4d1c3ae66a
Revert "Remove IContainer and move functions to the container system.… ( #19975 )
2023-09-10 21:46:36 +10:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Leon Friedrich
b45e53603d
Remove IContainer and move functions to the container system. ( #19834 )
2023-09-10 12:16:37 +10:00
Nemanja
98fa00a21f
Borgs ( #18136 )
...
* Laws
* positronic brain and PAI rewrite
* MMI
* MMI pt. 2
* borg brain transfer
* Roleban support, Borg job (WIP), the end of mind shenaniganry
* battery drain, item slot cleanup, alerts
* visuals
* fix this pt1
* fix this pt2
* Modules, Lingering Stacks, Better borg flashlight
* Start on UI, fix battery alerts, expand activation/deactivation, low movement speed on no power.
* sprotes
* no zombie borgs
* oh fuck yeah i love a good relay
* charger
* fix the tiniest of sprite issues
* adjustable names
* a functional UI????
* foobar
* more modules
* this shit for some reason
* upstream
* genericize selectable borg modules
* upstream again
* holy fucking shit
* i love christ
* proper construction
* da job
* AA borgs
* and boom more shit
* admin logs
* laws redux
* ok just do this rq
* oh boy that looks like modules
* oh shit research
* testos passo
* so much shit holy fuck
* fuckit we SHIP
* last minute snags
* should've gotten me on a better day
2023-08-12 16:39:58 -05:00
metalgearsloth
83e3d614f0
Fix ItemSlots compiler warnings ( #18226 )
2023-07-23 14:48:00 +10:00
themias
4990eee312
Fix duplicate verbs on janitor trolley ( #16087 )
2023-05-04 11:45:14 -07:00
metalgearsloth
ae01618874
Revert "Revert "Replace ResourcePath with ResPath ( #15308 )" (#155… ( #15566 )
2023-04-20 20:16:01 +10:00
metalgearsloth
acf79a8209
Revert "Replace ResourcePath with ResPath ( #15308 )" ( #15551 )
2023-04-20 11:43:54 +10:00
Ygg01
71f358a027
Replace ResourcePath with ResPath ( #15308 )
2023-04-19 23:39:17 +10:00
DrSmugleaf
b947856431
Remove hands component reference ( #15197 )
2023-04-07 11:21:12 -07:00
ShadowCommander
1c55904cd2
Add Alt-click insertion to ItemSlots ( #15094 )
2023-04-06 16:49:27 -06:00
metalgearsloth
44fb8a9e2d
Fix rsi sprite access for verbs ( #14284 )
2023-02-26 18:48:57 +11:00
Leon Friedrich
e0dd65983e
Don't remove item slots when terminating. ( #14042 )
2023-02-12 01:14:02 +00:00
Rane
16525082d2
ejectOnBreak ejects locked slots too ( #12933 )
2023-01-05 05:40:32 +11:00
Chief-Engineer
1db51e93b1
add item slot logs ( #13184 )
2022-12-27 18:00:48 +01:00
Leon Friedrich
881a2b2ece
PopupSystem public methods rejig ( #12830 )
2022-12-19 08:41:47 +11:00
Mervill
15a772fb96
Cleanup for ChargerComponent ( #11907 )
2022-10-16 21:21:54 +11:00
Mervill
c11c11bace
Unhardcode some logic related to objects with battery slots. Minor fix to fire helmets. ( #11734 )
2022-10-15 13:15:39 -07:00
Leon Friedrich
581a805063
Replace ItemSlotChangedEvent with EntInsertedIntoContainerMessage ( #11934 )
2022-10-15 13:03:37 -07:00
0x6273
0c24f8b69b
ReagentDispenser ECS ( #11418 )
2022-10-03 17:57:32 -07:00
metalgearsloth
cd29f475b9
Fix item slot mispredict ( #11134 )
...
On master it replays it every tick so it gets spammed. The server also plays it to the client as well so you get a duplicate.
2022-09-10 02:39:22 +12:00
Leon Friedrich
c7ad6b709e
Audio System Rejig ( #9635 )
2022-07-29 12:13:12 +10:00
metalgearsloth
b9e876ca92
The real movement refactor ( #9645 )
...
* The real movement refactor
* ref events
* Jetpack cleanup
* a
* Vehicles partially working
* Balance tweaks
* Restore some shitcode
* AAAAAAAA
* Even more prediction
* ECS compstate trying to fix this
* yml
* vehicles kill me
* Don't lock keys
* a
* Fix problem
* Fix sounds
* shuttle inputs
* Shuttle controls
* space brakes
* Keybinds
* Fix merge
* Handle shutdown
* Fix keys
* Bump friction
* fix buckle offset
* Fix relay and friction
* Fix jetpack turning
* contexts amirite
2022-07-16 13:51:52 +10:00
Leon Friedrich
86f70994bf
Network item slots ( #9199 )
2022-06-27 16:29:14 +10:00
metalgearsloth
8905996cfc
Make raiselocalevent not broadcast by default ( #8998 )
2022-06-22 09:53:41 +10:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. ( #8728 )
2022-06-13 09:45:47 +10:00
metalgearsloth
a983b5e2f5
More container pruning ( #8576 )
2022-06-12 13:29:03 +10:00
Leon Friedrich
538d93d19d
Add priorities to items slots ( #8748 )
2022-06-12 00:22:19 +10:00
Leon Friedrich
ca7960382b
Missing nullables ( #8634 )
2022-06-04 17:17:48 +10:00
metalgearsloth
fb943a61dc
Gun refactor ( #8301 )
...
Co-authored-by: Kara <lunarautomaton6@gmail.com >
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com >
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com >
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com >
2022-06-01 19:59:58 +10:00
Alex Evgrashin
50ae467c76
Remove IDestroyAct, IBreakAct ( #7876 )
2022-05-02 15:43:25 -07:00
Rane
98cd4fdb58
Vehicles ( #7336 )
2022-04-23 18:05:02 -07:00
Alex Evgrashin
9c65f4b324
Janitor cart ( #7367 )
2022-04-11 16:21:15 -07:00
