Revert "Guidebook entry and tiny polish"

This reverts commit 609915f.
Temoffy · Dec 14, 2024 · 0459de8 · 0459de8
1 parent 609915f
commit 0459de8
Show file tree

Hide file tree

Showing 8 changed files with 151 additions and 299 deletions.
diff --git a/Resources/Locale/en-US/_NF/guidebook/guides.ftl b/Resources/Locale/en-US/_NF/guidebook/guides.ftl
@@ -62,7 +62,6 @@ guide-entry-shipyard-liquidator = Liquidator
 guide-entry-shipyard-loader = Loader
 guide-entry-shipyard-mccargo = McCargo
 guide-entry-shipyard-mcdelivery = McDelivery
-guide-entry-shipyard-metastable = Metastable II
 guide-entry-shipyard-pathfinder = Pathfinder
 guide-entry-shipyard-phoenix = Phoenix
 guide-entry-shipyard-pioneer = Pioneer

diff --git a/Resources/Maps/_NF/Shuttles/metastable.yml b/Resources/Maps/_NF/Shuttles/metastable.yml
@@ -187,22 +187,24 @@ entities:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNe
           decals:
-            1099: 3,-13
+            77: 3,-13
         - node:
+            cleanable: True
             color: '#D381C9FF'
             id: BrickTileWhiteCornerNw
           decals:
-            1098: 2,-13
+            1035: 2,-13
         - node:
+            cleanable: True
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSe
           decals:
-            1100: 3,-15
+            1037: 3,-15
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteCornerSw
           decals:
-            1101: 2,-15
+            79: 2,-15
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteInnerNe
@@ -228,7 +230,12 @@ entities:
             id: BrickTileWhiteLineE
           decals:
             113: 10,-18
-            1102: 3,-14
+        - node:
+            cleanable: True
+            color: '#D381C9FF'
+            id: BrickTileWhiteLineE
+          decals:
+            1036: 3,-14
         - node:
             color: '#D381C9FF'
             id: BrickTileWhiteLineN
@@ -245,8 +252,8 @@ entities:
             color: '#D381C9FF'
             id: BrickTileWhiteLineW
           decals:
+            81: 2,-14
             118: 16,-18
-            1103: 2,-14
         - node:
             color: '#FFFFFFFF'
             id: BushAThree
@@ -510,11 +517,10 @@ entities:
             1017: 6,-9
             1018: 7,-9
             1019: 8,-9
+            1038: 2,-13
+            1039: 3,-15
             1057: 15,-18
             1074: -15,-3
-            1104: 2,-13
-            1105: 2,-14
-            1106: 3,-14
         - node:
             cleanable: True
             color: '#FFFFFFFF'
@@ -2083,7 +2089,7 @@ entities:
     - type: GasTileOverlay
     - type: RadiationGridResistance
     - type: BecomesStation
-      id: Metastable
+      id: metastable2
 - proto: AirAlarm
   entities:
   - uid: 274
@@ -7408,11 +7414,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: -0.4323871,0.6781124
       parent: 1
-  - uid: 1789
-    components:
-    - type: Transform
-      pos: -8.447298,6.5929465
-      parent: 1
   - uid: 2185
     components:
     - type: Transform
@@ -7862,11 +7863,11 @@ entities:
       parent: 1
 - proto: CrescentMothershipComputer
   entities:
-  - uid: 2818
+  - uid: 1671
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -9.5,6.5
+      rot: 3.141592653589793 rad
+      pos: -10.5,5.5
       parent: 1
 - proto: CrewMonitoringServer
   entities:
@@ -10041,6 +10042,14 @@ entities:
     - type: Transform
       pos: 7.5,11.5
       parent: 1
+  - uid: 1789
+    components:
+    - type: Transform
+      rot: 3.141592653589793 rad
+      pos: 11.5,6.5
+      parent: 1
+    - type: AtmosPipeColor
+      color: '#0055CCFF'
   - uid: 1790
     components:
     - type: Transform
@@ -11473,14 +11482,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#990000FF'
-  - uid: 2819
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 10.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
 - proto: GasPipeTJunction
   entities:
   - uid: 1124
@@ -11491,14 +11492,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-  - uid: 1444
-    components:
-    - type: Transform
-      rot: -1.5707963267948966 rad
-      pos: 11.5,6.5
-      parent: 1
-    - type: AtmosPipeColor
-      color: '#0055CCFF'
   - uid: 1605
     components:
     - type: Transform
@@ -13732,11 +13725,6 @@ entities:
       parent: 1
 - proto: PottedPlantRandom
   entities:
-  - uid: 1190
-    components:
-    - type: Transform
-      pos: -10.5,5.5
-      parent: 1
   - uid: 2662
     components:
     - type: Transform
@@ -13767,29 +13755,28 @@ entities:
     - type: Transform
       pos: -2.5,-2.5
       parent: 1
