From 9de0e6c8e86bf37b0ef525b4609b198b5f86cedc Mon Sep 17 00:00:00 2001 From: CometVoid Date: Fri, 26 Jul 2024 13:20:19 -0700 Subject: [PATCH 1/4] merged upstream --- runclient.bat | 2 -- runserver.bat | 3 --- 2 files changed, 5 deletions(-) delete mode 100644 runclient.bat delete mode 100644 runserver.bat diff --git a/runclient.bat b/runclient.bat deleted file mode 100644 index 96237c34411..00000000000 --- a/runclient.bat +++ /dev/null @@ -1,2 +0,0 @@ -@echo off -dotnet run --project Content.Client diff --git a/runserver.bat b/runserver.bat deleted file mode 100644 index 5c3f8acecdf..00000000000 --- a/runserver.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -dotnet run --project Content.Server -pause From 2226e6851991f16343d61d38024f11721ab2278f Mon Sep 17 00:00:00 2001 From: CometVoid Date: Fri, 2 Aug 2024 20:13:14 -0700 Subject: [PATCH 2/4] added locked variations of arrivals and shipyard airlocks. --- .../Structures/Doors/Airlocks/access.yml | 22 +++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index a75bb1c27b6..5edb7f5066c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -7,6 +7,28 @@ - type: PriorityDock tag: DockShipyard +# locked variation of the shipyard dock. Allows tinyfans to be removed without causing large spacing due to tiding +- type: entity + parent: AirlockGlassShuttle + id: AirlockExternalGlassShuttleShipyardLocked + suffix: External, Shipyard, Glass, Docking, Locked + components: + - type: PriorityDock + tag: DockShipyard + containers: + board: [ DoorElectronicsExternal ] + +# locked variant of arrivals. Allows tinyfans to be removed without causing large spacing due to tiding +- type: entity + parent: AirlockGlassShuttle + id: AirlockExternalGlassShuttleArrivalsLocked + suffix: External, Arrivals, Glass, Docking, Locked + components: + - type: PriorityDock + tag: DockArrivals + containers: + board: [ DoorElectronicsExternal ] + # Delta V specific roles - type: entity parent: AirlockScience From 57443a355a46adacf5309527a442980686e206f0 Mon Sep 17 00:00:00 2001 From: CometVoid Date: Fri, 2 Aug 2024 20:25:45 -0700 Subject: [PATCH 3/4] re-added runclient.bat and runserver.bat because i forgot i deleted them --- runclient.bat | 2 ++ runserver.bat | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 runclient.bat create mode 100644 runserver.bat diff --git a/runclient.bat b/runclient.bat new file mode 100644 index 00000000000..96237c34411 --- /dev/null +++ b/runclient.bat @@ -0,0 +1,2 @@ +@echo off +dotnet run --project Content.Client diff --git a/runserver.bat b/runserver.bat new file mode 100644 index 00000000000..5c3f8acecdf --- /dev/null +++ b/runserver.bat @@ -0,0 +1,3 @@ +@echo off +dotnet run --project Content.Server +pause From b20e3e46a674235130b963a135af62a84e2db157 Mon Sep 17 00:00:00 2001 From: CometVoid Date: Fri, 2 Aug 2024 21:07:09 -0700 Subject: [PATCH 4/4] fixed the airlock yaml --- .../DeltaV/Entities/Structures/Doors/Airlocks/access.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml index 5edb7f5066c..00cd65580e2 100644 --- a/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml +++ b/Resources/Prototypes/DeltaV/Entities/Structures/Doors/Airlocks/access.yml @@ -15,6 +15,7 @@ components: - type: PriorityDock tag: DockShipyard + - type: ContainerFill containers: board: [ DoorElectronicsExternal ] @@ -26,6 +27,7 @@ components: - type: PriorityDock tag: DockArrivals + - type: ContainerFill containers: board: [ DoorElectronicsExternal ]