From 1ccc3abc2e20bbafea09e92a25b6abbefee3a9cb Mon Sep 17 00:00:00 2001 From: Dvir <39403717+dvir001@users.noreply.github.com> Date: Mon, 21 Oct 2024 16:27:33 +0300 Subject: [PATCH 1/7] Gas Station Sushi (#2101) * Sushi+ * Update sushi.yml * Update sushi.yml * Griff edit * Update box.yml * Update box.yml * Update food.yml * sushi with lid * Print * fiddle with the tray sprites * sushi fills * reduce space in gas station soosh * tray inhand sprites, remove tiles.yml (my mistake) * box open noises, inhand sprite fix * fix scale * Craftable sushi tray is full of good looking sushi --------- Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> Co-authored-by: Whatstone --- Resources/Locale/en-US/_NF/lathe/recipes.ftl | 5 +- Resources/Maps/_NF/POI/grifty.yml | 1075 ++++++++--------- .../_NF/Catalog/Fills/Lockers/food.yml | 9 + .../Consumable/Food/Containers/box.yml | 126 ++ .../Objects/Consumable/Food/sushi.yml | 101 +- .../Entities/Structures/Machines/lathe.yml | 1 + .../Prototypes/_NF/Recipes/Lathes/storage.yml | 12 +- Resources/Prototypes/_NF/tags.yml | 5 +- .../Food/sushi.rsi/gassushislice.png | Bin 0 -> 899 bytes .../Consumable/Food/sushi.rsi/goodtray1.png | Bin 0 -> 268 bytes .../Consumable/Food/sushi.rsi/goodtray2.png | Bin 0 -> 261 bytes .../Consumable/Food/sushi.rsi/goodtray3.png | Bin 0 -> 253 bytes .../Consumable/Food/sushi.rsi/goodtray4.png | Bin 0 -> 251 bytes .../Consumable/Food/sushi.rsi/goodtray5.png | Bin 0 -> 256 bytes .../Consumable/Food/sushi.rsi/goodtray6.png | Bin 0 -> 260 bytes .../Consumable/Food/sushi.rsi/label.png | Bin 0 -> 460 bytes .../Consumable/Food/sushi.rsi/meta.json | 58 +- .../Food/sushi.rsi/tray-inhand-left.png | Bin 0 -> 325 bytes .../Food/sushi.rsi/tray-inhand-right.png | Bin 0 -> 329 bytes .../Consumable/Food/sushi.rsi/tray.png | Bin 0 -> 287 bytes .../Consumable/Food/sushi.rsi/tray1.png | Bin 0 -> 259 bytes .../Consumable/Food/sushi.rsi/tray2.png | Bin 0 -> 259 bytes .../Consumable/Food/sushi.rsi/tray3.png | Bin 0 -> 252 bytes .../Consumable/Food/sushi.rsi/tray4.png | Bin 0 -> 225 bytes .../Consumable/Food/sushi.rsi/tray5.png | Bin 0 -> 258 bytes .../Consumable/Food/sushi.rsi/tray6.png | Bin 0 -> 253 bytes 26 files changed, 754 insertions(+), 638 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Lockers/food.yml create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/gassushislice.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/goodtray6.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/label.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray-inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray1.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray2.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray3.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray4.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray5.png create mode 100644 Resources/Textures/_NF/Objects/Consumable/Food/sushi.rsi/tray6.png 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/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/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/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/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/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 0000000000000000000000000000000000000000..e542d017a6c9a88bad9f498f88028cd47b0748cd GIT binary patch literal 899 zcmV-}1AP36P)5_2->Jc62VuK-MobCy6kR{U@O>I2o|D^ zufl(ztzfGl2#O$LY3-{KS?{<)g6J%>_v6f*%gh-FO%@H)t&4$ac}`*?uFcNPYYk5{ z(L)}_BA*;uW0%< zoUTLHot<{l-%_p2P%a10$Iv6s4D6h8aEn2fvM_vS_`|>n zb_6HGJBI1=P7-Y{(F#31Y{5QXGjke7pgD)QG8pR01DzoRmm@YLScr)NkmWFoxt6wq zwS0@NhHKrsW;d8!(wG8v#MjTih%pwdhKXpEK!q^NFEarH`rRimAA~_{5I%qTA=vUS zKnx2pLgo{60L=HumOps&55?T~JLfP63Gp$kp0yS%&I3#f@88}gWH)gkfNl`Xa*(AU z016Fc2Z4P5_`y}8EGIb%K$d}kf(R3X?!WISmVlxF=6etg%cg`}LNE$o1|cUpT!!9# z@)GQOP*&Z(<1kSP(0sV-Us(Ra`5xn`!iHDWq~c8HA<V literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5f11caaf73a958e7c6970313745421dbb36fb10d GIT binary patch literal 268 zcmV+n0rUQeP)+Pk}P*hG)$d_ zsXu&ylI>F2B%|qQAV2TU*e?#DGlH!*Tn?9)@_Wku6VJo~=RU4a-~Yc5pSl8>cuWo4 S{Y?%40000-lBslFPC!sso(PL|9|)F|M&Gne%J30c>5m&l&#x@4!C$6 z{P{LkpgW~mV$#221C_te6AU;4o2+}D@on&1*KQ!UJ~;sh1d7uVFL(%~>?ruE$GqR0 zY3VoNG6rU5<~xhB-QOF`ng4sn!Y0+GMj&{2e!9Jgb;F95BdSM#&TnmJb^ddC?RgP( z7oXsb4g2r^56a?C<@@pTpSZF$vvg?CU!a4V`4|{XDs6>lY+jxZ^cRDttDnm{r-UW| DYQAfo literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0a4b81d019e41b9159d71e3e004c03e6cf3aba87 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBc3jfArY;~2@WC3o<}veU*QgFa7%;zXNEB zd-ng&D?k2w9{gBUg0<&L0mF2W=k;Q8Vmu%1rI2E-_L)?hZxsG9P7q-mVsf~hmceS`xI-Se;7Pn{an^LB{Ts5g3@ge literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..0328e2fa98c9d3a85c1e5fa7054b7f4a9db77898 GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJL!K^ zBn*UBfB3(6>;FKLQ>?;krzd^*fAQA;@7!1a9X<#Yy(sIVm!P!d!JlvI{_|{d|$jOfWU_e*=DEvz9RoxSC_AR#L)Ed#PVam|399`T3~l3>Gz+sHvjE* z!E^XHqzaH`nGerTx1VyWRaD?9 rbD5)AkBC3-{eF-`-41FvNcTYP+T}&^HX8u6{1-oD!M<5^!v8 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..3a6e5b2f77c82f3770b133bd88f2e3a0c7d447a9 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ#ArY;~2@YhDZPZbBhZ-h^Xiq^vPe6!T_MoONb(dU@JE zy#o@z#WRHjQw;;ff@isyWEP)F5^D5TD#)yk^0#)G<#OedbN`U~!$Vz^&c zO1>1HQn^&(!v1Z!U1=Hl47NfUl78hKM(f$~&r2lt7=9DJcfu>Gbe2=L7SLM^p00i_ I>zopr0C72G{Qv*} literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..b928ba139488080a3eb2bbad875b61cf3f320ba8 GIT binary patch literal 460 zcmV;-0W8%dtK;XW}cgTGONJ#i&=BNW(t=5jaF3U0ipx^ILwDEd2 zo4pq%5H*}bkq8xt8%~vw!UU!Xr!XHi{OTgjfV8J~Tt7H|$_p28hxfX{V;eUa7DXa- z3VsT2TB(VL)9X4C!UO#ylrtHA4Gl`<-DUbvdU1u-#Ism{>Rdfs^Qb-U} zorEGFeSwZ)lAiqk5Qg~$SGt?<}&wBnkyD8Sn55~Du~ZPlsk}5*2vJKY=*1I`{2lF z-*3z3n=3N`4F!T7L7~B+-L}s(W1_$0?cSKovDJLZsxqE~Ww(8w{+4LJ^o{S2c6{HH z+&$CsnhoV2H~!Iazj!U=+9y7pPd|U^FYUZpvg1eixsn|dOg0vWSzf=~UH)Kg_N>&% zw>xc&AU1%=Bi~ot`nR=m-lFvjPCUOTEfaF}+x_^dmb1Pnb+~BscXzzGuWp#6-F4sj z>0O;K(y2S-9A?c}+8Me0_bbWj;P=I)7o7v@)}7vZFK%B||B9!V-GN3Hva5+U{5Rh6 z-qz#E<@v5aLqQ-gG&nSSSHFbT{_a;hqyHhZ>ju6)<}{ddcfTZ<1Wmed^mescDo zb;maT&OTCQI_>(&NQI|3A@gtDCNK zde7_IPwc<*K`a51TUzzYt3y)mRhZOUnHR*~|6g;xZiZ9n+I1yX68*o=+rO)70CYcM?x$0nQz+rr|FZwGBYr^6tEn< Vl)It8WQ#M%9#2<4mvv4FO#o>IkJtVFiN$MR z0HzScUNA}ha)6taU;)&MiQth8kX;tQ@PQgpkFQ?=fJ143tWp5hcEM_Ztl9v60-$&s zZe5U7MV#N4dL3I^0MEH_67oXtMx{)}-o%eq){yd^ l7aT}UfEh%x)IX&E)dM_LGQsMt7_NqONoF z_yVR0rY8WwgQ#1l3TAdrR@tj_rQpC_b$v;nuOX6p#)U>N{{23;;is%M^Wk%rJluJE z6;@2wQrwX6H>a)qy`7;=#pnKqo#}eaK;SGdIL+7q2!akX&Xe2r|LD>RgCp^FzYlGw zJ)XFyEI^ejVcJCI6+%orJQD&O#Fd}?2D+Jzm4P91ll|iLzMTJnzGCon^>bP0l+XkK DivDEA literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4a0302903795773e3d9fe7df50b7dd740f38151a GIT binary patch literal 259 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJQ=Tr4ArY;~2@zMDKwWchqyYrn%-LT1*@L!1-e>;k>S}-!+#53bKV5{iow&>&t;ucLK6T&a%gM- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a19f376b4cfcecf6cc789b5accad8308ad5224b GIT binary patch literal 252 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ!=5gVArY;~2@ zBn*O1FF5|Z|6lvY`|sx*{@{0e`oV+d9SeT?T-g-k(b4Y+#1H?Tv*ZDRQ$~+?*v;1e z_IJ=Om0@5mpZ?wO#lPR@4jeeZP|k5zrl7o1o*4)ZKP!Jz;I0#4KiiIP#oRlG6kg0b z^x?r-d$#z6^LhMjiY0&L?N#v74;5Oty!~x`p{5+q$LZ(y8RXnAlvppTbESacj8PH8 u)lEQIUAHdvC%=L2bUUaa!P?Bk!0?a5g7Mojb4Q?e7(8A5T-G@yGywo8t7GB- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..a29cf42d0aa0b9b076f60be0e26fded3259945e5 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJ6`n4RArY;~2@ zBn*UBfB5)w@&AcGH?>`JdA;-oW4wHv+r~e4cl(DFvj{7)vYV~{eg43K10UW!v1F6b zRXO6ma_}PB7 zB`CTDMy0Yg?-1edx^X%^{>5{Ktf&sY4zHv0I)9F ztcbdV&%6FRIn`)Pd;RbCIRJ_okh_ct0F82m|25O|pKV)h*;d3K!$``L|+ zic=4oZ0d0Qa915uHvHAsJKC)H@6%23wzt-NkGD2w1%3c>Hhl@y w6|bne@y}gc`N{7<11`6N8enJlG&wRdbfp>JIsJBlHqcWHp00i_>zopr09K7>9{>OV literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..039b368da6c73b710a643e8874c5545dfe0e6e1f GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=ffJBc3jfArY;~2@&z- zHlBU`Py2L-u>la=sr@wR;6d|_jJ+b(4?g}}{J*v3hXe@Rn`?9Yz=BmyrtSuUK?Mn) ztwc_@p6Qj4$h)7|(8_jJ_JZZs`48{z_UCzjueQm$$uYE5YZ}PJ4FZc-lofF^1A%jK z9xsqm;nj(-pRL8GAkjWgZrguJpy5ZBRs Date: Mon, 21 Oct 2024 17:42:34 -0400 Subject: [PATCH 2/7] Panic bunker print strings (#2300) --- Content.Server/Connection/ConnectionManager.cs | 16 ++++++++++++++-- .../Locale/en-US/_NF/connection-messages.ftl | 10 ++++++++++ 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 Resources/Locale/en-US/_NF/connection-messages.ftl 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/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. From 17ea939d4bab173582542f9b19a27bffa3ad49dc Mon Sep 17 00:00:00 2001 From: MisterMecky Date: Tue, 22 Oct 2024 05:44:53 +0800 Subject: [PATCH 3/7] readd duffelbag slowdown (#2298) * readd duffebag slowdown * Reparent duffelbag under upstream base --------- Co-authored-by: Whatstone --- .../_NF/Entities/Clothing/Back/base_clothing_backpack.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ccaa2e3859f572392f472f7d4a7b8977e5117931 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Mon, 21 Oct 2024 21:45:20 +0000 Subject: [PATCH 4/7] Automatic Changelog (#2298) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 65562e97789..98172126da7 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4819,3 +4819,9 @@ 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' From c85045c30aab1a77145c3c099512e7c1dc774019 Mon Sep 17 00:00:00 2001 From: Long YM <40413261+Mygnol@users.noreply.github.com> Date: Tue, 22 Oct 2024 12:12:02 +0800 Subject: [PATCH 5/7] Add guidebook entries for Eagle, Phoenix (#2218) Co-authored-by: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> --- .../Locale/en-US/_NF/guidebook/guides.ftl | 2 + .../Prototypes/_NF/Guidebook/shipyard.yml | 14 ++- .../Prototypes/_NF/Guidebook/shuttle_maps.yml | 24 ++++ Resources/Prototypes/_NF/Shipyard/eagle.yml | 2 +- Resources/Prototypes/_NF/Shipyard/phoenix.yml | 14 ++- .../_NF/Guidebook/Shipyard/Eagle.xml | 94 ++++++++++++++++ .../_NF/Guidebook/Shipyard/Phoenix.xml | 105 ++++++++++++++++++ .../shuttle_maps/128x96.rsi/eagle.png | Bin 0 -> 1911 bytes .../shuttle_maps/128x96.rsi/meta.json | 8 +- .../shuttle_maps/128x96.rsi/phoenix.png | Bin 0 -> 1943 bytes 10 files changed, 258 insertions(+), 5 deletions(-) create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Eagle.xml create mode 100644 Resources/ServerInfo/_NF/Guidebook/Shipyard/Phoenix.xml create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/eagle.png create mode 100644 Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/phoenix.png 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/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/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/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 0000000000000000000000000000000000000000..1de24d2c3a8ecceeede4f3bf1e8b6429acc269e0 GIT binary patch literal 1911 zcmV--2Z;EIP)^@RCt{2olR&SMHt6tLn=kF;3bHu)GxGHFH+P)DO9nC9Q0ry zPy)f?TMXD!Pql`M5^Ya{paO)WKgX^6Js zhDMM^VBJg~Kat|KE~p_Ly4&tdQFef~z?Lz8IzuGTLJ_#6}%atX8q)Ao3vhlUQm5KvZz;a zd45S;SlBK0jVy_WMt2+YkyS(6U#(AA1w;;afXEr7#-!BZj69abC0tcHav0fd%FpH{ z{<-;Np4a4TasTrCk})n722}&5zh&E{#zenrw2(cc+CXj(UEK?@ZUm}~6`LW7{9L!x zsY@@EAyJ6PBM4pHVI14KA5djtQxKaly-a$vJw+M{a(z{;7b>1o0#rpO0WyCbU-(34 zJNQPyeM}kt!h+fIUtKKHnOMa1FS!-YGga%3nsOc#La%dO8jZ3GTnf!oWCi7>uBtdT@u>XjVBd(@I1GWRbxgTc=?sRfYi&Ei?fd6*w~gg*!yh*b^--EE znzQShA=fLiK>~zAzf_=(Q0o@qiJ-{o+r^**V=tuH6)pCAwiRJeH6T+zK9akSU46`$ z*Xp7=-*a;x2mgheU?J3$!%K~;^eYcqT{ zV3R>V3}<47n&#Do&)gfPg4+`JDsie4|C!jQ#eY4VdS+{WMRkDSNCEHrPz|Q`Q9Y*? z>5?Q#1`+@hk=>z6fuEoMtkL}LczLGL{9LEzRc>rw+26=iaHyRpWSX+OYM%<$y$J5K zndlVvU)lRz>6-EW*N>O{4}Pk)@?F45B(W~ub^P^#dZcju#dnnVhCVuy`(1YyHSysn zM*%v&JdVVBl%ENg0USRHv2m}S>=&ZYBlw*1GhtI21t4+*%2uUn5<=ydLCbh@7U${< zQ9Qh|rF2#C)XZ(U`|aWHbNBS4Kap`VN^1e4SPP)6dOH2lje#{x&R)#j2gXM8dT4V^ zft&}>sR32zke{;(=npom2HJelIF3ZO{H%!=V0xqWMoQB(ee3m;x&N1YkLK=!w;mwl z?K!+6zIl&+etPRl?!N!GlVms-uxwX`e>H|j3tt`uoFCaCo?W2Rz_>`J4w{;b@rf7M%9-6#gn&8hRn zFuhEwOuhN4QskC5a~9_XVP0s-uL?KjuH7Ys5aO(3ysEGSh#c+!krU(r5w_>{heXLr zhjWBbHBci392w1B>tT(&0xSUnVFHgR=ao zz5O=l1=U?PBpU??A;j3-H@ufYh9yAca0iGSucH8Jz8yDhp6Py)yX!uCAImc%3U_yX z2WO{SE*tJFqL!F@0mV4ArhsC<32K!9uf1{99EfR^C{=*`e}OUMRR!Su`SkG|$CdID_Vz}On^O^`1Yiod12A#I=NGKO5+HK8 z14K^r9YA%Wndy`?>Z*#zswPl$4e9e5I?+o2Tc}ggOoZMMxC2zOuC!$yNG`7 xBmu*Xvqs--zVt8n8$L zhW6WvVuV8d17ZyorBwd_3xa`wn$!phVjw+;7_c6yNH4}lvGJhai+Hk7#2(heH@n}r z^PQRZX6MK5X5Q!Wo!yWt=iV**ZneOcGWEag=`xkhM)Q>W%-k={j@>>I@`c)Zb(1u zu3G>Ks;A%9kHh{!2pJis-9SH^Z>!R98_NUp$>n3RQ0r24_T=L#StxSY$XP`;d7tS% z>8?vvmvtRj15=M<`6*D#)?JXT>@HNjFIDbS)v~cVb_t>GRN3AjReqI*Qc=CX>$YXT zo@HfUFKfJfyl$xXNp)S+>(JFvyanijE>y7mw&j^*q0}Xx--Ke@sP_ftb7>1E0ZOs;C>0`F*CbgmLdq(SdxWeb z8cp)MK4gh;J)!GpMJSjF2P;70umU6wD?s9S9Syv4`8~A5LdgS}efLePo~ljx)V#Jb zRF%h6hKmd)*a9RDD?s7|n-H?G`9qPudf=z+)Qsrfn@7*R)H_=C1eeh!8@E zgF=Yj$OH7;izBxO8{6lam_NByq-S3r#J8b&zPYkcI_IDe;^yY%vdj}*w484qc>$cU zDs2xlCiWKT-o=Yuy8kMA z?)A@Cf=}9H3y?Uh0ErW2Ubu@pIIy*+NbANCC~ji>-UOOwZQn|?a&*Kn`w+GOiNgwz zIMF{2)VTwl3z&as5FLD#Ff-dwR9e14pa? zi4%P^5Slya4xp)rz~Ia^F)-#P9l zU=rzvQ)5MX&;IX?i&p8#^U1&1ahD}^lC}U%1X~f!_kt0u01X3M5zY6qE~U2sdG#pO zQf)Ag?zk#1tV7Q0x+<6s_^H>p@4_R2t?1=??}lCj*0O^FO(MSh*j@`9rPk;|rw)s2jMj5?tj2;xfMPGG%M0Q3?d9EP(IWGt(@Loj~lp zK8Ap>XMSR(S%WvweJuaIF*p$6n?7HlpmS^1LU+N(qz($F zUhF^JH@-L$w4ORpMgoNh7kh33Fer4V9e6I7z@<`P~{p51gU(5?QxxtlJo1z+=-a3(lfI_0_!6U2UCAx z8FHDX@=d~;hJ#f@y2Fb?_n{2w!gJ+?BUE+iX!UR~)+j!FSzS>@R~DD>)xP`rL~AS> zIwj2ZI0d;^+Xf||KK(+p+yX#UjbqbzurH9u5M-B-m!p$GcQbXaLAQuRX#r{tJ&=aq z9l%f0D6+K)J*y!FmZbdw#u6W9i-E+uFB ziyB?ezfGTgQP>d*U`q=BN=AkI0EyFj6DEXyXjnHph=Ohg(M}iwhOh-l9995^VHk#C d7=}rW{{i}70G*Wj Date: Tue, 22 Oct 2024 05:03:37 +0000 Subject: [PATCH 6/7] Update hunter.yml (#2295) --- .../Maps/_NF/Shuttles/Syndicate/hunter.yml | 273 ++++++++++-------- 1 file changed, 154 insertions(+), 119 deletions(-) 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: From 33258e89b6506aacb7b29b3d56790978cc793e14 Mon Sep 17 00:00:00 2001 From: FrontierATC Date: Tue, 22 Oct 2024 05:04:12 +0000 Subject: [PATCH 7/7] Automatic Changelog (#2295) --- Resources/Changelog/Frontier.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Resources/Changelog/Frontier.yml b/Resources/Changelog/Frontier.yml index 98172126da7..a24c38688dd 100644 --- a/Resources/Changelog/Frontier.yml +++ b/Resources/Changelog/Frontier.yml @@ -4825,3 +4825,9 @@ Entries: 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'