Commit Graph

444 Commits

Author SHA1 Message Date
PrPleGoo
20cb9b92ab Merge branch 'master' into DecimalReagents 2020-04-09 17:24:22 +02:00
zumorica
3ba2e5de80 Speech bubbles! 2020-04-09 03:31:40 +02:00
zumorica
c0bdfdf123 Remove CanReturnToBody property from SharedGhostComponent 2020-04-09 03:02:21 +02:00
Víctor Aguilera Puerto
612790840c Update Content.Client/GameObjects/Components/Observer/GhostComponent.cs
Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-04-09 02:59:20 +02:00
PrPleGoo
e7d121b6b0 Update InjectorComponent.cs 2020-04-08 16:08:16 +02:00
PrPleGoo
f8b73fdc3b Fix null-state handling for InjectorComponent 2020-04-05 11:45:23 +02:00
PrPleGoo
db83789d05 Merge remote-tracking branch 'upstream/master' into DecimalReagents 2020-04-05 11:37:03 +02:00
PrPleGoo
4e0242d47c Replace decimal with ReagentUnit 2020-04-05 11:36:12 +02:00
zumorica
a0d114c672 Ghost sprites and a bunch of fixes 2020-04-05 02:29:04 +02:00
zumorica
0902844457 Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-04-04 17:17:11 +02:00
Pieter-Jan Briers
45e9be43ef Content now owns main menu and launcher connecting. 2020-04-04 15:11:28 +02:00
Pieter-Jan Briers
5edfa2db34 Re-organize style sheets and add StyleSpace. 2020-04-04 15:10:51 +02:00
Pieter-Jan Briers
ff36b2dcc7 Re-enable instruments with fallback when MIDI isn't available. 2020-03-30 18:36:58 +02:00
zumorica
91f039d2af Merge branch 'master' into 2020-03-03-g-g-g-g-g-g-g-g-ghooooosts 2020-03-28 23:48:00 +01:00
Pieter-Jan Briers
957370a832 Merge branch 'master' into RefactorMouseFilterMode 2020-03-25 02:27:28 +01:00
Decappi
a1357a1ff3 #391 Done Lathe animations (#774)
* Draft PR, do not merge

* Lathe now uses animations. Timing is still wrong, code is very wet, repetitions and unused layers are there.

* Removed (unneeded?) PowerDeviceVisualizer from the lathe
Refactored & Renamed code and variables
Renamed animation names

* WIP protolathe animation

