diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
index 8585b6925d8..3dd2d2ae5ec 100644
--- a/Content.Server/Connection/ConnectionManager.cs
+++ b/Content.Server/Connection/ConnectionManager.cs
@@ -249,9 +249,21 @@ session.Status is SessionStatus.Connected or SessionStatus.InGame
if (showReason && !haveMinOverallTime && !bypassAllowed)
{
+ // Frontier: panic bunker message, print minutes/hours depending on how much time left.
+ double minutesNeeded = minOverallMinutes - (overallTime?.TimeSpent.TotalMinutes ?? 0.0);
+ string reason;
+ if (minutesNeeded > 60)
+ {
+ reason = Loc.GetString("panic-bunker-account-reason-nf-overall-hours", ("hours", $"{minOverallMinutes / 60.0:F1}"), ("timeLeft", $"{minutesNeeded / 60.0:F1}"));
+ }
+ else
+ {
+ reason = Loc.GetString("panic-bunker-account-reason-nf-overall-minutes", ("hours", $"{minOverallMinutes / 60.0:F1}"), ("timeLeft", $"{minutesNeeded:F0}"));
+ }
return (ConnectionDenyReason.Panic,
- Loc.GetString("panic-bunker-account-denied-reason",
- ("reason", Loc.GetString("panic-bunker-account-reason-overall", ("minutes", minOverallMinutes)))), null);
+ Loc.GetString("panic-bunker-account-denied-reason-nf",
+ ("reason", reason)), null);
+ // End Frontier
}
if (!validAccountAge || !haveMinOverallTime && !bypassAllowed)
diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml
index 65562e97789..a24c38688dd 100644
--- a/Resources/Changelog/Frontier.yml
+++ b/Resources/Changelog/Frontier.yml
@@ -4819,3 +4819,15 @@ Entries:
already present on the device.
id: 5438
time: '2024-10-20T19:33:09.0000000+00:00'
+- author: MisterMecky
+ changes:
+ - type: Fix
+ message: Duffelbags once again slow their wearer's sprint speed by 10%.
+ id: 5439
+ time: '2024-10-21T21:44:53.0000000+00:00'
+- author: dustylens
+ changes:
+ - type: Fix
+ message: 'Fixed Hunter power issues. Brought up to spec. '
+ id: 5440
+ time: '2024-10-22T05:03:37.0000000+00:00'
diff --git a/Resources/Locale/en-US/_NF/connection-messages.ftl b/Resources/Locale/en-US/_NF/connection-messages.ftl
new file mode 100644
index 00000000000..cb27946ff4a
--- /dev/null
+++ b/Resources/Locale/en-US/_NF/connection-messages.ftl
@@ -0,0 +1,10 @@
+panic-bunker-account-denied-reason-nf =
+ This server is in panic bunker mode, often enabled as a precaution against raids.
+ New connections by accounts not meeting certain requirements are temporarily not accepted. Try again later.
+ Reason: "{$reason}"
+panic-bunker-account-reason-nf-overall-hours =
+ Your overall playtime on the server must be greater than {$hours} hours.
+ You need {$timeLeft} more hours to meet this requirement.
+panic-bunker-account-reason-nf-overall-minutes =
+ Your overall playtime on the server must be greater than {$hours} hours.
+ You need {$timeLeft} more minutes to meet this requirement.
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
index c41173ce9dc..c31a2ecfc22 100644
--- a/Resources/Locale/en-US/_NF/guidebook/guides.ftl
+++ b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -38,6 +38,7 @@ guide-entry-shipyard-ceres = Ceres
guide-entry-shipyard-chisel = Chisel
guide-entry-shipyard-comet = Comet
guide-entry-shipyard-construct = Construct
+guide-entry-shipyard-eagle = Eagle
guide-entry-shipyard-garden = Garden
guide-entry-shipyard-gasbender = Gasbender
guide-entry-shipyard-gourd = Gourd
@@ -55,6 +56,7 @@ guide-entry-shipyard-loader = Loader
guide-entry-shipyard-mccargo = McCargo
guide-entry-shipyard-mcdelivery = McDelivery
guide-entry-shipyard-pathfinder = Pathfinder
+guide-entry-shipyard-phoenix = Phoenix
guide-entry-shipyard-pioneer = Pioneer
guide-entry-shipyard-placebo = Placebo
guide-entry-shipyard-prospector = Prospector
diff --git a/Resources/Locale/en-US/_NF/lathe/recipes.ftl b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
index bf08e3ef3b3..8c4eb95c33f 100644
--- a/Resources/Locale/en-US/_NF/lathe/recipes.ftl
+++ b/Resources/Locale/en-US/_NF/lathe/recipes.ftl
@@ -21,4 +21,7 @@ lathe-recipe-NFFoodBoxPizza-name = pizza box (empty)
lathe-recipe-NFFoodBoxDonutEmpty-name = donut box (empty)
lathe-recipe-NFFoodBoxNuggetEmpty-name = chicken nuggets (empty)
lathe-recipe-NFFoodContainerEggEmpty-name = egg carton (empty)
-lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
\ No newline at end of file
+lathe-recipe-NFBoxMREEmpty-name = M.R.E. (empty)
+
+# Plastic
+lathe-recipe-NFFoodBoxSushi-name = sushi tray (empty)
\ No newline at end of file
diff --git a/Resources/Maps/_NF/POI/grifty.yml b/Resources/Maps/_NF/POI/grifty.yml
index 6aceed30899..a95ffdd464f 100644
--- a/Resources/Maps/_NF/POI/grifty.yml
+++ b/Resources/Maps/_NF/POI/grifty.yml
@@ -24,11 +24,11 @@ entities:
chunks:
0,0:
ind: 0,0
- tiles: PgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADbQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAARwAAAAACRwAAAAACRwAAAAABRwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAARwAAAAAARwAAAAACRwAAAAAARwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAABRwAAAAACRwAAAAAA
+ tiles: PgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAACHgAAAAAAHgAAAAADHgAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHgAAAAADHgAAAAAAHgAAAAADHgAAAAADbQAAAAABPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAABRwAAAAABRwAAAAADRwAAAAABfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAACRwAAAAACRwAAAAABRwAAAAACfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAACRwAAAAAARwAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAARwAAAAAARwAAAAABRwAAAAACRwAAAAAA
version: 6
-1,0:
ind: -1,0
- tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAA
+ tiles: AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAPgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAACHgAAAAACHgAAAAABHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAcwAAAAAAcwAAAAAAfQAAAAAAHgAAAAACHgAAAAADHgAAAAABHgAAAAADHgAAAAABHgAAAAACHgAAAAADAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAbQAAAAADbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAcwAAAAAAfQAAAAAAHgAAAAAAHgAAAAAAHgAAAAABHgAAAAACfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAbQAAAAAAbQAAAAABfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfQAAAAAAfQAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAfQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAAfAAAAAAA
version: 6
0,-1:
ind: 0,-1
@@ -297,26 +297,25 @@ entities:
0: 4097
0,2:
1: 1041
- 2: 51968
+ 2: 19200
3: 12
-1,2:
- 1: 6152
+ 1: 2056
0: 19
- 2: 34560
+ 2: 38656
0,3:
2: 65295
1: 240
-1,3:
- 2: 36622
+ 2: 65294
1: 241
1,0:
0: 65535
1,1:
0: 61422
1,2:
- 2: 16128
+ 2: 12032
0: 14
- 1: 49152
1,3:
2: 65283
1: 252
@@ -332,7 +331,7 @@ entities:
0: 1
2: 62208
2,3:
- 2: 63239
+ 2: 65295
1: 240
3,2:
1: 61440
@@ -353,9 +352,8 @@ entities:
-2,0:
0: 65535
-2,2:
- 2: 3600
+ 2: 36624
0: 142
- 1: 32768
-3,3:
1: 128
-2,3:
@@ -728,6 +726,26 @@ entities:
parent: 1
- proto: AtmosFixBlockerMarker
entities:
+ - uid: 89
+ components:
+ - type: Transform
+ pos: -1.5,15.5
+ parent: 1
+ - uid: 108
+ components:
+ - type: Transform
+ pos: -2.5,15.5
+ parent: 1
+ - uid: 599
+ components:
+ - type: Transform
+ pos: -7.5,10.5
+ parent: 1
+ - uid: 600
+ components:
+ - type: Transform
+ pos: -3.5,15.5
+ parent: 1
- uid: 812
components:
- type: Transform
@@ -853,31 +871,11 @@ entities:
- type: Transform
pos: 8.5,11.5
parent: 1
- - uid: 844
- components:
- - type: Transform
- pos: 7.5,11.5
- parent: 1
- - uid: 845
- components:
- - type: Transform
- pos: 6.5,11.5
- parent: 1
- uid: 846
components:
- type: Transform
pos: 5.5,11.5
parent: 1
- - uid: 847
- components:
- - type: Transform
- pos: 4.5,11.5
- parent: 1
- - uid: 848
- components:
- - type: Transform
- pos: 3.5,11.5
- parent: 1
- uid: 849
components:
- type: Transform
@@ -1552,6 +1550,11 @@ entities:
parent: 1
- proto: CableApcExtension
entities:
+ - uid: 133
+ components:
+ - type: Transform
+ pos: 11.5,13.5
+ parent: 1
- uid: 134
components:
- type: Transform
@@ -1682,21 +1685,6 @@ entities:
- type: Transform
pos: 10.5,13.5
parent: 1
- - uid: 446
- components:
- - type: Transform
- pos: 11.5,13.5
- parent: 1
- - uid: 447
- components:
- - type: Transform
- pos: 12.5,13.5
- parent: 1
- - uid: 448
- components:
- - type: Transform
- pos: 13.5,13.5
- parent: 1
- uid: 449
components:
- type: Transform
@@ -1944,6 +1932,11 @@ entities:
parent: 1
- proto: CableHV
entities:
+ - uid: 129
+ components:
+ - type: Transform
+ pos: -5.5,8.5
+ parent: 1
- uid: 136
components:
- type: Transform
@@ -2054,11 +2047,6 @@ entities:
- type: Transform
pos: 9.5,12.5
parent: 1
- - uid: 159
- components:
- - type: Transform
- pos: 10.5,12.5
- parent: 1
- uid: 160
components:
- type: Transform
@@ -2144,11 +2132,6 @@ entities:
- type: Transform
pos: 9.5,14.5
parent: 1
- - uid: 177
- components:
- - type: Transform
- pos: 10.5,14.5
- parent: 1
- uid: 178
components:
- type: Transform
@@ -2194,6 +2177,16 @@ entities:
- type: Transform
pos: -6.5,6.5
parent: 1
+ - uid: 518
+ components:
+ - type: Transform
+ pos: -4.5,8.5
+ parent: 1
+ - uid: 598
+ components:
+ - type: Transform
+ pos: -6.5,8.5
+ parent: 1
- uid: 702
components:
- type: Transform
@@ -2256,12 +2249,6 @@ entities:
parent: 1
- proto: Catwalk
entities:
- - uid: 108
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -4.5,11.5
- parent: 1
- uid: 109
components:
- type: Transform
@@ -2376,12 +2363,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 9.5,13.5
parent: 1
- - uid: 129
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 10.5,13.5
- parent: 1
- uid: 130
components:
- type: Transform
@@ -2394,22 +2375,10 @@ entities:
rot: 1.5707963267948966 rad
pos: 7.5,12.5
parent: 1
- - uid: 132
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: 7.5,11.5
- parent: 1
- - uid: 133
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 6.5,11.5
- parent: 1
- - uid: 199
+ - uid: 159
components:
- type: Transform
- pos: -3.5,11.5
+ pos: 10.5,13.5
parent: 1
- uid: 281
components:
@@ -2717,70 +2686,13 @@ entities:
- type: Transform
pos: -1.5,0.5
parent: 1
-- proto: DrinkAleBottleFull
- entities:
- - uid: 590
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 591
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 592
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkBeerBottleFull
- entities:
- - uid: 587
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 589
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 593
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkChampagneBottleFull
- entities:
- - uid: 602
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkCreamCarton
+- proto: DogBed
entities:
- - uid: 515
+ - uid: 557
components:
- type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
+ pos: -9.5,3.5
+ parent: 1
- proto: DrinkEnergyDrinkCan
entities:
- uid: 698
@@ -2801,47 +2713,6 @@ entities:
Quantity: 25
- type: Openable
opened: True
-- proto: DrinkGildlagerBottleFull
- entities:
- - uid: 594
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkGinBottleFull
- entities:
- - uid: 596
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 598
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 600
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkMilkCarton
- entities:
- - uid: 516
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- proto: DrinkNuclearColaGlass
entities:
- uid: 711
@@ -2859,65 +2730,6 @@ entities:
- type: Transform
pos: 7.365638,4.4086084
parent: 1
-- proto: DrinkOatMilkCarton
- entities:
- - uid: 517
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkRumBottleFull
- entities:
- - uid: 597
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 599
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- - uid: 601
- components:
- - type: Transform
- parent: 595
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkSoyMilkCarton
- entities:
- - uid: 514
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: DrinkVermouthBottleFull
- entities:
- - uid: 588
- components:
- - type: Transform
- parent: 586
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
-- proto: EggBoxBroken
- entities:
- - uid: 519
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- proto: EmergencyLight
entities:
- uid: 768
@@ -3149,15 +2961,6 @@ entities:
- type: Transform
pos: -2.3975186,2.7845416
parent: 1
-- proto: FoodContainerEgg
- entities:
- - uid: 513
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- proto: FoodDonkpocketHonk
entities:
- uid: 561
@@ -3165,15 +2968,6 @@ entities:
- type: Transform
pos: -0.22007972,5.7634063
parent: 1
-- proto: FoodMeatRotten
- entities:
- - uid: 518
- components:
- - type: Transform
- parent: 512
- - type: Physics
- canCollide: False
- - type: InsideEntityStorage
- proto: GasCanisterBrokenBase
entities:
- uid: 231
@@ -3186,20 +2980,26 @@ entities:
- type: Transform
pos: 13.5,12.5
parent: 1
-- proto: GasFilterFlipped
+- proto: GasFilterNitrogenOn
entities:
- uid: 371
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: -0.5,10.5
+ pos: 2.5,10.5
parent: 1
- - uid: 372
+ - type: AtmosPipeColor
+ color: '#990000FF'
+- proto: GasFilterOxygenOn
+ entities:
+ - uid: 363
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: 2.5,10.5
+ pos: -0.5,10.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#990000FF'
- proto: GasMixerOn
entities:
- uid: 106
@@ -3211,6 +3011,16 @@ entities:
- type: GasMixer
inletTwoConcentration: 0.79
inletOneConcentration: 0.21
+- proto: GasMixerOnFlipped
+ entities:
+ - uid: 372
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 10.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- proto: GasOutletInjector
entities:
- uid: 239
@@ -3237,21 +3047,29 @@ entities:
- type: Transform
pos: 3.5,8.5
parent: 1
- - uid: 363
+ - uid: 384
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -6.5,10.5
+ rot: -1.5707963267948966 rad
+ pos: 5.5,10.5
parent: 1
- - type: AtmosPipeColor
- color: '#990000FF'
- proto: GasPipeBend
entities:
+ - uid: 42
+ components:
+ - type: Transform
+ rot: 3.141592653589793 rad
+ pos: 10.5,11.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 202
components:
- type: Transform
pos: 13.5,15.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 234
components:
- type: Transform
@@ -3320,30 +3138,30 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,5.5
parent: 1
- - uid: 383
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 8.5,10.5
- parent: 1
- - uid: 384
+ - uid: 377
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: 8.5,11.5
+ pos: -4.5,15.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 398
components:
- type: Transform
rot: -1.5707963267948966 rad
pos: 13.5,11.5
parent: 1
- - uid: 720
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 513
components:
- type: Transform
rot: 1.5707963267948966 rad
- pos: 6.5,15.5
+ pos: -5.5,10.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#990000FF'
- proto: GasPipeStraight
entities:
- uid: 14
@@ -3352,6 +3170,27 @@ entities:
rot: 3.141592653589793 rad
pos: 2.5,9.5
parent: 1
+ - uid: 73
+ components:
+ - type: Transform
+ pos: 10.5,13.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 177
+ components:
+ - type: Transform
+ pos: 10.5,14.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 196
+ components:
+ - type: Transform
+ pos: 10.5,12.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 233
components:
- type: Transform
@@ -3726,14 +3565,6 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#0055CCFF'
- - uid: 362
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: -4.5,10.5
- parent: 1
- - type: AtmosPipeColor
- color: '#990000FF'
- uid: 364
components:
- type: Transform
@@ -3783,18 +3614,14 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#990000FF'
- - uid: 377
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 4.5,10.5
- parent: 1
- uid: 381
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 5.5,10.5
+ rot: 1.5707963267948966 rad
+ pos: 2.5,15.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 386
components:
- type: Transform
@@ -3811,30 +3638,190 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#0055CCFF'
- - uid: 617
+ - uid: 446
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 3.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 447
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 4.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 448
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 5.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 512
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 6.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 514
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 8.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 515
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 12.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 516
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 12.5,11.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 517
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,14.5
+ pos: -5.5,8.5
parent: 1
- - uid: 708
+ - type: AtmosPipeColor
+ color: '#990000FF'
+ - uid: 519
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 9.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 587
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 1.5,10.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#990000FF'
+ - uid: 588
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 0.5,10.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#990000FF'
+ - uid: 589
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 7.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 590
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -3.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 591
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -2.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 592
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 11.5,11.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 593
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 11.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 594
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -1.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 595
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -0.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 596
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 0.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 597
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 1.5,15.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 602
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,13.5
+ pos: -4.5,12.5
parent: 1
- - uid: 713
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 617
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,12.5
+ pos: -4.5,13.5
parent: 1
- - uid: 719
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
+ - uid: 648
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,11.5
+ pos: -4.5,14.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 723
components:
- type: Transform
@@ -3853,13 +3840,6 @@ entities:
color: '#0055CCFF'
- proto: GasPipeTJunction
entities:
- - uid: 42
- components:
- - type: Transform
- pos: -5.5,10.5
- parent: 1
- - type: AtmosPipeColor
- color: '#990000FF'
- uid: 254
components:
- type: Transform
@@ -3925,8 +3905,10 @@ entities:
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 6.5,10.5
+ pos: -4.5,10.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#990000FF'
- uid: 726
components:
- type: Transform
@@ -3950,12 +3932,16 @@ entities:
- type: Transform
pos: 13.5,12.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 223
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 13.5,14.5
parent: 1
+ - type: AtmosPipeColor
+ color: '#03FCD3FF'
- uid: 310
components:
- type: Transform
@@ -3966,12 +3952,6 @@ entities:
color: '#0055CCFF'
- proto: GasPressurePump
entities:
- - uid: 196
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 12.5,15.5
- parent: 1
- uid: 242
components:
- type: Transform
@@ -3992,12 +3972,6 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#990000FF'
- - uid: 557
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 12.5,11.5
- parent: 1
- proto: GasPressurePumpOn
entities:
- uid: 324
@@ -4005,16 +3979,23 @@ entities:
- type: Transform
pos: 3.5,6.5
parent: 1
-- proto: GasPressurePumpOnMax
+- proto: GasValve
entities:
- - uid: 232
+ - uid: 383
components:
- type: Transform
- rot: 3.141592653589793 rad
- pos: -5.5,8.5
+ rot: 1.5707963267948966 rad
+ pos: 4.5,10.5
parent: 1
+ - uid: 601
+ components:
+ - type: Transform
+ pos: -4.5,11.5
+ parent: 1
+ - type: GasValve
+ open: False
- type: AtmosPipeColor
- color: '#990000FF'
+ color: '#03FCD3FF'
- proto: GasVentPump
entities:
- uid: 238
@@ -4275,175 +4256,13 @@ entities:
- type: Transform
rot: 1.5707963267948966 rad
pos: 0.5,9.5
- parent: 1
-- proto: GunSafe
- entities:
- - uid: 563
- components:
- - type: Transform
- pos: -5.5,6.5
- parent: 1
- - type: EntityStorage
- air:
- volume: 200
- immutable: False
- temperature: 293.1497
- moles:
- - 0.1517475
- - 0.57085973
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - type: ContainerContainer
- containers:
- entity_storage: !type:Container
- showEnts: False
- occludes: True
- ents:
- - 296
- - 528
- - 388
- - 219
- paper_label: !type:ContainerSlot
- showEnts: False
- occludes: True
- ent: null
-- proto: HospitalCurtains
- entities:
- - uid: 492
- components:
- - type: Transform
- pos: -8.5,7.5
- parent: 1
- - type: Door
- secondsUntilStateChange: -6181.815
- state: Opening
-- proto: Lamp
- entities:
- - uid: 564
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -0.58854175,6.107703
- parent: 1
-- proto: LightBulbBroken
- entities:
- - uid: 666
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 1.89151,6.8016806
- parent: 1
- - uid: 816
- components:
- - type: Transform
- parent: 815
- - type: Physics
- canCollide: False
-- proto: LightTubeBroken
- entities:
- - uid: 632
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: 0.16488624,6.033028
- parent: 1
-- proto: LockerBooze
- entities:
- - uid: 586
- components:
- - type: Transform
- pos: 7.5,8.5
- parent: 1
- - type: EntityStorage
- air:
- volume: 200
- immutable: False
- temperature: 293.14972
- moles:
- - 1.8968438
- - 7.1357465
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - type: ContainerContainer
- containers:
- entity_storage: !type:Container
- showEnts: False
- occludes: True
- ents:
- - 591
- - 592
- - 593
- - 594
- - 587
- - 588
- - 589
- - 590
- paper_label: !type:ContainerSlot
- showEnts: False
- occludes: True
- ent: null
- - uid: 595
- components:
- - type: Transform
- pos: 6.5,8.5
- parent: 1
- - type: EntityStorage
- air:
- volume: 200
- immutable: False
- temperature: 293.14972
- moles:
- - 1.8968438
- - 7.1357465
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - 0
- - type: ContainerContainer
- containers:
- entity_storage: !type:Container
- showEnts: False
- occludes: True
- ents:
- - 602
- - 596
- - 597
- - 598
- - 599
- - 600
- - 601
- paper_label: !type:ContainerSlot
- showEnts: False
- occludes: True
- ent: null
-- proto: LockerFreezerBase
+ parent: 1
+- proto: GunSafe
entities:
- - uid: 512
+ - uid: 563
components:
- type: Transform
- pos: 2.5,3.5
+ pos: -5.5,6.5
parent: 1
- type: EntityStorage
air:
@@ -4451,8 +4270,8 @@ entities:
immutable: False
temperature: 293.1497
moles:
- - 1.8968438
- - 7.1357465
+ - 0.1517475
+ - 0.57085973
- 0
- 0
- 0
@@ -4469,17 +4288,68 @@ entities:
showEnts: False
occludes: True
ents:
- - 513
- - 514
- - 515
- - 516
- - 517
- - 518
- - 519
+ - 296
+ - 528
+ - 388
+ - 219
paper_label: !type:ContainerSlot
showEnts: False
occludes: True
ent: null
+- proto: HospitalCurtains
+ entities:
+ - uid: 492
+ components:
+ - type: Transform
+ pos: -8.5,7.5
+ parent: 1
+ - type: Door
+ secondsUntilStateChange: -7255.033
+ state: Opening
+- proto: Lamp
+ entities:
+ - uid: 564
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -0.58854175,6.107703
+ parent: 1
+- proto: LightBulbBroken
+ entities:
+ - uid: 666
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 1.89151,6.8016806
+ parent: 1
+ - uid: 816
+ components:
+ - type: Transform
+ parent: 815
+ - type: Physics
+ canCollide: False
+- proto: LightTubeBroken
+ entities:
+ - uid: 632
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: 0.16488624,6.033028
+ parent: 1
+- proto: LockerBoozeFilled
+ entities:
+ - uid: 199
+ components:
+ - type: Transform
+ pos: 6.5,8.5
+ parent: 1
+- proto: LockerFreezerSushi
+ entities:
+ - uid: 362
+ components:
+ - type: Transform
+ pos: 2.5,3.5
+ parent: 1
- proto: LogicGateOr
entities:
- uid: 755
@@ -4548,90 +4418,6 @@ entities:
- type: Transform
pos: -0.62397563,5.3686275
parent: 1
-- proto: RandomPosterContrabandDeadDrop
- entities:
- - uid: 579
- components:
- - type: Transform
- pos: -4.5,4.5
- parent: 1
- - uid: 44
- components:
- - type: Transform
- rot: -1.5707963267948966 rad
- pos: -8.5,-1.5
- parent: 1
- - uid: 570
- components:
- - type: Transform
- pos: 4.5,-2.5
- parent: 1
- - uid: 809
- components:
- - type: Transform
- pos: -4.5,-2.5
- parent: 1
- - uid: 811
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: -10.5,1.5
- parent: 1
- - uid: 551
- components:
- - type: Transform
- pos: 3.5,4.5
- parent: 1
- - uid: 583
- components:
- - type: Transform
- pos: 4.5,-0.5
- parent: 1
- - uid: 582
- components:
- - type: Transform
- pos: 4.5,4.5
- parent: 1
- - uid: 630
- components:
- - type: Transform
- pos: -5.5,9.5
- parent: 1
- - uid: 584
- components:
- - type: Transform
- pos: 5.5,9.5
- parent: 1
- - uid: 585
- components:
- - type: Transform
- pos: 8.5,9.5
- parent: 1
- - uid: 611
- components:
- - type: Transform
- pos: 10.5,6.5
- parent: 1
- - uid: 573
- components:
- - type: Transform
- pos: 10.5,1.5
- parent: 1
- - uid: 715
- components:
- - type: Transform
- pos: 4.5,5.5
- parent: 1
- - uid: 615
- components:
- - type: Transform
- pos: 9.5,8.5
- parent: 1
- - uid: 609
- components:
- - type: Transform
- pos: 8.5,-2.5
- parent: 1
- proto: PosterLegitCarpMount
entities:
- uid: 728
@@ -4723,10 +4509,11 @@ entities:
parent: 1
- proto: PoweredLightPostSmall
entities:
- - uid: 668
+ - uid: 132
components:
- type: Transform
- pos: 14.5,12.5
+ rot: -1.5707963267948966 rad
+ pos: 11.5,12.5
parent: 1
- uid: 669
components:
@@ -4855,6 +4642,13 @@ entities:
- type: Transform
pos: 1.5,0.5
parent: 1
+- proto: RailingCorner
+ entities:
+ - uid: 586
+ components:
+ - type: Transform
+ pos: -9.5,3.5
+ parent: 1
- proto: RandomCargoCorpseSpawner
entities:
- uid: 741
@@ -4862,6 +4656,90 @@ entities:
- type: Transform
pos: -1.5,5.5
parent: 1
+- proto: RandomPosterContrabandDeadDrop
+ entities:
+ - uid: 44
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -8.5,-1.5
+ parent: 1
+ - uid: 551
+ components:
+ - type: Transform
+ pos: 3.5,4.5
+ parent: 1
+ - uid: 570
+ components:
+ - type: Transform
+ pos: 4.5,-2.5
+ parent: 1
+ - uid: 573
+ components:
+ - type: Transform
+ pos: 10.5,1.5
+ parent: 1
+ - uid: 579
+ components:
+ - type: Transform
+ pos: -4.5,4.5
+ parent: 1
+ - uid: 582
+ components:
+ - type: Transform
+ pos: 4.5,4.5
+ parent: 1
+ - uid: 583
+ components:
+ - type: Transform
+ pos: 4.5,-0.5
+ parent: 1
+ - uid: 584
+ components:
+ - type: Transform
+ pos: 5.5,9.5
+ parent: 1
+ - uid: 585
+ components:
+ - type: Transform
+ pos: 8.5,9.5
+ parent: 1
+ - uid: 609
+ components:
+ - type: Transform
+ pos: 8.5,-2.5
+ parent: 1
+ - uid: 611
+ components:
+ - type: Transform
+ pos: 10.5,6.5
+ parent: 1
+ - uid: 615
+ components:
+ - type: Transform
+ pos: 9.5,8.5
+ parent: 1
+ - uid: 630
+ components:
+ - type: Transform
+ pos: -5.5,9.5
+ parent: 1
+ - uid: 715
+ components:
+ - type: Transform
+ pos: 4.5,5.5
+ parent: 1
+ - uid: 809
+ components:
+ - type: Transform
+ pos: -4.5,-2.5
+ parent: 1
+ - uid: 811
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -10.5,1.5
+ parent: 1
- proto: RandomSoap
entities:
- uid: 765
@@ -5113,12 +4991,6 @@ entities:
rot: 1.5707963267948966 rad
pos: 9.5,14.5
parent: 1
- - uid: 89
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 10.5,14.5
- parent: 1
- uid: 91
components:
- type: Transform
@@ -5163,12 +5035,6 @@ entities:
parent: 1
- proto: SolarPanelBroken
entities:
- - uid: 73
- components:
- - type: Transform
- rot: 1.5707963267948966 rad
- pos: 10.5,12.5
- parent: 1
- uid: 74
components:
- type: Transform
@@ -5579,6 +5445,11 @@ entities:
- type: Transform
pos: 8.5,8.5
parent: 1
+ - uid: 232
+ components:
+ - type: Transform
+ pos: 7.5,8.5
+ parent: 1
- proto: VendingMachineCoffee
entities:
- uid: 780
diff --git a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
index 703758c9dcc..30c5b895420 100644
--- a/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
+++ b/Resources/Maps/_NF/Shuttles/Syndicate/hunter.yml
@@ -154,36 +154,40 @@ entities:
data:
tiles:
0,0:
- 0: 55
- 1: 64
+ 0: 3
+ 1: 68
0,-1:
- 0: 32767
+ 0: 13079
1: 32768
-1,0:
- 0: 140
- 1: 64
- -1,-1:
- 0: 52975
- 1: 12560
+ 0: 8
+ 1: 68
0,-4:
- 0: 65392
+ 0: 45856
1: 128
+ -1,-4:
+ 0: 43136
+ 1: 304
0,-3:
- 0: 65535
+ 0: 8189
+ -1,-3:
+ 0: 3814
0,-2:
0: 65535
+ -1,-2:
+ 0: 65262
+ -1,-1:
+ 0: 34828
+ 1: 12560
1,-4:
- 1: 560
- 0: 4352
- 1,-3:
- 0: 4369
- 1: 8736
+ 1: 816
1,-2:
- 0: 4369
+ 0: 4096
1: 8194
1,-1:
- 0: 1
1: 13106
+ 1,-3:
+ 1: 8736
-2,-4:
1: 2176
-2,-3:
@@ -192,13 +196,6 @@ entities:
1: 32776
-2,-1:
1: 34952
- -1,-4:
- 1: 48
- 0: 65472
- -1,-3:
- 0: 65535
- -1,-2:
- 0: 65535
uniqueMixes:
- volume: 2500
temperature: 293.15
@@ -216,7 +213,7 @@ entities:
- 0
- 0
- volume: 2500
- temperature: 293.15
+ immutable: True
moles:
- 0
- 0
@@ -244,23 +241,13 @@ entities:
parent: 1
- type: DeviceList
devices:
- - 201
- - 205
- - 14
- - 12
- - 199
- - 11
- 202
-- proto: AirCanister
- entities:
- - uid: 3
- components:
- - type: Transform
- anchored: True
- pos: -2.5,-9.5
- parent: 1
- - type: Physics
- bodyType: Static
+ - 11
+ - 199
+ - 12
+ - 14
+ - 205
+ - 201
- proto: AirlockExternalGlass
entities:
- uid: 4
@@ -278,12 +265,12 @@ entities:
- uid: 6
components:
- type: Transform
- pos: -0.5,-14.5
+ pos: 1.5,-14.5
parent: 1
- uid: 7
components:
- type: Transform
- pos: 1.5,-14.5
+ pos: -0.5,-14.5
parent: 1
- proto: AirlockSyndicate
entities:
@@ -312,11 +299,17 @@ entities:
- type: Transform
pos: 0.5,-12.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- uid: 12
components:
- type: Transform
pos: 0.5,-9.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- uid: 13
components:
- type: Transform
@@ -327,6 +320,9 @@ entities:
- type: Transform
pos: 0.5,-0.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- proto: APCBasic
entities:
- uid: 15
@@ -340,31 +336,29 @@ entities:
rot: -1.5707963267948966 rad
pos: 2.5,-1.5
parent: 1
-- proto: AtmosDeviceFanTiny
+- proto: AtmosDeviceFanDirectional
entities:
- uid: 17
components:
- type: Transform
- rot: 3.141592653589793 rad
+ rot: 1.5707963267948966 rad
pos: 4.5,-4.5
parent: 1
- uid: 18
components:
- type: Transform
- rot: 3.141592653589793 rad
+ rot: -1.5707963267948966 rad
pos: -3.5,-4.5
parent: 1
- uid: 19
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -0.5,-14.5
+ pos: 1.5,-14.5
parent: 1
- uid: 20
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: 1.5,-14.5
+ pos: -0.5,-14.5
parent: 1
- proto: AtmosFixBlockerMarker
entities:
@@ -555,43 +549,28 @@ entities:
- type: Transform
pos: -0.5,1.5
parent: 1
- - type: DeviceLinkSink
- links:
- - 254
- uid: 22
components:
- type: Transform
pos: 0.5,1.5
parent: 1
- - type: DeviceLinkSink
- links:
- - 254
- uid: 23
components:
- type: Transform
pos: 1.5,1.5
parent: 1
- - type: DeviceLinkSink
- links:
- - 254
- uid: 166
components:
- type: Transform
rot: 3.141592653589793 rad
pos: -1.5,0.5
parent: 1
- - type: DeviceLinkSink
- links:
- - 254
- uid: 355
components:
- type: Transform
rot: 3.141592653589793 rad
pos: 2.5,0.5
parent: 1
- - type: DeviceLinkSink
- links:
- - 254
- proto: CableApcExtension
entities:
- uid: 24
@@ -819,6 +798,16 @@ entities:
- type: Transform
pos: 2.5,0.5
parent: 1
+ - uid: 364
+ components:
+ - type: Transform
+ pos: 0.5,-3.5
+ parent: 1
+ - uid: 365
+ components:
+ - type: Transform
+ pos: 2.5,-10.5
+ parent: 1
- proto: CableHV
entities:
- uid: 87
@@ -1104,11 +1093,6 @@ entities:
- type: Transform
pos: -0.5,-10.5
parent: 1
- - uid: 140
- components:
- - type: Transform
- pos: -1.5,-10.5
- parent: 1
- uid: 141
components:
- type: Transform
@@ -1130,6 +1114,12 @@ entities:
rot: -1.5707963267948966 rad
pos: 1.5,-10.5
parent: 1
+ - uid: 363
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -0.5,-9.5
+ parent: 1
- proto: ChairOfficeDark
entities:
- uid: 145
@@ -1194,13 +1184,6 @@ entities:
rot: 1.5707963267948966 rad
pos: -0.5,-1.5
parent: 1
-- proto: CratePlasma
- entities:
- - uid: 251
- components:
- - type: Transform
- pos: -0.5,-9.5
- parent: 1
- proto: DefibrillatorCabinetFilled
entities:
- uid: 150
@@ -1267,6 +1250,19 @@ entities:
parent: 1
- type: Fixtures
fixtures: {}
+- proto: GasMixerOnFlipped
+ entities:
+ - uid: 140
+ components:
+ - type: Transform
+ rot: -1.5707963267948966 rad
+ pos: -1.5,-10.5
+ parent: 1
+ - type: GasMixer
+ inletTwoConcentration: 0.79
+ inletOneConcentration: 0.21
+ - type: AtmosPipeColor
+ color: '#0055CCFF'
- proto: GasPassiveVent
entities:
- uid: 351
@@ -1277,22 +1273,25 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#990000FF'
-- proto: GasPipeFourway
+- proto: GasPipeBend
entities:
- - uid: 172
+ - uid: 3
components:
- type: Transform
- pos: 1.5,-4.5
+ rot: 3.141592653589793 rad
+ pos: -2.5,-10.5
parent: 1
- type: AtmosPipeColor
- color: '#990000FF'
- - uid: 183
+ color: '#0055CCFF'
+- proto: GasPipeFourway
+ entities:
+ - uid: 172
components:
- type: Transform
- pos: -0.5,-9.5
+ pos: 1.5,-4.5
parent: 1
- type: AtmosPipeColor
- color: '#0055CCFF'
+ color: '#990000FF'
- proto: GasPipeStraight
entities:
- uid: 171
@@ -1364,14 +1363,6 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#990000FF'
- - uid: 184
- components:
- - type: Transform
- rot: 3.141592653589793 rad
- pos: -0.5,-10.5
- parent: 1
- - type: AtmosPipeColor
- color: '#0055CCFF'
- uid: 186
components:
- type: Transform
@@ -1452,6 +1443,14 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#0055CCFF'
+ - uid: 183
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: -0.5,-9.5
+ parent: 1
+ - type: AtmosPipeColor
+ color: '#0055CCFF'
- uid: 190
components:
- type: Transform
@@ -1460,24 +1459,26 @@ entities:
parent: 1
- type: AtmosPipeColor
color: '#990000FF'
-- proto: GasPort
- entities:
- - uid: 196
+ - uid: 197
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -2.5,-9.5
+ rot: -1.5707963267948966 rad
+ pos: -0.5,-10.5
parent: 1
- type: AtmosPipeColor
- color: '#0335FCFF'
-- proto: GasPressurePump
+ color: '#0055CCFF'
+- proto: GasPort
entities:
- - uid: 197
+ - uid: 184
components:
- type: Transform
- rot: 1.5707963267948966 rad
pos: -1.5,-9.5
parent: 1
+ - uid: 196
+ components:
+ - type: Transform
+ pos: -2.5,-9.5
+ parent: 1
- type: AtmosPipeColor
color: '#0055CCFF'
- proto: GasVentPump
@@ -1504,6 +1505,9 @@ entities:
rot: 3.141592653589793 rad
pos: -0.5,-12.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- type: AtmosPipeColor
color: '#0055CCFF'
- uid: 201
@@ -1511,6 +1515,9 @@ entities:
- type: Transform
pos: -0.5,-1.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- type: AtmosPipeColor
color: '#0055CCFF'
- proto: GasVentScrubber
@@ -1537,6 +1544,9 @@ entities:
rot: 3.141592653589793 rad
pos: 1.5,-12.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- type: AtmosPipeColor
color: '#990000FF'
- uid: 205
@@ -1544,6 +1554,9 @@ entities:
- type: Transform
pos: 1.5,-1.5
parent: 1
+ - type: DeviceNetwork
+ deviceLists:
+ - 2
- type: AtmosPipeColor
color: '#990000FF'
- proto: GeneratorWallmountAPU
@@ -1631,6 +1644,34 @@ entities:
- type: Transform
pos: -2.5,-7.5
parent: 1
+- proto: LockerWallMaterialsFuelPlasmaFilled
+ entities:
+ - uid: 362
+ components:
+ - type: Transform
+ rot: 1.5707963267948966 rad
+ pos: 2.5,-12.5
+ parent: 1
+- proto: NitrogenCanister
+ entities:
+ - uid: 361
+ components:
+ - type: Transform
+ anchored: True
+ pos: -1.5,-9.5
+ parent: 1
+ - type: Physics
+ bodyType: Static
+- proto: OxygenCanister
+ entities:
+ - uid: 251
+ components:
+ - type: Transform
+ anchored: True
+ pos: -2.5,-9.5
+ parent: 1
+ - type: Physics
+ bodyType: Static
- proto: PaperCaptainsThoughts
entities:
- uid: 158
@@ -1652,10 +1693,6 @@ entities:
- type: Transform
pos: 3.5,-12.5
parent: 1
- - type: FuelGenerator
- on: False
- - type: Physics
- bodyType: Static
- proto: PoweredlightColoredRed
entities:
- uid: 221
@@ -1937,8 +1974,6 @@ entities:
- type: Transform
pos: 1.5,-11.5
parent: 1
- - type: Physics
- canCollide: False
- proto: SyndicateWhistle
entities:
- uid: 200
@@ -1992,24 +2027,24 @@ entities:
- uid: 264
components:
- type: Transform
- pos: -2.5,-0.5
+ pos: 3.5,-0.5
parent: 1
- uid: 265
components:
- type: Transform
- pos: 3.5,-0.5
+ pos: -2.5,-0.5
parent: 1
- uid: 266
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 4.5,-14.5
+ pos: 3.5,-14.5
parent: 1
- uid: 267
components:
- type: Transform
rot: 3.141592653589793 rad
- pos: 3.5,-14.5
+ pos: 4.5,-14.5
parent: 1
- uid: 268
components:
@@ -2026,26 +2061,26 @@ entities:
- uid: 270
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 5.5,-8.5
+ rot: 1.5707963267948966 rad
+ pos: -4.5,-8.5
parent: 1
- uid: 271
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -4.5,-8.5
+ rot: -1.5707963267948966 rad
+ pos: 5.5,-9.5
parent: 1
- uid: 272
components:
- type: Transform
- rot: 1.5707963267948966 rad
- pos: -4.5,-9.5
+ rot: -1.5707963267948966 rad
+ pos: 5.5,-8.5
parent: 1
- uid: 273
components:
- type: Transform
- rot: -1.5707963267948966 rad
- pos: 5.5,-9.5
+ rot: 1.5707963267948966 rad
+ pos: -4.5,-9.5
parent: 1
- proto: ToolboxSyndicateFilled
entities:
diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml
new file mode 100644
index 00000000000..baecee04baf
--- /dev/null
+++ b/Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml
@@ -0,0 +1,9 @@
+- type: entity
+ id: LockerFreezerSushi
+ parent: LockerFreezerBase
+ suffix: Filled, Sushi
+ components:
+ - type: StorageFill
+ contents:
+ - id: FoodBoxSushiBad
+ amount: 2
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml b/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml
index a79b0357d9c..60b20f44759 100644
--- a/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml
+++ b/Resources/Prototypes/_NF/Entities/Clothing/Back/base_clothing_backpack.yml
@@ -16,7 +16,7 @@
- type: entity
abstract: true
- parent: ClothingBackpack
+ parent: ClothingBackpackDuffel
id: NFClothingDuffel
components:
- type: Storage
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
index ea4811a3ff8..7044313bb49 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/Containers/box.yml
@@ -214,6 +214,132 @@
# - id: FoodCondimentPacketPepper
- id: FoodCondimentPacketSalt
+- type: entity
+ parent: [BaseStorageItem, BaseBagOpenClose]
+ id: FoodBoxSushi
+ name: sushi tray
+ description: Plastic sushi container with lid.
+ components:
+ - type: Sprite
+ sprite: _NF/Objects/Consumable/Food/sushi.rsi
+ scale: 0.8, 0.8
+ state: tray
+ layers:
+ - state: tray
+ - state: goodtray6
+ map: ["tray6"]
+ visible: false
+ - state: goodtray5
+ map: ["tray5"]
+ visible: false
+ - state: goodtray4
+ map: ["tray4"]
+ visible: false
+ - state: goodtray3
+ map: ["tray3"]
+ visible: false
+ - state: goodtray2
+ map: ["tray2"]
+ visible: false
+ - state: goodtray1
+ map: ["tray1"]
+ visible: false
+ - state: label
+ map: ["closeLayer"]
+ visible: false
+ - type: Item
+ sprite: _NF/Objects/Consumable/Food/sushi.rsi
+ size: Normal
+ inhandVisuals:
+ left:
+ - state: tray-inhand-left
+ right:
+ - state: tray-inhand-right
+ - type: Storage
+ grid:
+ - 0,0,1,2
+ whitelist:
+ tags:
+ - Sushi
+ storageOpenSound: /Audio/Effects/packetrip.ogg
+ hideStackVisualsWhenClosed: false
+ - type: ItemCounter
+ count:
+ tags: [Sushi]
+ composite: true
+ layerStates:
+ - tray1
+ - tray2
+ - tray3
+ - tray4
+ - tray5
+ - tray6
+
+- type: entity
+ parent: FoodBoxSushi
+ id: FoodBoxSushiBad
+ suffix: Bad
+ components:
+ - type: Sprite
+ sprite: _NF/Objects/Consumable/Food/sushi.rsi
+ scale: 0.8, 0.8
+ state: tray
+ layers:
+ - state: tray
+ - state: tray6
+ map: ["tray6"]
+ visible: false
+ - state: tray5
+ map: ["tray5"]
+ visible: false
+ - state: tray4
+ map: ["tray4"]
+ visible: false
+ - state: tray3
+ map: ["tray3"]
+ visible: false
+ - state: tray2
+ map: ["tray2"]
+ visible: false
+ - state: tray1
+ map: ["tray1"]
+ visible: false
+ - state: label
+ map: ["closeLayer"]
+ visible: false
+ - type: StorageFill
+ contents:
+ # Slice1
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice1
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice1
+ # Slice2
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice2
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice2
+ # Slice3
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice3
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice3
+ # Slice4
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice4
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice4
+ # Slice5
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice5
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice5
+ # Slice6
+ - id: FoodMealGasSafeSushiSlice
+ orGroup: Slice6
+ - id: FoodMealGasBadSushiSlice
+ orGroup: Slice6
+
# Empty
- type: entity
id: BoxMREEmpty
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
index cce090808ab..c90c4e71449 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Food/sushi.yml
@@ -1,6 +1,16 @@
+- type: entity
+ id: FoodBaseSushi
+ abstract: true
+ components:
+ - type: Sprite
+ sprite: _NF/Objects/Consumable/Food/sushi.rsi
+ - type: Tag
+ tags:
+ - Sushi
+
- type: entity
name: avocado sushi
- parent: FoodMealBase
+ parent: [FoodBaseSushi, FoodMealBase]
id: FoodMealAvocadoSushi
description: Where did the seaweed come from?
components:
@@ -9,26 +19,23 @@
- cucumber
- avocado
- type: Sprite
- sprite: _NF/Objects/Consumable/Food/sushi.rsi
state: avocadosushi
- type: SolutionContainerManager
solutions:
food:
- maxVol: 40
+ maxVol: 42
reagents:
- ReagentId: Nutriment
- Quantity: 20
- - ReagentId: Flavorol
- Quantity: 10
+ Quantity: 30
- ReagentId: CucumberWater
- Quantity: 2
+ Quantity: 3
- type: SliceableFood
- count: 5
+ count: 6
slice: FoodMealAvocadoSushiSlice
- type: entity
name: avocado sushi
- parent: FoodInjectableBase
+ parent: [FoodBaseSushi, FoodInjectableBase]
id: FoodMealAvocadoSushiSlice
description: Where did the seaweed come from?
components:
@@ -37,23 +44,22 @@
- cucumber
- avocado
- type: Sprite
- sprite: _NF/Objects/Consumable/Food/sushi.rsi
state: avocadosushislice
- type: SolutionContainerManager
solutions:
food:
- maxVol: 8
+ maxVol: 7
reagents:
- ReagentId: Nutriment
- Quantity: 4
- - ReagentId: Flavorol
- Quantity: 2
+ Quantity: 5
- ReagentId: CucumberWater
- Quantity: .4
+ Quantity: .5
+ - type: Item
+ size: Tiny
- type: entity
name: carp sushi
- parent: FoodMealBase
+ parent: [FoodBaseSushi, FoodMealBase]
id: FoodMealCarpSushi
description: Certainly worth the risk.
components:
@@ -62,28 +68,25 @@
- cucumber
- fishy
- type: Sprite
- sprite: _NF/Objects/Consumable/Food/sushi.rsi
state: carpsushi
- type: SolutionContainerManager
solutions:
food:
- maxVol: 45
+ maxVol: 48
reagents:
- ReagentId: Nutriment
- Quantity: 20
- - ReagentId: Flavorol
- Quantity: 10
+ Quantity: 30
- ReagentId: CarpoToxin
- Quantity: 5
+ Quantity: 6
- ReagentId: CucumberWater
- Quantity: 2
+ Quantity: 3
- type: SliceableFood
- count: 5
+ count: 6
slice: FoodMealCarpSushiSlice
- type: entity
name: carp sushi
- parent: FoodInjectableBase
+ parent: [FoodBaseSushi, FoodInjectableBase]
id: FoodMealCarpSushiSlice
description: Certainly worth the smaller risk.
components:
@@ -92,18 +95,54 @@
- cucumber
- fishy
- type: Sprite
- sprite: _NF/Objects/Consumable/Food/sushi.rsi
state: carpsushislice
- type: SolutionContainerManager
solutions:
food:
- maxVol: 9
+ maxVol: 8
reagents:
- ReagentId: Nutriment
- Quantity: 4
- - ReagentId: Flavorol
- Quantity: 2
+ Quantity: 5
- ReagentId: CarpoToxin
Quantity: 1
- ReagentId: CucumberWater
- Quantity: .4
+ Quantity: .5
+ - type: Item
+ size: Tiny
+
+- type: entity
+ name: gas station sushi
+ parent: [FoodBaseSushi, FoodInjectableBase]
+ id: FoodMealGasSafeSushiSlice
+ suffix: Safe
+ description: Is it worth the risk?
+ components:
+ - type: FlavorProfile
+ flavors:
+ - fishy
+ - cheap
+ - bitter
+ - type: Sprite
+ state: gassushislice
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ maxVol: 5
+ reagents:
+ - ReagentId: Nutriment
+ Quantity: 5
+ - type: Item
+ size: Tiny
+
+- type: entity
+ parent: [FoodBaseSushi, FoodMealGasSafeSushiSlice]
+ id: FoodMealGasBadSushiSlice
+ suffix: Bad
+ components:
+ - type: SolutionContainerManager
+ solutions:
+ food:
+ maxVol: 5
+ reagents:
+ - ReagentId: GastroToxin
+ Quantity: 5
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
index fb4c43a96eb..8f5313c36df 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Machines/lathe.yml
@@ -165,6 +165,7 @@
- NFFoodBoxDonutEmpty
- NFFoodBoxNuggetEmpty
- NFFoodContainerEggEmpty
+ - NFFoodBoxSushi
## Basic parts
- CableStack
- LightTube
diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
index b5c28706a5f..a73e161ea89 100644
--- a/Resources/Prototypes/_NF/Guidebook/shipyard.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -18,6 +18,7 @@
- ShipyardChisel
- ShipyardComet
- ShipyardConstruct
+ - ShipyardEagle
- ShipyardGarden
- ShipyardGasbender
- ShipyardGourd
@@ -35,6 +36,7 @@
- ShipyardMcCargo
- ShipyardMcDelivery
- ShipyardPathfinder
+ - ShipyardPhoenix
- ShipyardPioneer
- ShipyardPlacebo
- ShipyardProspector
@@ -115,6 +117,11 @@
name: guide-entry-shipyard-construct
text: "/ServerInfo/_NF/Guidebook/Shipyard/Construct.xml"
+- type: guideEntry
+ id: ShipyardEagle
+ name: guide-entry-shipyard-eagle
+ text: "/ServerInfo/_NF/Guidebook/Shipyard/Eagle.xml"
+
- type: guideEntry
id: ShipyardGarden
name: guide-entry-shipyard-garden
@@ -199,7 +206,12 @@
id: ShipyardPathfinder
name: guide-entry-shipyard-pathfinder
text: "/ServerInfo/_NF/Guidebook/Shipyard/Pathfinder.xml"
-
+
+- type: guideEntry
+ id: ShipyardPhoenix
+ name: guide-entry-shipyard-phoenix
+ text: "/ServerInfo/_NF/Guidebook/Shipyard/Phoenix.xml"
+
- type: guideEntry
id: ShipyardPioneer
name: guide-entry-shipyard-pioneer
diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
index 65b01d5a8f5..b5bd92d67b9 100644
--- a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
+++ b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -130,6 +130,18 @@
state: construct
scale: 1.2, 1.2
+- type: entity
+ parent: PosterBase
+ id: ShuttleMapEagle
+ name: "NM Eagle"
+ description: "Detailed map of an Eagle shuttle."
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Sprite
+ sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+ state: eagle
+ scale: 1.2, 1.2
+
- type: entity
parent: PosterBase
id: ShuttleMapGarden
@@ -286,6 +298,18 @@
state: pathfinder
scale: 1.2, 1.2
+- type: entity
+ parent: PosterBase
+ id: ShuttleMapPhoenix
+ name: "NR Phoenix"
+ description: "Detailed map of a Phoenix shuttle."
+ categories: [ HideSpawnMenu ]
+ components:
+ - type: Sprite
+ sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+ state: phoenix
+ scale: 1.2, 1.2
+
- type: entity
parent: PosterBase
id: ShuttleMapPioneer
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
index e6160efaf7d..17545263093 100644
--- a/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
+++ b/Resources/Prototypes/_NF/Recipes/Lathes/storage.yml
@@ -179,4 +179,14 @@
completetime: 1
applyMaterialDiscount: false
materials:
- Cardboard: 100
\ No newline at end of file
+ Cardboard: 100
+
+- type: latheRecipe
+ id: NFFoodBoxSushi
+ result: FoodBoxSushi
+ name: lathe-recipe-NFFoodBoxSushi-name
+ category: StorageNF
+ completetime: 1
+ applyMaterialDiscount: false
+ materials:
+ Plastic: 100
\ No newline at end of file
diff --git a/Resources/Prototypes/_NF/Shipyard/eagle.yml b/Resources/Prototypes/_NF/Shipyard/eagle.yml
index 890d74ed474..4f296af2447 100644
--- a/Resources/Prototypes/_NF/Shipyard/eagle.yml
+++ b/Resources/Prototypes/_NF/Shipyard/eagle.yml
@@ -16,7 +16,7 @@
category: Medium
group: Shipyard
shuttlePath: /Maps/_NF/Shuttles/eagle.yml
- guidebookPage: Null
+ guidebookPage: ShipyardEagle
class:
- Medical
- Engineering
diff --git a/Resources/Prototypes/_NF/Shipyard/phoenix.yml b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
index b8ed87a4845..a08046bcaaf 100644
--- a/Resources/Prototypes/_NF/Shipyard/phoenix.yml
+++ b/Resources/Prototypes/_NF/Shipyard/phoenix.yml
@@ -1,12 +1,22 @@
+# Author Info
+# GitHub: ???
+# Discord: ???
+
+# Maintainer Info
+# GitHub: ???
+# Discord: ???
+
+# Shuttle Notes:
+#
- type: vessel
id: Phoenix
name: NR Phoenix
- description: A research and salvage vessel designed for deep space exploration
+ description: A research and salvage vessel designed for deep space exploration.
price: 62500 # TODO - fix this value, getting tests to pass - Whatstone
category: Medium
group: Shipyard
shuttlePath: /Maps/_NF/Shuttles/phoenix.yml
- guidebookPage: Null
+ guidebookPage: ShipyardPhoenix
class:
- Science
- Engineering
diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml
index 491db209224..9697ef10bf9 100644
--- a/Resources/Prototypes/_NF/tags.yml
+++ b/Resources/Prototypes/_NF/tags.yml
@@ -95,4 +95,7 @@
id: SmallThrusterMachineCircuitboard
- type: Tag
- id: BrassKnucklesNF
\ No newline at end of file
+ id: BrassKnucklesNF
+
+- type: Tag
+ id: Sushi
\ No newline at end of file
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Eagle.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Eagle.xml
new file mode 100644
index 00000000000..42c1a9d00e3
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Eagle.xml
@@ -0,0 +1,94 @@
+
+ # EAGLE-CLASS MEDICAL SHUTTLE
+
+
+
+
+
+
+
+
+
+
+ [color=#a4885c]Ship Size:[/color] Medium
+
+ [color=#a4885c]Recommended Crew:[/color] 2-4
+
+ [color=#a4885c]Power Gen Type:[/color] Uranium
+
+ [color=#a4885c]Expeditions:[/color] None
+
+ [color=#a4885c]IFF Console:[/color] None
+
+ "A modern, medium-sized medical & engineering vessel. Focusing on responding to shuttle distress, Eagle bears the motto 'Recover, Restore, Repair!'."
+
+ # PREFLIGHT CHECKLIST
+
+ ## 1. Power supply
+
+ ## 1.1. Battery units
+
+
+
+
+
+
+ - Check that the SMES unit is anchored to the floor.
+ - Check the substation unit.
+ - Check that the APC unit's Main Breaker is toggled on.
+ - Check the APC unit's current Load* (W).
+
+ ## 1.2. S.U.P.E.R.P.A.C.M.A.N. generator units
+
+
+
+
+
+
+ - Check if the S.U.P.E.R.P.A.C.M.A.N. generator units are anchored to the floor.
+ - Check if the S.U.P.E.R.P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+ - Check if the S.U.P.E.R.P.A.C.M.A.N. generator units are set to HV output.
+ - Set Target Power for 16 [bold]k[/bold]W.
+ - Start the S.U.P.E.R.P.A.C.M.A.N. generator units.
+
+ ## 2. Atmospherics
+
+ ## 2.1. Distribution Loop
+
+
+
+
+
+
+
+ - Check if the O2 canister and N2 canister are anchored to their connector ports.
+ - Check if the gas mixer has its mixing ratio and output pressure set correctly.
+ - Enable the gas mixer.
+
+ ## 2.2. Waste Loop
+
+
+
+
+
+ - Check waste loop pump.
+ - Set the Air Alarm in the Engine Room to Filtering (Wide).
+
+ ## 3. Other checks
+
+
+
+
+
+
+ - Check that the gyroscope is anchored, powered, and enabled.
+ - Check that the mini gravity generator is anchored, powered, and enabled.
+ - Check that radiation shutters are closed.
+
+ ## Sidenotes
+
+ * - Eagle-class medical response ships are equipped with several APC units that can be used to appraise the ship's total power consumption (which for the unmodified ship is 15.7 kW). To keep the substation and APC fully charged, the generator target power should exceed APC's Load, but by as little as possible to achieve maximum fuel efficiency. Remember to check the APC Load and adjust the generator unit's target power after adding or removing power-consuming machines.
+
+ ** - Eagle-class ships have a slightly above average power demand. A standard P.A.C.M.A.N. generator's target power value can be set to 15-16 kW to modulate between drain and charge. As much of the powerdraw is to sustain the chemistry lab powering down those machines can dramatically reduce the ship's overall draw.
+
+
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Phoenix.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Phoenix.xml
new file mode 100644
index 00000000000..b42270f0b76
--- /dev/null
+++ b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Phoenix.xml
@@ -0,0 +1,105 @@
+
+ # PHOENIX-CLASS RESEARCH SHUTTLE
+
+
+
+
+
+
+
+
+
+
+ [color=#a4885c]Ship Size:[/color] Medium
+
+ [color=#a4885c]Recommended Crew:[/color] 2-3
+
+ [color=#a4885c]Power Gen Type:[/color] Solar/Plasma
+
+ [color=#a4885c]Expeditions:[/color] None
+
+ [color=#a4885c]IFF Console:[/color] None
+
+ "A research and salvage vessel designed for deep space exploration."
+
+ # PREFLIGHT CHECKLIST
+
+ ## 1. Power supply
+
+ ## 1.1. Battery units
+
+
+
+
+
+
+ - Check that the SMES unit is anchored to the floor.
+ - Check that the substation unit is anchored to the floor.
+ - Check that the APC unit's Main Breaker is toggled on.
+ - Check the APC unit's current Load* (W).
+
+ ## 1.2. P.A.C.M.A.N. generator units
+
+
+
+
+
+ - Check that the P.A.C.M.A.N. generator units are anchored to the floor.
+ - Check that the P.A.C.M.A.N. generator units have fuel. For extended flights make sure that you have enough fuel stockpiled to sustain prolonged power generation during flight.
+ - Check that the P.A.C.M.A.N. generator units are set to HV output.
+ - Set Target Power for 9-12** [bold]kW[/bold].
+ - Ensure that P.A.C.M.A.N. generator units are enabled.
+
+ ## 1.3. Solar panels
+
+
+
+
+
+ - Inspect solar control computer (located at shuttle cockpit).
+ - Adjust panel angular velocity.
+ - Adjust panel angle.
+
+ ## 2. Atmospherics
+
+ ## 2.1. Distribution Loop
+
+
+
+
+
+
+
+
+ - Check that the O2 canister is anchored to connector port.
+ - Check that the N2 canister is anchored to connector port.
+ - Check that the gas mixer is set to the correct mixing ratio (21% Oxygen, 79% Nitrogen).
+ - Check that the gas mixer is set to 101kPa.
+ - Ensure that the gas mixer is enabled.
+
+ ## 2.2. Waste Loop
+
+
+
+
+
+ - Ensure that the waste loop pump is enabled.
+ - Disable Auto Mode on any Air Alarms.
+ - Set Air Alarms to Filtering (Wide).
+
+ ## 3. Other checks
+
+
+
+
+
+ - Check that the gyroscope is anchored, powered, and enabled.
+ - Check that the mini gravity generator is anchored, powered, and enabled.
+
+ ## Sidenotes
+
+ * - Phoenix-class research ships are equipped a power monitoring console that be used to appraise the ship's total power consumption. An unmodified Phoenix-class ship requires 24.5 kW of power to remain operational.
+
+ ** - Phoenix-class research ships come equipped with additional solar panels that can provide up to 17.5 kW of power under ideal circumstances. Assuming that the solar array will provide a third of its maximum output power, recommended target power output for each P.A.C.M.A.N. generator unit is 12 kW.
+
+
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/eagle.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/eagle.png
new file mode 100644
index 00000000000..1de24d2c3a8
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/eagle.png differ
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
index ec8a469ab3a..5fd0e9c7d2e 100644
--- a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
+++ b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/meta.json
@@ -1,7 +1,7 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, hauler, placebo, skipper, sparrow by Mygnol (discord/github)",
+ "copyright": "ambition, bocadillo, brigand, bulker, ceres, chisel, comet, construct, garden, gasbender, harbormaster, investigator, kestrel, kilderkin, lantern, legman, liquidator, loader, pathfinder, pioneer, prospector, searchlight and vagabond by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi. spirit by iNoahGuy/actualcatmoment (discord/github). apothecary, stasis by dustylens (discord/github). barge, eagle, hauler, phoenix, placebo, skipper, sparrow by Mygnol (discord/github)",
"size": {
"x": 128,
"y": 96
@@ -40,6 +40,9 @@
{
"name": "construct"
},
+ {
+ "name": "eagle"
+ },
{
"name": "garden"
},
@@ -79,6 +82,9 @@
{
"name": "pathfinder"
},
+ {
+ "name": "phoenix"
+ },
{
"name": "pioneer"
},
diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/phoenix.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/phoenix.png
new file mode 100644
index 00000000000..ef01195a291
Binary files /dev/null and b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/phoenix.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png
new file mode 100644
index 00000000000..e542d017a6c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png
new file mode 100644
index 00000000000..5f11caaf73a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png
new file mode 100644
index 00000000000..8f2b894f2f3
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png
new file mode 100644
index 00000000000..0a4b81d019e
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png
new file mode 100644
index 00000000000..0328e2fa98c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png
new file mode 100644
index 00000000000..3a6e5b2f77c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png
new file mode 100644
index 00000000000..0dc0db12b9b
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png
new file mode 100644
index 00000000000..b928ba13948
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
index 05ac3dffde8..4c4823f3288 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/meta.json
@@ -1,12 +1,63 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
- "copyright": "clurger created by gentlebutter (Discord), rosy-mothroach made by TurboTracker, edited by Whatstone",
+ "copyright": "carpsushi, carpsushislice created by gentlebutter (Discord), avocadosushi, avocadosushislice edited by dustylens (GitHub)",
+ "copyright": "tray, tray1-6, gassushislice made by matthewbadger (Discord), label, tray-inhand*, goodtray1-6 made by whatston3 (GitHub)",
"size": {
"x": 32,
"y": 32
},
"states": [
+ {
+ "name": "tray1"
+ },
+ {
+ "name": "tray2"
+ },
+ {
+ "name": "tray3"
+ },
+ {
+ "name": "tray4"
+ },
+ {
+ "name": "tray5"
+ },
+ {
+ "name": "tray6"
+ },
+ {
+ "name": "goodtray1"
+ },
+ {
+ "name": "goodtray2"
+ },
+ {
+ "name": "goodtray3"
+ },
+ {
+ "name": "goodtray4"
+ },
+ {
+ "name": "goodtray5"
+ },
+ {
+ "name": "goodtray6"
+ },
+ {
+ "name": "tray"
+ },
+ {
+ "name": "label"
+ },
+ {
+ "name": "tray-inhand-right",
+ "directions": 4
+ },
+ {
+ "name": "tray-inhand-left",
+ "directions": 4
+ },
{
"name": "avocadosushi"
},
@@ -19,6 +70,9 @@
{
"name": "carpsushislice"
},
+ {
+ "name": "gassushislice"
+ },
{
"name": "inhand-right",
"directions": 4
@@ -26,6 +80,6 @@
{
"name": "inhand-left",
"directions": 4
- }
+ }
]
}
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png
new file mode 100644
index 00000000000..d2d8b0a2d2d
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png
new file mode 100644
index 00000000000..9b87372bb30
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png
new file mode 100644
index 00000000000..5e030e98734
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png
new file mode 100644
index 00000000000..10c9fc1896a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png
new file mode 100644
index 00000000000..4a030290379
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png
new file mode 100644
index 00000000000..7a19f376b4c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png
new file mode 100644
index 00000000000..a29cf42d0aa
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png
new file mode 100644
index 00000000000..2d75f219a7a
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png differ
diff --git a/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png
new file mode 100644
index 00000000000..039b368da6c
Binary files /dev/null and b/Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png differ