Swept
|
08039c48e1
|
Updated
|
2020-05-24 21:07:41 -07:00 |
|
Víctor Aguilera Puerto
|
1c00bf2855
|
Merge pull request #865 from Zumorica/2020-04-28-tool-component
Tool refactor, multi tools
|
2020-05-24 13:42:02 +02:00 |
|
Pieter-Jan Briers
|
1fca133688
|
Improve marker visualization for mapping.
Command renamed to showmarkers.
Actually permanent (so if you place markers with it active, you immediately see them).
|
2020-05-24 01:47:14 +02:00 |
|
zumorica
|
3029e31e4a
|
Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
# Content.Server/GameObjects/Components/AnchorableComponent.cs
# Content.Server/GameObjects/Components/Gravity/GravityGeneratorComponent.cs
# Content.Server/GameObjects/Components/Interactable/Tools/CrowbarComponent.cs
# Content.Server/GameObjects/Components/Power/PowerTransferComponent.cs
# Content.Server/GameObjects/Components/WiresComponent.cs
# Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs
# Resources/Prototypes/Entities/Items/tools.yml
|
2020-05-23 12:02:34 +02:00 |
|
chairbender
|
6a4d78cfac
|
Add interaction checks to all interactions (#923)
|
2020-05-23 11:27:31 +02:00 |
|
Pieter-Jan Briers
|
18ce80a43c
|
Merge physics rewrite
|
2020-05-23 01:26:43 +02:00 |
|
FL-OZ
|
613e1619fa
|
satiates abrahams hunger for microwave fixes
|
2020-05-22 17:22:42 -05:00 |
|
Pieter-Jan Briers
|
c8075445dd
|
Fix compile on full release.
|
2020-05-22 21:39:13 +02:00 |
|
Pieter-Jan Briers
|
126c5942a4
|
Merge branches '2020-05-18-midi' and '20-05-22-midi-update'
|
2020-05-22 18:02:24 +02:00 |
|
Pieter-Jan Briers
|
40432cdc14
|
TG locker sprites & prototypes.
Closes #947
|
2020-05-22 15:45:46 +02:00 |
|
zumorica
|
d2d6c2cecd
|
Merge branch 'master' into 2020-04-28-tool-component
# Conflicts:
# SpaceStation14.sln.DotSettings
|
2020-05-22 11:31:18 +02:00 |
|
zumorica
|
15beb2b87a
|
Remove useless log.
|
2020-05-21 20:19:05 +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
|
0235f6096e
|
Sync sequencer tick correctly
|
2020-05-21 17:39:48 +02:00 |
|
zumorica
|
78aa4fb872
|
Use Sequencer, improve MIDI a lot
|
2020-05-21 15:20:37 +02:00 |
|
zumorica
|
1e36851dde
|
Timing boogaloo
|
2020-05-21 00:26:43 +02:00 |
|
zumorica
|
6db9ac7247
|
Improved timing
|
2020-05-20 17:48:36 +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
|
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 |
|
chairbender
|
61e4a431a2
|
Remove TableParts, fix SmoothTile destruction bug (#918)
|
2020-05-17 16:04:44 +02:00 |
|
zumorica
|
014c51f913
|
Makes SetRotation on SpeciesVisualizer2D private
|
2020-05-14 17:51:57 +02:00 |
|
zumorica
|
b5cf3cf2da
|
Adds stun status effect
|
2020-05-14 17:44:09 +02:00 |
|
zumorica
|
735ba70f4a
|
Remove unused using statement
|
2020-05-14 16:08:35 +02:00 |
|
zumorica
|
2132ff41d4
|
In-hands are now refreshed when the prefix is changed
|
2020-05-14 15:44:05 +02:00 |
|
zumorica
|
567c0a1312
|
Animation for when mobs fall/stand
|
2020-05-14 13:34:45 +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 |
|
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 |
|
zumorica
|
94491e9626
|
Cleanup code a little.
|
2020-05-11 15:40:33 +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
|
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 |
|
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
|
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 |
|
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 |
|