Shuttle map cleanup, Hauler map-thank you, Mygnol

whatston3 · Sep 30, 2024 · 95d7b00 · 95d7b00
1 parent 41b10e8
commit 95d7b00
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 24 deletions.
diff --git a/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml b/Resources/Prototypes/_NF/Guidebook/shuttle_maps.yml
@@ -154,6 +154,18 @@
     state: harbormaster
     scale: 1.2, 1.2
 
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapHauler
+  name: "NC Hauler"
+  description: "Detailed map of a Hauler shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: hauler
+    scale: 1.2, 1.2
+
 - type: entity
   parent: PosterBase
   id: ShuttleMapInvestigator
@@ -286,23 +298,12 @@
     state: searchlight
     scale: 1.2, 1.2
 
-- type: entity
-  parent: PosterBase
-  id: ShuttleMapVagabond
-  name: "NT Vagabond"
-  description: "Detailed map of a Vagabond shuttle."
-  categories: [ HideSpawnMenu ]
-  components:
-  - type: Sprite
-    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
-    state: vagabond
-    scale: 1.2, 1.2
-
 - type: entity
   parent: PosterBase
   id: ShuttleMapSpirit
   name: "NM Spirit"
   description: "Detailed map of a Spirit shuttle."
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
@@ -314,8 +315,21 @@
   id: ShuttleMapStasis
   name: "NM Stasis"
   description: "Detailed map of a Stasis shuttle."
+  categories: [ HideSpawnMenu ]
   components:
   - type: Sprite
     sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
     state: stasis
     scale: 1.2, 1.2
+
+- type: entity
+  parent: PosterBase
+  id: ShuttleMapVagabond
+  name: "NT Vagabond"
+  description: "Detailed map of a Vagabond shuttle."
+  categories: [ HideSpawnMenu ]
+  components:
+  - type: Sprite
+    sprite: _NF/Guidebook/shuttle_maps/128x96.rsi
+    state: vagabond
+    scale: 1.2, 1.2
diff --git a/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml b/Resources/ServerInfo/_NF/Guidebook/Shipyard/Hauler.xml
@@ -5,15 +5,18 @@
     <GuideEntityEmbed Entity="CrateGenericSteel" Caption="mystery loot"/>
     <GuideEntityEmbed Entity="OreProcessor"/>
   </Box>
-    [color=#a4885c]Ship Size:[/color] Medium
+  <Box>
+    <GuideEntityEmbed Entity="ShuttleMapHauler" Caption=""/>
+  </Box>
+  [color=#a4885c]Ship Size:[/color] Medium
 
-    [color=#a4885c]Recommended Crew:[/color] 2-4
+  [color=#a4885c]Recommended Crew:[/color] 2-4
 
-    [color=#a4885c]Power Gen Type:[/color] Uranium
+  [color=#a4885c]Power Gen Type:[/color] Uranium
 
-    [color=#a4885c]Expeditions:[/color] None
+  [color=#a4885c]Expeditions:[/color] None
 
-    [color=#a4885c]IFF Console:[/color] None
+  [color=#a4885c]IFF Console:[/color] None
 
   "A medium sized vessel specializing in long-haul salvage, mining, and cargo operations."
 

diff --git a/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/hauler.png b/Resources/Textures/_NF/Guidebook/shuttle_maps/128x96.rsi/hauler.png
diff --git 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 maps sprited by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi Spirit map sprited by iNoahGuy/actualcatmoment (discord/github) Apothecary and Stasis maps sprited by dustylens (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 maps sprited by erhardsteinhauer (discord/github), used font from https://github.com/tgstation/tgstation/blob/master/icons/obj/signs.dmi Spirit map sprited by iNoahGuy/actualcatmoment (discord/github) Apothecary and Stasis maps sprited by dustylens (discord/github). hauler by Mygnol (GitHub)",
   "size": {
     "x": 128,
     "y": 96
@@ -15,7 +15,7 @@
     },
     {
       "name": "bazaar"
-    },  
+    },
     {
       "name": "bocadillo"
     },
@@ -46,6 +46,9 @@
     {
       "name": "harbormaster"
     },
+    {
+      "name": "hauler"
+    },
     {
       "name": "investigator"
     },
@@ -80,13 +83,13 @@
       "name": "searchlight"
     },
     {
-      "name": "vagabond"
+      "name": "spirit"
     },
-	{
-	  "name": "spirit"
+    {
+      "name": "stasis"
     },
     {
-	  "name": "stasis"
-    }  
+      "name": "vagabond"
+    }
   ]
 }