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

205 Commits

Author SHA1 Message Date
Pieter-Jan Briers
8794381697 Secure lockers & locker welding. 2020-05-25 13:58:56 +02:00
Swept
67143b1371 Toolboxes Update (#985) 2020-05-24 18:56:19 +02: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
31263f8597 Fixes ghosts being affected by gravity. 
Fixes #980
 2020-05-24 11:40:49 +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
cad59d2cb4 Fancy Verb Menu & Verb API Refactor (#928) 2020-05-23 03:09:44 +02:00
Pieter-Jan Briers
18ce80a43c Merge physics rewrite 2020-05-23 01:26:43 +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
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
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
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
Pieter-Jan Briers
fe23fdb620 Merge branch 'master' into kitchen 2020-05-05 11:35:20 +02:00
FL-OZ
c34081c514 revert sharedlathecomponent to master 2020-05-04 00:25:41 -05:00
Jackson Lewis
1f0c72dd28 Gravity (#841) 2020-05-02 16:02:52 +02:00
FL-OZ
dd19466578 Microwave interface. 2020-05-01 23:34:04 -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
Víctor Aguilera Puerto
55c54e415b Raycast has an overload for predicates, various fixes (#848) 2020-04-25 11:37:59 +02:00
Pieter-Jan Briers
b343f61268 Imports wooden flooring from Eris. 2020-04-22 17:49:42 +02:00
Sam
1ba222142a Created SharedInteractionSystem + Partial Fix #782 (#833) 2020-04-21 16:58:31 +02:00
Pieter-Jan Briers
c4ba83bdf3 Remove mispredict testing code. 2020-04-18 17:18:08 +02:00
Pieter-Jan Briers
93c8007f5e Merge branch 'master' into prediction 2020-04-18 14:07:02 +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
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
Pieter-Jan Briers
aff9f18bc8 Merge pull request #803 from Injazz/bartending 
Bartending tricks and some revamping on chemistry components
 2020-04-10 11:54:40 +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
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
PrPleGoo
9194694085 Fix initialization change 2020-04-08 19:43:16 +02:00
Injazz
d400f77129 Chemistry revamp and bartending features 
-Ability to mix drinks to create cocktails with shiny icons
-New Chemistry System which can relay chemistry events to corresponding components
-moved some solution logic from Shared to Server
-fixed some weird stuff with DrinkComponent
 2020-04-08 15:53:15 +05:00
PrPleGoo
db83789d05 Merge remote-tracking branch 'upstream/master' into DecimalReagents 2020-04-05 11:37:03 +02:00