zumorica
|
d2d6c2cecd
|
Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
# SpaceStation14.sln.DotSettings
|
2020-05-22 11:31:18 +02:00 |
|
zumorica
|
cb391ec3d8
|
Merge branch 'master' into 2020-05-18-midi
|
2020-05-21 19:50:09 +02:00 |
|
Víctor Aguilera Puerto
|
b270c69512
|
Merge pull request #911 from Zumorica/2020-05-13-stuns
Adds StunnableComponent, Stunbaton...
|
2020-05-21 19:48:19 +02:00 |
|
zumorica
|
d3102dbf96
|
Remove server-side RefreshInHands, refresh them on component state update
|
2020-05-21 19:44:49 +02:00 |
|
zumorica
|
78aa4fb872
|
Use Sequencer, improve MIDI a lot
|
2020-05-21 15:20:37 +02:00 |
|
zumorica
|
731ab22568
|
Better timing
|
2020-05-20 17:13:49 +02:00 |
|
zumorica
|
400a71f8a1
|
More refactors
|
2020-05-20 15:15:17 +02:00 |
|
zumorica
|
fede057bc4
|
Bunch of refactoring
|
2020-05-20 15:14:52 +02:00 |
|
zumorica
|
ea255b22c4
|
Attempt at queueing midi messages
|
2020-05-20 12:27:41 +02:00 |
|
Víctor Aguilera Puerto
|
312e8f17a5
|
Merge branch 'master' into 2020-04-28-tool-component
|
2020-05-19 14:19:45 +02:00 |
|
zumorica
|
06d2cc74ed
|
Refactor a bunch of stuff.
|
2020-05-19 14:17:48 +02:00 |
|
zumorica
|
b5cf3cf2da
|
Adds stun status effect
|
2020-05-14 17:44:09 +02:00 |
|
zumorica
|
a22c1cb196
|
Whoops.
|
2020-05-14 16:09:44 +02:00 |
|
zumorica
|
4fd4b4f6f3
|
Add method to AudioHelpers to get a random file from a sound collection
|
2020-05-14 16:05:36 +02:00 |
|
zumorica
|
2132ff41d4
|
In-hands are now refreshed when the prefix is changed
|
2020-05-14 15:44:05 +02:00 |
|
GlassEclipse
|
27d27f2b59
|
Body System Part 1 POGGERS!!! (#855)
|
2020-05-13 21:48:49 +02:00 |
|
zumorica
|
f968128af7
|
StandingStateHelper, StunSystem
|
2020-05-13 19:04:50 +02:00 |
|
Pieter-Jan Briers
|
c9ce38a6a7
|
Merge pull request #892 from FL-OZ/microwave_hot_fix
|
2020-05-13 02:10:56 +02:00 |
|
zumorica
|
b1db8d1e7a
|
Add WelderComponent back
|
2020-05-11 15:26:07 +02:00 |
|
zumorica
|
6ae5e36a18
|
Merge branch 'master' into 2020-04-28-tool-component
|
2020-05-11 12:24:43 +02:00 |
|
FL-OZ
|
28c50261ac
|
Fix a null reference exception (InteractionSystem) that crashed the hell out of the client.
|
2020-05-10 01:47:26 -05: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
|
fe23fdb620
|
Merge branch 'master' into kitchen
|
2020-05-05 11:35:20 +02:00 |
|
FLOZ
|
b803bee2c0
|
Remove unncessary class dictionary and list. Fix meal prototype properties.
|
2020-05-04 18:35:36 -05:00 |
|
Hugal31
|
fbaafa8366
|
Add smart equip shortcuts (#873)
|
2020-05-05 00:39:15 +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
|
c34081c514
|
revert sharedlathecomponent to master
|
2020-05-04 00:25:41 -05:00 |
|
FL-OZ
|
0abd0d8784
|
revert entrypoint to master
|
2020-05-04 00:24:19 -05:00 |
|
FL-OZ
|
6930bf220b
|
trying that again
|
2020-05-04 00:18:46 -05:00 |
|
FL-OZ
|
46ef79af60
|
Delete microwave.dmi, unneeded. Revert accidently changes to Shared EntryPoint.cs
|
2020-05-04 00:16:05 -05: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 |
|
Víctor Aguilera Puerto
|
5d7514674e
|
Suspicion on the Space Station gamemode (#849)
|
2020-05-03 11:25:39 +02:00 |
|
Fouin
|
ccbe4bc23f
|
Add pitch variations (#874)
|
2020-05-03 11:20:03 +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 |
|
Pieter-Jan Briers
|
cc1cf5e268
|
Set current culture in shared entrypoint.
|
2020-05-02 20:01:22 +02: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
|
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 |
|
FL-OZ
|
5d4c0609ec
|
ShadowCommander is MVP.
|
2020-04-30 23:07:27 -05:00 |
|
FL-OZ
|
93c3e86c9f
|
Unfuck mostly everything.
|
2020-04-30 18:08:51 -05:00 |
|
Pieter-Jan Briers
|
d4ca0a65ee
|
Screenshot button.
|
2020-04-30 12:45:21 +02:00 |
|
FL-OZ
|
8e0185f892
|
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.
|
2020-04-29 21:04:08 -05:00 |
|
zumorica
|
ff5549a0d1
|
Finish refactoring tools. Add multitools. (as in multiple tools in one)
|
2020-04-29 13:48:32 +02:00 |
|