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

148 Commits

Author SHA1 Message Date
Víctor Aguilera Puerto
cb5acf7cd3 Cooldown for status effects (#1109) 2020-06-12 16:22:36 +02:00
Tyler Young
077e726c33 add complete strings that aren't defined in content files to allow them to be mapped (#1105) 2020-06-12 04:15:10 +02:00
Pieter-Jan Briers
772010d4f0 Merge branch 'revert-virtualized-netids' 2020-06-09 00:40:23 +02:00
Tyler Young
c3fd0ef882 Revert "virtualize all net ids to reduce net traffic" 
This reverts commit 027c338c5f.

Formatting fix left in.
 2020-06-08 16:49:05 -04:00
Acruid
694a5dd332 Adds an integration test for saving and loading a multi grid map. 
Fixes a bug in SharedGalacticMarketComponent where the products were not being cleared between calls to ExposeData.
 2020-06-08 13:19:40 -07:00
Pieter-Jan Briers
60a875456a Merge branches '20-06-08-submodule', 'virtualize-netids', 'betterConstruction' and '20-06-08-addcomp-default' 2020-06-08 14:20:05 +02:00
Tyler Young
3754713f7f fix indentation 2020-06-08 07:12:49 -04:00
Tyler Young
027c338c5f virtualize all net ids to reduce net traffic 2020-06-08 06:37:59 -04:00
Clyybber
2995981b5e Better item construction 2020-06-07 19:42:00 +02:00
FL-OZ
fa9169e346 pda improvements (#1072) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
 2020-06-05 18:44:25 +02:00
AJCM-git
a89e806a50 Making improper nouns lower case. (#1020) 
Co-authored-by: Hugo Laloge <hugo.laloge@gmail.com>
 2020-06-04 18:45:07 +02:00
Pieter-Jan Briers
0f43e5e6ad Access refactor 
Access is now done through a list of access lists, instead of the necessary/sufficient system that was extremely confusing.

Added a "deny" list so you can screw over sec.

Cleaned the API up so it all uses sets and such.

PDA now relays access read-only to fix edge cases.
 2020-06-03 11:46:59 +02:00
Tyler Young
2eb715a9ca Fix up midi stuff, support mild black midis (#1056) 2020-06-02 20:42:23 +02:00
20kdc
a09131e817 Solar panels occlusion and tracking (#961) 2020-06-02 13:32:18 +02:00
FL-OZ
53900b79e9 Rename SoundComponent and refactor its wrong usages. (#1036) 
* Rename `SoundComponent` and refactor its wrong usages.

* Replace verbose IoC grabs with EntitySysetm.Get

* unused depend

Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
 2020-05-31 19:40:36 +02:00
FL-OZ
aa26bdfcae Rework Drink/Food/FoodContainer entirely (#1009) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-05-29 22:50:23 +02:00
Pieter-Jan Briers
836953370d Remove unused IoC resolve from SharedCombatModeComponent.cs 2020-05-28 22:08:01 +02:00
FL-OZ
4c20a504a5 Add basic PDA/Syndicate Uplink. (#942) 
Co-authored-by: FL-OZ <anotherscuffed@gmail.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2020-05-28 13:22:47 +02:00
Hugal31
ab6bc42a4a Begin to use text macros (#914) 2020-05-28 00:58:57 +02:00
Pieter-Jan Briers
195c16d800 Wire hacking is now fancy. 
1. new UI
2. wires are correctly randomized.
3. wires layouts
are shared across machines in the same round.
 2020-05-27 15:24:07 +02:00
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
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
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
ea255b22c4 Attempt at queueing midi messages 2020-05-20 12:27:41 +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
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
Jackson Lewis
1f0c72dd28 Gravity (#841) 2020-05-02 16:02:52 +02: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
b343f61268 Imports wooden flooring from Eris. 2020-04-22 17:49:42 +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