* Working protolathe animation.
I still don't like the solution though.
2020-03-15 17:55:20 +01:00
PrPleGoo
dc66621804 Replaced static Rounders with an impleneted interface 2020-03-14 14:04:08 +01:00
PrPleGoo
f05fdfb5fc Changed all int and some float things in Reagent code to Decimals 2020-03-14 12:55:07 +01:00
Víctor Aguilera Puerto
e17ffbd76f Adds verb categories (#766)
* Adds verb categories

* Update Content.Shared/GameObjects/Verbs/Verb.cs

Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>

* Make GetCategory virtual

Co-authored-by: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-03-06 20:11:24 +01:00
zumorica
7f19381bec Ghost command, some other stuff 2020-03-03 20:37:26 +01:00
zumorica
055f09d501 Button to return to body 2020-03-03 19:10:25 +01:00
zumorica
6905394e8a Add placeholder ghost UI, ghost component 2020-03-03 19:10:25 +01:00
ShadowCommander
3edfdb8763 Refactor CharacterSetupButton into a ContainerButton 2020-02-27 04:15:02 -08:00
ShadowCommander
14f6cbb845 Refactor ContainerButtons to use a StyleClass for formatting instead of typeof 2020-02-27 04:15:00 -08:00
ShadowCommander
4bdb45731a Clean up MouseFilterMode.Ignore from Controls 2020-02-27 04:14:59 -08:00
ShadowCommander
526111923c Refactor Controls to default to MouseFilterMode.Ignore 2020-02-27 04:14:58 -08:00
Pieter-Jan Briers
8cbb6841fc Fix compiler warning 2020-02-26 16:46:56 +01:00
Pieter-Jan Briers
0e6b55de66 Clean up client game ticker status code.
Fixes #495
2020-02-26 16:42:12 +01:00
Decappi
289ab4818f #621 - Added sandbox spawner documentation to tutorial (#737) 2020-02-26 06:31:08 +01:00
moneyl
a76f133a3c Add more components to client registerIgnore list (#746) 2020-02-26 00:47:58 +01:00
moneyl
1b7860aeda Add injectors + injected reagent metabolism via BloodstreamCompo… (#730)
* Add BloodstreamComponent and BloodstreamSystem

New component for metabolizing reagents that other organs like the stomach pass their input reagents to.

* Change StomachComponent to put ingested reagents in bloodstream after delay

Now StomachComponent does not metabolize any reagents. Instead, it tracks how long each reagent has been inside it, and once they pass "digestionDelay" they'll be put inside the bloodstream, where the bloodstream will handle metabolism of the reagent.

* Add reagent injectors

Injects reagents straight into the bloodstream when used on mobs with bloodstreams. Also allows draw/inject from beakers. Does not support drawing blood/reagents from the bloodstream yet.

* Address code review

Make use of `Loc` static class instead of using `ILocalizationManager`. Localize InjectorToggleMode enum properly.
2020-02-24 01:47:33 +01:00
ShadowCommander
6fbeb16b31 Refactor ChatBox to use HistoryLineEdit (#728)
* Refactor ChatBox to use HistoryLineEdit

* Clean up ChatBox variable localize
2020-02-23 00:44:35 +01:00
Víctor Aguilera Puerto
4f397e1ce2 Fix warnings (#723) 2020-02-23 00:28:50 +01:00
Acruid
ee6eec9c40 SubscribeEvent() has been split into SubscribeNetworkEvent() and SubscribeLocalEvent() methods on EntitySystem.
Most methods on EntityEventBus now require callers to specify the source (Local or Network) of the events.
2020-02-19 17:08:59 -08:00
Acruid
e719745b10 Removed the Sender object from events. If you needed this field, add it to the event class. 2020-02-19 14:39:00 -08:00
Acruid
c51533686b Updates the Content EntitySystems with the changes to the event API.
Visual Studio wants to update the version of the solution, and change some GUIDs around.
2020-02-18 19:43:54 -08:00
Pieter-Jan Briers
08fcbdf271 Populate tutorial window key binds with proper key names. 2020-02-17 11:29:52 +01:00
Pieter-Jan Briers
011ac0fd7d Fix inverted triangle path on Linux.
@ShadowCommander you messed up the casing on the file path.
2020-02-17 11:29:19 +01:00
Pieter-Jan Briers
cd8025b87e Merge branches '20-02-17-upd' and 'triangle' 2020-02-17 11:19:15 +01:00
micheel665
987a39c25e Added a button to add entities to storage items (#709) 2020-02-17 00:19:35 +01:00
ShadowCommander
983d626ce4 Fix Styling 2020-02-14 18:05:35 -08:00
ShadowCommander
92030c6724 Update NanoStyle for refactored Button and CheckBox 2020-02-14 04:18:14 -08:00
ShadowCommander
718bf0edc3 Update Button references 2020-02-14 04:17:07 -08:00
Pieter-Jan Briers
7f9d2f9dbf Fix ClientStatusEffectsComponent breaking after re-attaching to mob.
Fixes #689
2020-02-13 23:18:53 +01:00
ShadowCommander
3292939756 Unset FocusChat when returning to main menu (#691)
Fixes #403
2020-02-13 15:14:03 +01:00
ShadowCommander
5f26944df9 Add styles for ContainerButton and OptionButton 2020-02-13 00:47:46 -08:00
adrian
9544099c99 Paper and pen (#582)
* A very basic paper and pen implementation

* Removes SharedWriteComponent

* Update ContentNetIDs.cs
2020-02-12 00:01:05 +01:00
moneyl
b965dfea33 Fix toggle UI keybind in tutorial window (#669)
Is shift + f4, not F1
2020-02-09 23:35:35 +01:00
Acruid
d16f433f45 Adds test to make sure that calling IComponent.HandleComponentState() with null states does not throw an exception.
Fixes state handling code on components to not throw exceptions when called with null components.
2020-02-09 02:28:47 -08:00
ShadowCommander
092f234943 Add a check to make sure the CombatMode is the current player (#663) 2020-02-09 10:42:44 +01:00