Commit Graph

7783 Commits

Author SHA1 Message Date
DrSmugleaf
8954071220 Allow multiline ifs if their body is not multiline itself for content (#2591)
* Allow multiline ifs if their body is not multiline itself

* sln.DotSettings

* Tabs bad
2020-11-21 12:01:08 +01:00
Pieter-Jan Briers
20fb55d8e9 "sandboxing" is a word. 2020-11-20 16:01:56 +01:00
Git-Nivrak
6d2882c7cf (Smaller) Construction PR - (IC Construction) (#2575)
* Disable Pulling When Buckling an entity

* Projectile Improvements

If you shoot at a person that is critted now it will only hit if you aim at that person otherwise go "above" him and hit other targets.
- Dead people are still unhitable

* Update Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>

* Firelock In Progress

* Revert "Projectile Improvements"

This reverts commit 5821afc798e49e530d4086d7a9ddbe097805fdc4.

* Firelock Graph

* Revert "Merge branch 'master' into test2"

This reverts commit c69661cc7d9dcdc6d8c0dd45770f9eb94b231463, reversing
changes made to 5f1de8b8d24cd52190addb3df5617cb1012fd52c.

* Bunch of stuff

- Metal Rods
- Reinforced Glass
- SetStackCount Condition
- Tables
- Lattice

* Output2 to FloorTileItemComponent

* Plating, Underplating and Tiles (+FloorTile Improvements)

* Turf Fixes

+ APC Electronics

* Reinforced Glass In-hand textures

* All the fixes

* Final Changes

* (Hopefully) Last commit

* Update Resources/Prototypes/Entities/Constructible/Doors/firelock_frame.yml

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Content.Server/GameObjects/Components/Atmos/FirelockComponent.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* A Few more things

* Edit FirelockComponent.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2020-11-20 15:58:06 +01:00
Pieter-Jan Briers
315b0621bc Use IDynamicTypeFactory instead of new T() in SharedMechanismComponent.cs 2020-11-20 15:45:10 +01:00
DrSmugleaf
ab1ce4b541 Update build-test.yml dotnet-version to 5.0.100 (#2586) 2020-11-20 13:14:41 +01:00
Pieter-Jan Briers
848cb8df62 Update submodule for .NET 5 2020-11-19 03:54:24 +01:00
Pieter-Jan Briers
112933fc6e Fix usage of wrong MathHelper class in AlertControl.cs 2020-11-19 03:34:26 +01:00
Morshu32
6967e8b7f8 Set requiredSlipSpeed default value to 0,1 to avoid slipping while standing still (#2582) 2020-11-18 21:58:36 +01:00
ColdAutumnRain
f5dc62b533 Removed EntityManager member variable from Components and EntitySystems (#2502)
* Removed EntityManager member variable from Components and EntitySystems

* Removed EntityManager with minor corecctions

* Update PathfindingSystem.cs

* Update InteractionSystem.cs

* Update Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>

* Update Content.Client/GameObjects/Components/Suspicion/SuspicionRoleComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Client/GameObjects/Components/Suspicion/TraitorOverlay.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/Buckle/BuckleComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/PDA/PDAComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/Singularity/SingularityComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/EntitySystems/AI/Pathfinding/PathfindingSystem.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/EntitySystems/Click/ExamineSystem.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/EntitySystems/Click/InteractionSystem.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

* Update Content.Server/GameObjects/Components/Stack/StackComponent.cs

Co-authored-by: Clyybber <darkmine956@gmail.com>

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
Co-authored-by: Clyybber <darkmine956@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-11-18 15:45:53 +01:00
DamianX
87e74c4494 Refactored integration tests to not use content entity prototypes (#2571)
* Refactored integration tests to not use content prototypes

* oops

* Apply suggestions from code review

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-11-19 01:30:36 +11:00
Paul Ritter
501156f84c makes conveyors to use machine linking & refactors machine linking a bit (#2464)
* makes conveyors to use machine linking & refactors machine linking a bit

* nullable errors

* temp commit, starting work on construction

* working recipies & graphs

* fixes crash

* makes items gravitate towards the center when on a conveyor

* makes conveyors take bool signal too

* ignores components clientside

* default arm
entitymanager
maxtransmitters
unsubscribe methods

* twowayLEVER

* _

* componentreference
struct

* yaml run
leverDefinitelyNotCopiedFromGirderNoNoNo dies today :(

* nullable

* no divide by 0

* making sloth happy

* space gone - happy?

* final fix

* yes

* adds item to lathe

* conveyor item -> conveyor assembly

* technology

* reviews ADRESSED

* Update Content.Shared/GameObjects/Verbs/VerbUtility.cs

Co-authored-by: Paul <ritter.paul1+git@googlemail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-19 00:53:46 +11:00
DrSmugleaf
2cae1ac641 Add test for being unable to pull anchored entities (#2476)
* Add test for being unable to pull anchored entities

* Change resolve to server.ResolveDependency

* Add extra prototypes

* Fix not waiting before resolving dependencies

* Fix missing physics component for the puller
2020-11-19 00:38:27 +11:00
metalgearsloth
9a10c672a6 Fix SharedPullable exception (#2431)
* Fix SharedPullable exception

* Smug in a bucket

* Logging

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-19 00:37:16 +11:00
DrSmugleaf
7677c3c03c Add test for IResettingEntitySystem resetting (#2442)
* Add test for IResettingEntitySystem resetting

* Fix test since a round start also resets systems
2020-11-19 00:24:13 +11:00
metalgearsloth
ca0ced2b61 Another github warning as error (#2516)
* Another github warning as error

* Also these ones.

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-18 18:19:25 +11:00
DrSmugleaf
f680f50059 Fix running showatmos twice not disabling the atmos overlay (#2557)
* Fix running showatmos twice not disabling the atmos overlay

* Remove entity manager dependency
2020-11-18 18:18:04 +11:00
DrSmugleaf
0790ad72d2 Add HideContextMenu component (#2555) 2020-11-18 18:16:56 +11:00
GlassEclipse
bab326a9e2 Fixes some map-saved weapons not properly loading in (#2567)
* Fix

* formatting xd
2020-11-18 18:16:01 +11:00
Morshu32
063db5d8d2 Removed Mop Bucket from JanitorClosetFilled and (#2565)
added a Mop Bucket inside the janitor spawn room.
2020-11-18 01:00:01 +01:00
DrSmugleaf
6549961a02 Update documentation for body system code (#2556) 2020-11-15 14:22:59 +11:00
DrSmugleaf
b1a7aef97d Make atmos debug overlay system data clear on round restart (#2558) 2020-11-15 14:16:02 +11:00
DrSmugleaf
2ded2163fe Make the MapFile a CVar (#2561) 2020-11-15 14:08:58 +11:00
Víctor Aguilera Puerto
43eb7a94f4 Make atmos commands work with +DEBUG 2020-11-13 17:39:53 +01:00
Víctor Aguilera Puerto
879b09c666 Make corn seeds actually plant corn instead of apples. 2020-11-13 17:39:22 +01:00
metalgearsloth
4704f607e6 Align storage welders with door welders (#2393)
* Align storage welders with door welders

* Spamming the button doesn't punish you.
* Requires lit welder to start
*

* Nulla-builda-buddy

* A certain smug in a bucket

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-14 01:08:00 +11:00
metalgearsloth
75e0667acb Make systems default to no paused comps (#2475)
* Make systems default to no paused comps

* Restore old paused

But with a new name

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-14 00:43:29 +11:00
metalgearsloth
02f827f063 Minor appearance changes (#2370)
* Minor appearance changes

* Remove that redundant deleted property

* Fixes and remove redundant checks

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-11-14 00:42:35 +11:00
metalgearsloth
4f03c81ddc DummyIcon test (#2515)
* DummyIcon test

Also the relevant fixes.

* Unbox this

* 3rd string

* Update Content.Client/GameObjects/Components/Kitchen/MicrowaveVisualizer.cs

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-11-14 00:27:13 +11:00
metalgearsloth
baa71e4ff0 Remove locker icons (#2489)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2020-11-14 00:19:24 +11:00
DTanxxx
69d709a28f Updated ContainerHelpers to use new extensions (#2530)
Co-authored-by: David Tan <>
2020-11-13 18:25:04 +11:00
metalgearsloth
9f9bd3ade6 Fix build (#2541)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2020-11-13 18:10:07 +11:00
Pieter-Jan Briers
4b5ab508ed Fix postgres problems with admins. 2020-11-13 03:23:13 +01:00
Pieter-Jan Briers
f364c4b01f Fix .NET 5 warnings in admin code. 2020-11-13 01:51:42 +01:00
Pieter-Jan Briers
2199739706 These are abbreviations, Rider. 2020-11-13 01:34:31 +01:00
Pieter-Jan Briers
fe30df83ac Update submodule 2020-11-13 01:32:20 +01:00
Pieter-Jan Briers
287c23dee3 Merge branch 'multiple-callbacks' into 20-11-13-merges 2020-11-13 01:30:07 +01:00
Pieter-Jan Briers
5ff8aa7fb1 Merge branch '20-10-30-admins' into 20-11-13-merges 2020-11-13 01:29:08 +01:00
Pieter-Jan Briers
9e36ef2202 Fix compiler warnings. 2020-11-11 01:48:54 +01:00
Pieter-Jan Briers
0918e14827 Fix issues with .NET 5. 2020-11-11 00:46:13 +01:00
Víctor Aguilera Puerto
44ee2b7ab6 Fix async usage in InteractionSystem
Fixes #2524
2020-11-10 22:47:43 +01:00
Pieter-Jan Briers
f8f177f43a More comments and a fix. 2020-11-10 22:00:07 +01:00
Pieter-Jan Briers
736f9958cc Cleanup, code review, comments. 2020-11-10 21:30:20 +01:00
Pieter-Jan Briers
7bc93bd2a9 Missed these in the merge, whoops. 2020-11-10 17:06:20 +01:00
Pieter-Jan Briers
00774e90ed Merge remote-tracking branch 'upstream/master' into 20-10-30-admins 2020-11-10 16:59:17 +01:00
Pieter-Jan Briers
e39ddd4802 Permissions panel. 2020-11-10 16:50:28 +01:00
ShadowCommander
e567e9fec1 Fix signallink command not working (#2534)
The InteractionSystem always returns true, so this change runs the SignalLinkerSystem CommandBind before InteractionSystem
2020-11-10 00:30:19 -08:00
Metal Gear Sloth
294985a7c6 Update submodule 2020-11-10 15:23:07 +11:00
chairbender
5f788c3318 Alerts System and UI (#2529)
* #272 add bordered panel for effects bar

* #272 avoid mouse overlapping tooltip when near edges,
change tooltip colors to match mockups

* #272 WIP defining status effect states as YML and
sending them as encoded integers

* #272 refactor to use new alert system

* #272 refactor to use new alert system

* #272 fix various bugs with new alert system and update
alerts to have color

* #272 WIP

* #272 rename status effects to alerts

* #272 WIP reworking alert internals to avoid code dup
and eliminate enum

* #272 refactor alerts to use
categories and fix various bugs

* #272 more alert bugfixes

* #272 alert ordering

* #272 callback-based approach for alert clicks

* #272 add debug commands for alerts

* #272 utilize new GridContainer capabilities for sizing of alerts tab

* #272 scale alerts height based on
window size

* #272 fix tooltip flicker

* #272 transparent alert panel

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 adjust styles to match injazz mockups more, add cooldown info in tooltip

* #272 alert prototype tests

* #272 alert manager tests

* #272 alert order tests

* #272 simple unit test for alerts component

* #272 integration test for alerts

* #272 rework alerts to use enums instead
of id / category

* #272 various cleanups for PR

* #272 use byte for more compact alert messages

* #272 rename StatusEffects folder to Alerts,
add missing NetSerializable
2020-11-10 15:22:19 +11:00
Exp
c82199610d Fix Exception when updating preview (#2533) 2020-11-09 18:36:45 +01:00
Swept
af060b5366 Replaces switches with cev-eris sprites. (#2526)
* Initial

* Removed old AME shielding sprite

* Update Resources/Textures/Constructible/Power/switch.rsi/meta.json

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-11-09 11:03:53 +01:00