Spatison
d5d5278999
[Port/Tweak] Eshield / Е-Щит ( #94 )
...
* tweak: eshield
* add: energy shield
* fix
2024-10-23 17:23:44 +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
Tayrtahn
a8d082374d
Remove all obsolete BatteryComponent method calls ( #25871 )
...
Removed all obsolete, non-ECS method calls to BatteryComponent
(cherry picked from commit 2935e5bd780d6cd08897521ba0b54adccb3fd0da)
2024-03-07 01:52:46 +01:00
Pieter-Jan Briers
e7a3b82a8d
Use new ComponentPauseGenerator ( #25183 )
...
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.
(cherry picked from commit e00f74505c62310bd15aeaba8d6530f648397074)
2024-03-07 00:57:05 +01:00
Nemanja
27624ad280
Speed Boots [Tier 3 Civ-Service] ( #21438 )
...
* Speed Boots
* validate
* monkey
2023-11-12 20:48:04 +01:00
deltanedas
24810d916b
ninja 2 electric boogaloo ( #15534 )
...
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10:00
Visne
c7b21b631b
Remove unused dependencies ( #19490 )
2023-08-24 09:55:15 -08: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
Sailor
9d844520be
Implement RiggableSystem, stunbatons injectable ( #17288 )
...
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com >
2023-07-08 13:32:31 +10:00
metalgearsloth
775258be52
Add tether gun ( #16430 )
2023-05-18 11:36:06 +10:00
metalgearsloth
6417bb4fa0
Proto-kinetic crusher ( #16277 )
...
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com >
2023-05-14 13:15:18 +10:00
Vasilis
4f8d4f89d6
Health analyzer displays turns off when the battery dies ( #16125 )
2023-05-13 12:28:11 -04:00
Slava0135
811b35a1cf
display item charge on examine ( #16116 )
2023-05-05 22:44:21 +10:00
metalgearsloth
d51d74d934
Content fixes for timeoffsets ( #15934 )
2023-05-01 14:49:25 +10:00
Nemanja
bccad7d430
Fix instant power cell drainage ( #15927 )
2023-04-30 16:06:44 +10:00
Nemanja
53a33a5853
fix power cell exceptions with health analyzers ( #15753 )
2023-04-25 11:11:03 +10:00
Nemanja
94e26d6c31
Make PowerCellDraw not tick dependent, buff anomaly locator power drain ( #15719 )
2023-04-24 13:35:19 +10:00
Nemanja
ef28cfd55f
Raise powercellemptyevent on cell removed, fix powercelldraw ( #15679 )
2023-04-23 15:27:56 +10:00
metalgearsloth
3dddb8aba5
Power cell QOL fix ( #15673 )
2023-04-23 13:46:47 +10:00
metalgearsloth
a4dfe8beed
Power cell slot QOL ( #15373 )
2023-04-23 12:25:12 +10:00
Leon Friedrich
9513ea66e4
ECS BatteryComponent ( #15337 )
2023-04-19 20:10:08 +10:00
Leon Friedrich
2351bbb607
Add power debug verbs ( #14212 )
2023-02-26 04:14:35 +11:00
Chief-Engineer
95e35b94b5
Improve explosion logs ( #13351 )
...
* add types to explosion logs
* make explosions logged by default
* add cause parameter to IThresholdBehavior
* add cause to ExplodeBehaviors
* add cause to power cell explosions
* remove useless log
* add triggerer to triggers
* add logs for damage from explosions
* sneaky power cell update
2023-02-10 23:45:38 +00:00
Leon Friedrich
466384b081
Solution rejig ( #12428 )
2023-01-12 14:41:40 +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
wrexbe
1e0babbd50
Make AdminLogsSystem an IoC manager ( #8492 )
...
* Make log not entity system
* Fixes
2022-05-28 23:41:17 -07:00
themias
761cd305ee
Fix issue where empty power cells would still explode in the microwave ( #8393 )
2022-05-23 17:11:20 -07:00
Pieter-Jan Briers
9385786273
Fix stack overflow on rigged power cell explosion. ( #8382 )
...
Remove the set to cell charge from explosion code. I assume the cell won't see much use since it's about to be deleted anyways.
2022-05-23 13:15:20 -05:00
wrexbe
bc68ac96dd
Cleanup the namespaces ( #8132 )
2022-05-13 17:59:03 +10:00
Leon Friedrich
56168e592e
Explosion refactor ( #5230 )
...
* Explosions
* fix yaml typo
and prevent silly UI inputs
* oop
* Use modified contains() checks
And remove IEnumerable
* Buff nuke, nerf meteors
* optimize the entity lookup stuff a bit
* fix tile (0,0) error
forgot to do an initial Enumerator.MoveNext(), so the first tile was always the "null" tile.
* remove celebration
* byte -> int
* remove diag edge tile dict
* fix one bug
but there is another
* fix the other bug
turns out dividing a ushort leads to rounding errors. Why TF is the grid tile size even a ushort in the first place.
* improve edge map
* fix minor bug
If the initial-explosion tile had an airtight entity on it, the tile was processed twice.
* some reviews (transform queries, eye.mapid, and tilesizes in overlays)
* Apply suggestions from code review
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
* is map paused
* GetAllTiles ignores space by default
* WriteLine -> WriteError
* First -> FirstOrDefault()
* default prototype const string
* entity query
* misc review changes
* grid edge max distance
* fix fire texture defn
bad use of type serializer and ioc-resolves
* Remove ExplosionLaunched
And allow nukes to throw items towards the outer part of an explosion
* no hot-reload disclaimer
* replace prototype id string with int index
* optimise damage a tiiiiny bit.
* entity queries
* comments
* misc mirror comments
* cvars
* admin logs
* move intensity-per-state to prototype
* update tile event to ECS event
* git mv
* Tweak rpg & minibomb
also fix merge bug
* you don't exist anymore go away
* Fix build
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com >
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com >
2022-03-31 21:39:26 -05:00
Leon Friedrich
c95516e5b2
Revert "Explosion refactor TEST MERG ( #6995 )" ( #7005 )
2022-03-06 04:02:34 +11:00
Moony
4a466f4927
Explosion refactor TEST MERG ( #6995 )
...
* Explosions
* fix yaml typo
and prevent silly UI inputs
* oop
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com >
2022-03-04 13:48:01 -06:00
mirrorcult
ec4d4688c7
Seal/abstract/virtual everything ( #6739 )
2022-02-16 18:23:23 +11:00
mirrorcult
9adfde9ee3
Microwave rework ( #6470 )
2022-02-13 11:53:54 +11:00
Leon Friedrich
5a64936ade
Fix taser visuals not updating after charging. ( #6065 )
2022-01-09 23:48:58 +11:00
Leon Friedrich
0aa4f9efbe
Power Cell Refactor ( #5943 )
...
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com >
2022-01-05 15:20:25 +11:00
Vera Aguilera Puerto
c8b65be747
Replace IEntityManager resolves in systems for cached EntityManager
2021-12-08 13:00:43 +01:00
DrSmugleaf
215cae5655
Fix more errors
2021-12-06 00:52:58 +01:00
Vera Aguilera Puerto
5cd42c9ad6
Inline UID
2021-12-03 15:53:09 +01:00
Vera Aguilera Puerto
ee4ff9cfe8
Inline Name
2021-12-03 15:25:51 +01:00
Vera Aguilera Puerto
0feebbff00
Inline HasComponent entirely
2021-12-03 12:23:18 +01:00
Vera Aguilera Puerto
9921801f15
ActionBlocker CanPickup uses EntityUid exclusively
2021-11-09 13:43:39 +01:00
Vera Aguilera Puerto
51e785c0fd
ActionBlocker CanDrop uses EntityUid exclusively
2021-11-09 13:23:53 +01:00
Ygg01
b2aca94586
Refactor Solution from Shared -> Server ( #5078 )
...
* Move entity solution entity systems to shared
* Move SolutionComponents to Server
* Fix namespaces
* Remove Networked Component.
* Fixes
* Add components to ignore list
2021-10-29 23:40:15 +11: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
Ygg01
c209e3f29b
Solution refactor ( #4407 )
...
* Rename SolutionContainerCaps -> Capability
* Move IExamine event to Chemistry System.
* ECS the ISolutionChange into SolutionChangeEvent
* Unify SolutionContainer into a single shared component
* Replace ISolutionInteraction with SolutionContainerComponent
* Move all methods from SolutionContainer to ChemistrySystem
* Refactor EntitySystem calls to Dependencies
* Refactor SolutionContainer to SolutionManager
* Fix yamls
* Fix test fails
* Fix post merge issues
* Fix various issues with SolutionManager
* More fixes
* Fix more components
* Fix events not being directed
* Fixes for Hypospray
* Separate removal and iteration on Metabolism
* Fix creampie problems
* Address some of sloth's issues
* Refactors for Systems
* Refactored solution location
* Fix tests
* Address more sloth issues
* Fix dependency
* Fix merge conflicts
* Add xmldocs for Capabilities components
* Remove HasSolution/TryGetDefaultSolution and Add/Remove Drainable/Refillable
* Replace Grindable/Juiceable with Extractable
* Refactor field names
* Fix Drainable
* Fix some issues with spillable and injector
* Fix issues with Grinder
* Fix Beaker having duplicate solutions
* Fix foaming
* Address some MGS issues
* Fix Uid issues
* Fix errors in solution Tranfer
* Fixed some extra values constant values
* Cola is drinkable now
2021-09-06 23:49:44 +10:00