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

3455 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Swept
bdc4441a45 Adds rainbow jumpsuit (#2149) 
* Initial

* Fixes attribution

* Fixed

* Fixed

* Update Resources/Textures/Clothing/Uniforms/rainbow.rsi/meta.json

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-11-08 20:24:17 +01:00
Exp
d45072495e Adds a live preview to the character customizer (#2523) 
* Preview

* -Dispose Dummy
-Unsubscribe from OnServerDataLoaded
 2020-11-08 23:44:04 +11:00
Exp
6e3cc9e78a PDA Pen Holder (#2519) 
* -Adds pens to pdas
-Adds eject pen verb

* Reviews:
-Changed Container into ContainerSlot
-Starting prototypes are now nullable
-Removed double GetComp call

* EjectPen Button
 2020-11-08 23:43:13 +11:00
Swept
4a6d0ae5a4 More belts and welders (#2453) 
* Adds sprites

* Added prototypes

* Adds experimental and mini welder

* Adds welder to CE's belt

* Lazily filled out the belts

* Added to spawn jobs

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into pr/2453

* Update Resources/Prototypes/Entities/Objects/Tools/welders.yml

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

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-11-08 02:40:49 +01:00
Remie Richards
c580423f41 Fixes. Can no longer open while cooking. Can no longer cook while open. (#2521) 2020-11-08 01:10:55 +01:00
Víctor Aguilera Puerto
50f03a5b17 Fix firelock occlusion. 2020-11-07 23:58:33 +01:00
metalgearsloth
54e0747577 Fix crematorium visualizer crash (#2513) 
* Fix crematorium visualizer crash

* Also morgue

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-11-07 14:44:47 +11:00
DrSmugleaf
bf5b9ad03b Change cvar usages to use CVarDef and define them in CCVars (#2250) 
* Change cvar usages to use CVarDef and define them in CCVars

* Merge fixes

* Remove duplicate cvar registration
 2020-11-07 11:15:56 +11:00
Víctor Aguilera Puerto
a7e7f20417 Remove dependency. 
Yeah, let's not ever again. Please.
 2020-11-07 01:04:15 +01:00
DrSmugleaf
b5d00a2cf6 Buckle improvements (#2508) 
* Buckle improvements

* Update doc

* Remove redundant argument name

* Remove import
 2020-11-07 01:15:02 +11:00
DrSmugleaf
560f89b297 Fix AI crash when an entity is moved to an invalid grid (#2507) 2020-11-07 01:04:13 +11:00
DrSmugleaf
9926ef298c Move rotate event subscription from NodeContainerComponent to NodeContainerSystem (#2506) 2020-11-06 12:52:01 +01:00
Víctor Aguilera Puerto
8930ba845b Update submodule 2020-11-06 12:46:23 +01:00
Víctor Aguilera Puerto
089422fa99 Use EntitySystem proxies to (un)subscribe to event in BuckleSystem. 2020-11-06 12:43:38 +01:00
Víctor Aguilera Puerto
bb3aee90b2 FloorTileItem station extension/new grid creation (#2500) 
* FloorTileItemComponent can now extend the station, or create new grids.

* Fixes wrong interaction system EntityCoordinates check.
Needed for all this to work.
 2020-11-06 22:38:41 +11:00
Víctor Aguilera Puerto
6a469508ca Fix every BuckleComponent subscribing to EventBus when buckled (#2504) 2020-11-06 12:38:24 +01:00
Víctor Aguilera Puerto
60dd0de96f Fix crash when invalid construction prototype is passed. 
Fixes #2501
 2020-11-06 10:56:14 +01:00
metalgearsloth
864fa0a57c Minor device network changes (#2499) 
* Device network changes

* Update too

* Update Content.Server/GameObjects/EntitySystems/DeviceNetworkSystem.cs

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
 2020-11-05 18:04:21 +01:00
metalgearsloth
e62df15ef9 Add cvar for events (#2478) 
There's also the existing events command as well that's separate. I think there's value in having both? (Where mods can turn it on and off but not change the default?)

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-11-05 18:04:07 +01:00
metalgearsloth
14568bc10c Reset saltern disposal entries to default (#2486) 
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-11-05 17:58:41 +01:00
metalgearsloth
51d8d5dd9d Disable climbing when buckled (#2488) 
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2020-11-06 01:08:24 +11:00
ShadowCommander
8fa6f2c3de Add feedback to the signallink command (#2482) 2020-11-05 22:57:49 +11:00
Víctor Aguilera Puerto
5cac4c5917 RotatableComponent QOL improvements. 
- Rotatable verbs only show if the entity can be rotated.
- Adds parameter to rotate anchored entities.
- Office chairs can now be rotated regardless of anchoring.
 2020-11-04 11:21:01 +01:00
Víctor Aguilera Puerto
f54016f912 Fixes incorrect reagents in produce 2020-11-04 10:16:28 +01:00
zionnBE
2faff4963a Fix block game causing server crash (#2477) 
* Fix block game crashing server

* fffff i just noticed

* THIS is the correct property

* Ignore unpause if game has not started

* Init _currentPiece by BlockGame constructor
 2020-11-04 18:08:47 +11:00
Swept
1444074b24 Initial (#2450) 2020-11-03 14:14:46 -08:00
Swept
6a72a0365d Camera doesn't move on melee attack (#2107) 2020-11-03 13:30:36 -08:00
Víctor Aguilera Puerto
246b2fe6db Update submodule. 2020-11-03 19:36:54 +01:00