Ship test fixes (new-frontiers-14#2174)

Corvax-Frontier · Oct 9, 2024 · 8735b54 · 8735b54
1 parent 2b2d4fd
commit 8735b54
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 6 deletions.
diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
@@ -2933,7 +2933,7 @@ entities:
     - type: Transform
       pos: -0.5,9.5
       parent: 1
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 359
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml b/Resources/Maps/_NF/Shuttles/Expedition/anchor.yml
@@ -10574,7 +10574,7 @@ entities:
     - type: Transform
       pos: 2.5,-11.5
       parent: 1
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 1261
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml b/Resources/Maps/_NF/Shuttles/Nfsd/empress.yml
@@ -11602,7 +11602,6 @@ entities:
         - Pressed: Toggle
         2543:
         - Pressed: Toggle
-        12: []
         2541:
         - Pressed: Toggle
         2544:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml b/Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml
@@ -5872,7 +5872,7 @@ entities:
     - type: Transform
       pos: 1.7114414,-8.847875
       parent: 2
-- proto: SignShield
+- proto: NFSignShield
   entities:
   - uid: 858
     components:

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/signs.yml
@@ -186,3 +186,12 @@
   components:
   - type: Sprite
     state: bus
+
+- type: entity
+  parent: NFBaseSign
+  id: NFSignShield
+  name: shield sign
+  description: A sign with a shield.
+  components:
+  - type: Sprite
+    state: shield
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/meta.json
@@ -5,7 +5,7 @@
         "y": 32
     },
     "license": "CC-BY-SA-3.0",
-    "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock (edited from base signs.rsi/dock) made by Whatstone (Discord)",
+    "copyright": "direction_sr - Created by MagnusCrowe for Frontier Station, cb1/cb2/cb3/cb4/nfsd/shop/vend - Created by GentleButter for Frontier Station, nfsd/range/law/brig/brigmed/detective/brief/armoury/evidence - Created by GhostPrinceLost for Frontier Station, bus/dock/shield (dock edited from base signs.rsi/dock) made by Whatstone (Discord)",
     "states": [
         {
             "name": "direction_sr",
@@ -71,6 +71,9 @@
         },
         {
             "name": "dock"
+        },
+        {
+            "name": "shield"
         }
     ]
 }
diff --git a/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png b/Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png
diff --git a/Resources/migration.yml b/Resources/migration.yml
@@ -390,7 +390,7 @@ SignChemistry2: SignChem
 SignCourt: SignLawyer
 SignAtmosMinsky: SignAtmos
 SignDrones: SignMaterials
-SignShield: null # what was this even for?
+SignShield: NFSignShield # what was this even for? # Frontier: null<NFSignShield
 SignHydro2: SignHydro1
 SignHydro3: SignHydro1
-Original file line number
+Diff line change
@@ Expand Up / @@ -11602,7 +11602,6 @@ entities: @@
             - Pressed: Toggle
 :
             - Pressed: Toggle
-: []
 :
             - Pressed: Toggle
 :
@@ Expand Down @@