Commit Graph

692 Commits

Author SHA1 Message Date
Pieter-Jan Briers ce2d6175d2 Handle MindComponent deletion:
You now get turned into a ghost if it happens, or return to body gets disabled if you were already ghosted.
2020-04-18 00:39:22 +02:00
Pieter-Jan Briers 4125c36e8d Allow mind transfer to entity if said entity is also the current visit target. 2020-04-18 00:38:43 +02:00
Pieter-Jan Briers c4f147bab4 Store original character name in mind. 2020-04-18 00:38:19 +02:00
Pieter-Jan Briers 2e57547ca2 Merge pull request #823 from Zumorica/2020-04-17-fix-my-shit 2020-04-17 21:01:37 +02:00
zumorica a408cdad0a Fix ControlMob not deleting ghosts 2020-04-17 19:28:08 +02:00
zumorica c2e328e5ae Turns out we don't need to spawn a timer to delete ghosts anymore 2020-04-17 19:23:06 +02:00
zumorica 02ccc6dc45 Only delete ghosts on return to body or unghost 2020-04-17 19:19:37 +02:00
zumorica 01e8e4784b Joining round as observer greys out return to body button 2020-04-17 19:16:42 +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 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
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
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
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
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
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
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
scuffedjays 3ce50879b7 New struct for basic round end info per player. 2020-04-10 01:37:14 -05: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
Injazz 6a08647375 uncomments setter 2020-04-09 16:49:19 +05:00
Injazz 8f580ecc1b Visually updates contents of the beaker
also adds new syringe sprite from eris
also adds colors to ALL reagents
2020-04-09 16:43:56 +05:00
zumorica 3ba2e5de80 Speech bubbles! 2020-04-09 03:31:40 +02:00
zumorica 5027367988 Add localization to deadchat 2020-04-09 03:08:06 +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
PrPleGoo a484b6fd52 Implementation of ISelfSerialize 2020-04-08 19:07:33 +02:00
Injazz 4174891c87 some fixes
removes unused interface from DrinkComponent
adds capability to fit inside dispensers for TransformableContainer
removes stomach component from character setup dummy
2020-04-08 17:12:00 +05:00
scuffedjays 02f9c5259c Add foundation for Round End Summary Screen.
Adjust GamePreset class, added title alongside description.
2020-04-08 06:07:54 -05:00
Injazz 1b8215ee49 commented out description setter 2020-04-08 16:06:24 +05: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
PrPleGoo 4e0242d47c Replace decimal with ReagentUnit 2020-04-05 11:36:12 +02:00
zumorica a0d114c672 Ghost sprites and a bunch of fixes 2020-04-05 02:29:04 +02:00