Víctor Aguilera Puerto
|
d89188a742
|
Merge branch 'master' into 2020-08-19-firelocks
# Conflicts:
# Content.Server/GameObjects/Components/Doors/ServerDoorComponent.cs
# Content.Shared/Maps/TurfHelpers.cs
# SpaceStation14.sln.DotSettings
|
2020-09-06 00:17:48 +02:00 |
|
metalgearsloth
|
72eb1fdc1c
|
Add door welding (#1951)
* Add door welding
Surprised this wasn't in already.
* smug's feedback
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
|
2020-08-30 11:16:29 +02:00 |
|
Víctor Aguilera Puerto
|
5190c04944
|
Some work
|
2020-08-19 12:23:42 +02:00 |
|
DrSmugleaf
|
c9057d01ae
|
Remove 2D suffix from visualizers (#1453)
|
2020-07-23 00:56:53 +02:00 |
|