+  - uid: 2739
+    components:
+    - type: Transform
+      pos: -11.5,5.5
+      parent: 1
   - uid: 2774
     components:
     - type: Transform
       pos: -6.5,5.5
       parent: 1
 - proto: PowerCellRecharger
   entities:
-  - uid: 1671
-    components:
-    - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: 1.5,-13.5
-      parent: 1
-  - uid: 2739
+  - uid: 1190
     components:
     - type: Transform
-      rot: 1.5707963267948966 rad
-      pos: -7.5,-11.5
+      pos: -7.5,5.5
       parent: 1
-  - uid: 2817
+  - uid: 1444
     components:
     - type: Transform
-      pos: -8.5,5.5
+      rot: 3.141592653589793 rad
+      pos: 1.5,-8.5
       parent: 1
 - proto: Poweredlight
   entities:
@@ -15788,6 +15775,10 @@ entities:
         - Pressed: DoorBolt
         2268:
         - Pressed: DoorBolt
+        2385:
+        - Pressed: Close
+        2386:
+        - Pressed: Close
         2266:
         - Pressed: DoorBolt
         2263:
@@ -16623,13 +16614,6 @@ entities:
       parent: 1
     - type: AtmosPipeColor
       color: '#0055CCFF'
-- proto: SignArmory
-  entities:
-  - uid: 2814
-    components:
-    - type: Transform
-      pos: -0.5,14.5
-      parent: 1
 - proto: SignAtmos
   entities:
   - uid: 1568
@@ -16945,13 +16929,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 17.5,3.5
       parent: 1
-- proto: SignXenobio
-  entities:
-  - uid: 2815
-    components:
-    - type: Transform
-      pos: 6.5,-16.5
-      parent: 1
 - proto: SinkStemlessWater
   entities:
   - uid: 1056
@@ -17353,11 +17330,6 @@ entities:
     - type: Transform
       pos: 1.5,-8.5
       parent: 1
-  - uid: 2816
-    components:
-    - type: Transform
-      pos: -8.5,5.5
-      parent: 1
 - proto: TableBrass
   entities:
   - uid: 785

diff --git a/Resources/Prototypes/_NF/Guidebook/shipyard.yml b/Resources/Prototypes/_NF/Guidebook/shipyard.yml
@@ -36,7 +36,6 @@
   - ShipyardLoader
   - ShipyardMcCargo
   - ShipyardMcDelivery
-  - ShipyardMetastable
   - ShipyardPathfinder
   - ShipyardPhoenix
   - ShipyardPioneer
@@ -208,11 +207,6 @@
   id: ShipyardMcDelivery
   name: guide-entry-shipyard-mcdelivery
   text: "/ServerInfo/_NF/Guidebook/Shipyard/McDelivery.xml"
-
-- type: guideEntry
-  id: ShipyardMetastable
-  name: guide-entry-shipyard-metastable
-  text: "/ServerInfo/_NF/Guidebook/Shipyard/Metastable.xml"
 
 - type: guideEntry
   id: ShipyardPathfinder

diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -238,18 +238,6 @@
     state: kilderkin
     scale: 1.2, 1.2
 
-- type: entity
-  parent: PosterBase
-  id: ShuttleMapMetastable
-  name: "TCI Metastable II"
-  description: "Detailed map of a Metastable II flagship."
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
-    state: metastable
-    scale: 1.2, 1.2
-
 - type: entity
   parent: PosterBase
   id: ShuttleMapLantern

diff --git a/Resources/Prototypes/_NF/Shipyard/metastable.yml b/Resources/Prototypes/_NF/Shipyard/metastable.yml
@@ -6,7 +6,7 @@
 # GitHub: see author
 # Discord: 
 
-# Shuttle Notes: NO venders! Mouse spawner timer increased to 30 minutes, flatpacks must be unpacked for pricing and power testing. Gas miner atmos tiles intentional for recovery from near full spacing. Brig doors not bolting is intended. Disposal route into locked-down cargo is intended unless abused repeatedly. 
+# Shuttle Notes: Mouse spawner timer increased to 30 minutes, flatpacks must be unpacked for pricing and power testing. Gas miner atmos tiles intentional for recovery from near full spacing. Brig doors not bolting is intended. Disposal route into locked-down cargo is intended unless abused repeatedly. 
 # priorities: Enable large crews and factions/fleets in a flagship role, mimic Meta station (SS13 version with xenobio), upgradability/customizability, keep it as small as reasonable for it's purposes. 
 
 #TODO: placeholder armory, placeholder shipyard. start AME? localization strings for camera names?, borg crew slot, guidebook
@@ -18,10 +18,9 @@
   category: Large #1330 tiles
   group: Shipyard
   shuttlePath: /Maps/_NF/Shuttles/metastable.yml
-  guidebookPage: ShipyardMetastable
+  guidebookPage: Null
   class:
   - Science
-  - Engineering
   - Civilian
   engine:
   - AME