tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,033 Commits 3 Branches 5 Tags
bc24a852f901bef23c739b9316dadd0e865f35c5
Commit Graph

365 Commits

Author SHA1 Message Date
Pieter-Jan Briers
046834129f Fix ranged weapons getting stuck down. 
Thanks ShadowCommander for figuring this one out.
 2020-05-08 11:55:19 +02:00
FL-OZ
40ad366636 Various hotfixes and touchups to the microwave. 
- Stop a debug assertion from TryGetComponent on a deleted entity.
-  Add a dark overlay for when microwave is busy to UI.
 2020-05-06 17:45:45 -05:00
Pieter-Jan Briers
c7aeec0f6c Fix compile. 2020-05-06 22:42:55 +02:00
Pieter-Jan Briers
cf9edddf2f Update submodule, UI fixes. 2020-05-05 23:59:31 +02:00
Pieter-Jan Briers
f739301551 Add Microwave (#862) 
* Add meal recipe prototype class and yaml file.
Add bare bones MicrowaveComponent.

* Reformat the way recipe prototypes work to something sensible.
More work on Microwave component.

* Rewrite recipe prototype.
Fix comparer in microwavecomponent.

* Add Eris microwave RSI.
Cleaned up  the Microwave component code.

* Refactor "output" to "result" for recipes/prototypes.
Remove a debug recipe from meal_recipes.yml
Add food.yml for food related reagents: sugar, flour, etc.

* Unfuck mostly everything.

* ShadowCommander is MVP.

* Add microwave visualizer. Clean up microwave code.

* Reformat 'PoweredIdle' to 'Idle'

* Refactor SoundComponent for stopping sounds.

* A shit ton of microwave stuff i can't really explain this.

* Microwave interface.

* Add (not working) basis for allowing solids (entities) in recipes.

* Microwave UI + solids implemented.

* Next up timer buttons

* Microwave is done. Added an easter egg recipe and made the cheeseburger recipe more sensible.

* Delete microwave.dmi, unneeded. Revert accidently changes to Shared EntryPoint.cs

* trying that again

* Remove unused 'ding.ogg'

* revert entrypoint to master

* revert sharedlathecomponent to master

* Pretty up the microwave menu, add click sounds. Remove some unnecessary ToList() calls. Remove unnecessary IoC resolves.

* And not a single "ToList()" went home to their family that day.....

* Seperated Reagent item list and Solid item list to allow for vaporizing particular reagents at will. (also fixes a really nasty null reference exception because they shared the same list before D: )

* Remove unncessary class dictionary and list. Fix meal prototype properties.

* lol

Co-authored-by: FL-OZ <yetanotherscuffed@gmail.com>
Co-authored-by: FLOZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-05-05 11:44:49 +02:00
Pieter-Jan Briers
453cecccd0 Make client side verbs correctly respect visibility. 2020-05-05 11:43:41 +02:00
Pieter-Jan Briers
fe23fdb620 Merge branch 'master' into kitchen 2020-05-05 11:35:20 +02:00
FLOZ
69b34e74ce Seperated Reagent item list and Solid item list to allow for vaporizing particular reagents at will. (also fixes a really nasty null reference exception because they shared the same list before D: ) 2020-05-04 15:16:16 -05:00
FLOZ
108bd36b8c And not a single "ToList()" went home to their family that day..... 2020-05-04 14:39:33 -05:00
FLOZ
4034458d26 Pretty up the microwave menu, add click sounds. Remove some unnecessary ToList() calls. Remove unnecessary IoC resolves. 2020-05-04 13:54:54 -04:00
FL-OZ
d7d0bc71f9 Microwave is done. Added an easter egg recipe and made the cheeseburger recipe more sensible. 2020-05-03 23:58:29 -05:00
Pieter-Jan Briers
e2677bab51 Wide attacks on space, remove UseOrAttack. 2020-05-03 16:03:52 +02:00
FL-OZ
4f7deb8452 Next up timer buttons 2020-05-03 03:09:54 -05:00
FL-OZ
0f61c2fadf Microwave UI + solids implemented. 2020-05-03 01:34:00 -05:00
Jackson Lewis
1f0c72dd28 Gravity (#841) 2020-05-02 16:02:52 +02:00
FL-OZ
dba0949c5b Add (not working) basis for allowing solids (entities) in recipes. 2020-05-02 01:29:20 -05:00
FL-OZ
dd19466578 Microwave interface. 2020-05-01 23:34:04 -05:00
FL-OZ
13fba25edc A shit ton of microwave stuff i can't really explain this. 2020-05-01 17:19:04 -05:00
FL-OZ
a65d60dc2c Refactor SoundComponent for stopping sounds. 2020-05-01 17:17:05 -05:00
FL-OZ
a5fa184765 Reformat 'PoweredIdle' to 'Idle' 2020-05-01 03:38:48 -05:00
FL-OZ
b2aca9a686 Add microwave visualizer. Clean up microwave code. 2020-05-01 03:37:21 -05:00
zumorica
ff5549a0d1 Finish refactoring tools. Add multitools. (as in multiple tools in one) 2020-04-29 13:48:32 +02:00
Pieter-Jan Briers
8e91215d6f Fix exception in drink food visualizer. 2020-04-25 14:40:57 +02:00
Pieter-Jan Briers
f636303b8e Import proper reinforced wall sprites. 2020-04-25 12:10:43 +02:00
Pieter-Jan Briers
a535567317 Fix inventory buttons going blank when switching mob. 2020-04-25 00:58:23 +02:00
Pieter-Jan Briers
7e7dd45cc4 Fix LowWallOverlay ID reference. 2020-04-24 02:12:29 +02:00
Pieter-Jan Briers
5a09e91ca3 Arcade prop. 2020-04-23 23:51:15 +02:00
Pieter-Jan Briers
1fb9359d90 Fix HeldPrefix having different name on client. 2020-04-23 16:46:55 +02:00
Pieter-Jan Briers
32f66b6f9e Clothing visualization sets RSI and state atomically. 2020-04-23 16:04:23 +02:00
Víctor Aguilera Puerto
69ca8c2153 Some YAML cleanup (#840) 2020-04-22 17:50:55 +02:00
Pieter-Jan Briers
70161f35b6 Merge branches 'component-message-session' and 'message-submodule' 2020-04-20 16:02:09 +02:00
Jackson Lewis
3c6cbecb12 Remove redundancy 2020-04-20 12:57:05 +01:00
Jackson Lewis
6a22f2629b Update content repo and RobustToolbox 2020-04-20 10:36:02 +01:00
Pieter-Jan Briers
dcd8070a08 Adds command to show wires. 2020-04-20 09:45:45 +02:00
Pieter-Jan Briers
93c8007f5e Merge branch 'master' into prediction 2020-04-18 14:07:02 +02:00
Pieter-Jan Briers
cdf47aab44 Fix ghosts not being hidden when you do-aghost. 2020-04-17 19:11:10 +02:00
Pieter-Jan Briers
ec314545ef Fix ClientStatusEffectsComponent not cleaning up GUI on shutdown correctly. 2020-04-13 22:28:05 +02:00
Pieter-Jan Briers
0f554996ff Merge pull request #798 from PrPleGoo/DecimalReagents 
Decimal reagents
 2020-04-12 23:04:24 +02:00
PrPleGoo
7d72e672fd Merge branch 'master' into DecimalReagents 2020-04-12 14:37:36 +02:00
Pieter-Jan Briers
56d6720026 Move part of stack code to shared. 
Meaning that ExposeData is in shared, fixing #809
 2020-04-12 01:15:16 +02:00
Pieter-Jan Briers
1695787bab Merge pull request #807 from Zumorica/2020-04-10-proper-ghost-hiding 
Ghosts now make use of the new "entity visibility" engine functionality
 2020-04-12 01:00:42 +02:00
Pieter-Jan Briers
dc9f8d551b Merge pull request #805 from Zumorica/2020-04-09-comms-console-roundend 
Adds working communications console that ends the round
 2020-04-10 17:02:49 +02:00
zumorica
683644eec5 Ghosts now make use of the new "entity visibility" engine functionality 2020-04-10 16:28:14 +02:00
zumorica
05e9d39e89 Fix bug where comms console sometimes took a second to update after a countdown has started 2020-04-10 13:36:30 +02:00
zumorica
3c795ad283 Use TimeSpan instead of DateTime in RoundEnd and Comms Console. 2020-04-09 20:28:22 +02:00
PrPleGoo
20cb9b92ab Merge branch 'master' into DecimalReagents 2020-04-09 17:24:22 +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
zumorica
83e9688133 You can now cancel the timer (recall) 2020-04-09 01:43:28 +02:00
zumorica
64eafde0c3 Adds working communications console that ends the round 2020-04-09 00:28:56 +02:00