Commit Graph

30691 Commits

Author SHA1 Message Date
Pieter-Jan Briers
cdf47aab44 Fix ghosts not being hidden when you do-aghost. 2020-04-17 19:11:10 +02:00
zumorica
73d754e2d2 Observers now get correct name on observe from lobby 2020-04-17 18:51:51 +02:00
PrPleGoo
7d6e6edcd1 Disable collision for things inside EntityStorageComponents + enable putting mobs in lockers 2020-04-17 15:40:17 +02:00
Pieter-Jan Briers
27771a31f0 Improvements to allow better connection dialog in content. 2020-04-17 14:46:25 +02:00
Pieter-Jan Briers
04eab336a4 Delete build-content.yml 2020-04-17 02:36:18 +02:00
Pieter-Jan Briers
b1ea062493 More actions attempts 2020-04-17 00:39:26 +02:00
Pieter-Jan Briers
f80cc1429f Attempt github actions 2020-04-17 00:29:29 +02:00
Pieter-Jan Briers
478fd35502 Merge pull request #802 from FL-OZ/round_end_screen 2020-04-16 22:33:38 +02:00
Pieter-Jan Briers
84d14ab185 Use new GetFromJson method for convenience. 2020-04-16 21:24:43 +02:00
Pieter-Jan Briers
a1c9ea8bbd GameTicker watchdog update integration. 2020-04-16 21:24:43 +02:00
Pieter-Jan Briers
f9ba0ddf24 Update submodule. 2020-04-16 21:24:43 +02:00
scuffedjays
43b27e93bc Fix the duration timing again. 2020-04-16 13:07:58 -05:00
scuffedjays
7ae8f8429d Fixed calculation of round duration 2020-04-15 17:46:53 -05:00
Pieter-Jan Briers
8888b7b9d4 Merge pull request #815 from PrPleGoo/DecimalReagents 2020-04-15 23:59:34 +02:00
FL-OZ
e5847910c7 Merge branch 'master' into round_end_screen 2020-04-15 14:00:56 -05:00
scuffedjays
1605a50098 Changed duration to use TimeSpan.
Using actual round realtime span to determine round length.
2020-04-14 23:26:37 -05:00
PrPleGoo
dffaf6e692 Merge branch 'master' into DecimalReagents 2020-04-14 15:41:50 +02:00
PrPleGoo
409d873403 Fix ratio issues on SlipSolution 2020-04-14 15:41:23 +02:00
Pieter-Jan Briers
ec314545ef Fix ClientStatusEffectsComponent not cleaning up GUI on shutdown correctly. 2020-04-13 22:28:05 +02:00
Pieter-Jan Briers
a4092acf5b Fix not returning to main menu on disconnect correctly. 2020-04-13 22:27:47 +02:00
Pieter-Jan Briers
7def5e7d6c Remove seemingly-unecessary DetachEntity() in GameScreenBase. 2020-04-13 22:26:05 +02:00
Pieter-Jan Briers
3da6b1145c Merge pull request #813 from Zumorica/2020-04-13-lightbulb-break
Light bulbs now break when thrown
2020-04-13 06:03:24 +02:00
zumorica
e9100db219 LightBulbs now break when thrown 2020-04-13 01:44:05 +02:00
Pieter-Jan Briers
0f554996ff Merge pull request #798 from PrPleGoo/DecimalReagents
Decimal reagents
2020-04-12 23:04:24 +02:00
PrPleGoo
d261a21b57 Fix up SolutionComponent 2020-04-12 14:44:14 +02:00
PrPleGoo
7d72e672fd Merge branch 'master' into DecimalReagents 2020-04-12 14:37:36 +02:00
PrPleGoo
1b438ca01d Merge remote-tracking branch 'upstream/master' 2020-04-12 14:33:49 +02:00
scuffedjays
18e10e289e Added tabs to separate player info and general round info.
Colored players IC name depending on antag status.
2020-04-12 00:59:44 -05: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
1695787bab Merge pull request #807 from Zumorica/2020-04-10-proper-ghost-hiding
Ghosts now make use of the new "entity visibility" engine functionality
2020-04-12 01:00:42 +02:00
Pieter-Jan Briers
5c6d045f3e Update submodule 2020-04-12 00:58:06 +02:00
scuffedjays
5d3018d76d Change frm ItemList to list of labels with markup 2020-04-11 10:31:44 -05:00
zumorica
c41eb3ba10 Remove unused visibility flags 2020-04-10 17:13:55 +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
zumorica
683644eec5 Ghosts now make use of the new "entity visibility" engine functionality 2020-04-10 16:28:14 +02:00
zumorica
c19035fccc Use TimeSpan instead of an int for the countdown time 2020-04-10 13:37:13 +02:00
zumorica
05e9d39e89 Fix bug where comms console sometimes took a second to update after a countdown has started 2020-04-10 13:36:30 +02:00
Víctor Aguilera Puerto
47c3258861 Update Content.Server/GameObjects/EntitySystems/RoundEndSystem.cs
Co-Authored-By: Pieter-Jan Briers <pieterjan.briers@gmail.com>
2020-04-10 13:28:28 +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
Injazz
503a2a8acf updates submodule 2020-04-10 12:08:33 +05:00
scuffedjays
3ce50879b7 New struct for basic round end info per player. 2020-04-10 01:37:14 -05:00
PrPleGoo
c18f318b80 MidpointRounding 2020-04-09 21:29:34 +02:00
PrPleGoo
4aa6c5cc69 Extra unit test 2020-04-09 20:43:45 +02:00
PrPleGoo
4e67f09488 Fixed comments
ReagentUnit now implements IComparable and IEquateable.
ReagentUnit now uses double internally.
Added multiplication without shifting for ints.
InvariantCulture for some string things.
Added units tests for Equals and CompareTo.
Added unit tests to Solution that deals with nasty fractionals.
2020-04-09 20:40:59 +02:00
zumorica
c55a4ffbf4 Countdown is now 4 minutes 2020-04-09 20:31:28 +02:00
zumorica
3c795ad283 Use TimeSpan instead of DateTime in RoundEnd and Comms Console. 2020-04-09 20:28:22 +02:00
Injazz
b73b8cf172 fixes 2020-04-09 20:38:31 +05:00
PrPleGoo
20cb9b92ab Merge branch 'master' into DecimalReagents 2020-04-09 17:24:22 +02:00
PrPleGoo
112d9e6d33 Merge remote-tracking branch 'upstream/master' 2020-04-09 17:23:51 +02:00
Pieter-Jan Briers
a6e6edab0e Update submodule 2020-04-09 16:57:10 +02:00