juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,588 Commits 57 Branches 0 Tags
e1324fff19e1f402d2fa7015ea62abe4c12d7fef
Commit Graph

1588 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FL-OZ
e1324fff19 Fix RND console keyboard sound being global. (#933) 
* global keyboard

* e

* fixes microwave while im at it

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
 2020-05-20 19:11:38 +02:00
chairbender
61e4a431a2 Remove TableParts, fix SmoothTile destruction bug (#918) 2020-05-17 16:04:44 +02:00
Víctor Aguilera Puerto
1b2063c998 Merge pull request #916 from 20kdc/fix-rotatable-swapped 
RotatableComponent: Fix "clockwise/counter-clockwise" verbs being swapped
 2020-05-17 01:09:09 +02:00
20kdc
dd38d2f763 RotatableComponent: Fix "clockwise/counter-clockwise" verbs being swapped 
"Clockwise" actually rotated it counter-clockwise and vice versa.

See response to https://discord.com/channels/310555209753690112/310555209753690112/711331672485789718 for confirmation that this is correct
 2020-05-16 22:43:13 +01:00
Pieter-Jan Briers
15ba4f50a4 Update submodule 2020-05-14 00:40:10 +02:00
GlassEclipse
27d27f2b59 Body System Part 1 POGGERS!!! (#855) 2020-05-13 21:48:49 +02:00
Pieter-Jan Briers
c9ce38a6a7 Merge pull request #892 from FL-OZ/microwave_hot_fix 2020-05-13 02:10:56 +02:00
Pieter-Jan Briers
1768d3b198 Merge pull request #902 from FL-OZ/storage_backpack_stuff 2020-05-13 02:10:19 +02:00
Pieter-Jan Briers
3ec2021b18 Merge pull request #910 from Zumorica/2020-05-12-ignore-components 2020-05-13 02:08:46 +02:00
Víctor Aguilera Puerto
db0ae00e1f Update Content.Client/EntryPoint.cs 
Co-authored-by: Clyybber <darkmine956@gmail.com>
 2020-05-12 21:24:39 +02:00
Pieter-Jan Briers
35f7eff3ac Merge pull request #909 from SweptWasTaken/fluff 2020-05-12 20:46:08 +02:00
Pieter-Jan Briers
69ce5763f3 Update submodule. 2020-05-12 18:36:41 +02:00
zumorica
ce0e20ea30 Ignore some server-side only components on the client 2020-05-12 14:45:35 +02:00
Swept
a0e839a6ad Fluff 2020-05-12 02:08:39 -07:00
FL-OZ
bb39a1d871 made it less dark 2020-05-11 19:36:05 -05:00
FL-OZ
c04b283dfc uses a visual cue to show that something can be put into the box 2020-05-11 18:38:49 -05:00
FL-OZ
f3f7422129 , AudioParams.Default to beep sounds. should fix global but probably doesnt 2020-05-11 16:59:02 -05:00
Pieter-Jan Briers
d1a6933e2e Merge pull request #906 from Clyybber/fix#673 2020-05-11 14:13:43 +02:00
Clyybber
7d58baa0e0 Fix #673 2020-05-11 13:54:31 +02:00
Pieter-Jan Briers
63b0df5ba2 Fix ItemSlotButton and HandsGui handling all input. 
Fixes #904
 2020-05-11 11:19:41 +02:00
Pieter-Jan Briers
033a6a82b5 Merge pull request #894 from FL-OZ/recipes_n_stuff 2020-05-11 11:08:08 +02:00
Pieter-Jan Briers
079dc839de Merge pull request #905 from ShadowCommander/FixHandDoubleClick 2020-05-11 11:07:46 +02:00
Pieter-Jan Briers
2f2900c441 Merge pull request #900 from Hugal31/feature/emote-speech-bubble 2020-05-11 10:54:48 +02:00
ShadowCommander
04ffe032dc Fixes hand double click from CanFocus 2020-05-10 22:48:14 -07:00
FL-OZ
3193a0a7b2 get rid of that 1!!! 2020-05-10 21:41:03 -05:00
FL-OZ
80796df5a3 Add placing items into storage when Storage UI is clicked with item in hand 2020-05-10 21:38:50 -05:00
Pieter-Jan Briers
1aa1867971 Merge pull request #899 from PaulRitter/wire_interact_check 2020-05-11 01:31:19 +02:00
Pieter-Jan Briers
594c8c09a5 Merge pull request #901 from FL-OZ/null_mapcoord_fix_really_annoying 2020-05-11 01:31:03 +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
c9c1d0dfd7 moar recipes 2020-05-10 00:38:41 -05:00
Hugo Laloge
a34983b095 Add emotes as borderless speech "bubbles" 2020-05-09 15:53:37 +02:00
FL-OZ
584f3a2240 moar recipes 1 2020-05-08 18:12:54 -05:00
Pieter-Jan Briers
6ff691c338 Make ActivateItemInWorld not canfocus. 2020-05-08 22:55:40 +02:00
Pieter-Jan Briers
329e5bca53 Update submodule. 2020-05-08 22:55:27 +02:00
Paul
531278ced1 added InRangeUnobstructed call to wire component 2020-05-08 14:01:33 +02:00
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
b1f30bf396 Supplemental PR for microwave. Reagent containers/ recipes/ reagents etc... 2020-05-07 10:58:30 -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
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
b9e59fc8d4 Audio processing benchmarks. 2020-05-05 23:58:56 +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
c8e2624390 lol 2020-05-04 19:59:43 -05: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