From 8735b546bddd797a9e1b82686959c8ae48419ed8 Mon Sep 17 00:00:00 2001
From: Whatstone <166147148+whatston3@users.noreply.github.com>
Date: Wed, 9 Oct 2024 03:07:30 -0400
Subject: [PATCH] Ship test fixes (#2174)

---
 .../Maps/_NF/Shuttles/BlackMarket/schooner.yml    |   2 +-
 Resources/Maps/_NF/Shuttles/Expedition/anchor.yml |   2 +-
 Resources/Maps/_NF/Shuttles/Nfsd/empress.yml      |   1 -
 Resources/Maps/_NF/Shuttles/Nfsd/opportunity.yml  |   2 +-
 .../Structures/Wallmounts/Signs/signs.yml         |   9 +++++++++
 .../_NF/Structures/Wallmounts/signs.rsi/meta.json |   5 ++++-
 .../Structures/Wallmounts/signs.rsi/shield.png    | Bin 0 -> 347 bytes
 Resources/migration.yml                           |   2 +-
 8 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/signs.rsi/shield.png

diff --git a/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml b/Resources/Maps/_NF/Shuttles/BlackMarket/schooner.yml
index eed6dc98d7d..4aa4412037c 100644
--- 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
index a0c30104645..34592b38649 100644
--- 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
index e248424857a..534fc12bf27 100644
--- 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
index a35b7687439..19e7aa5214e 100644
--- 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
index 031683c11cb..015054b38df 100644
--- 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
index 3551fb249b8..7c60c0e4331 100644
--- 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
new file mode 100644
index 0000000000000000000000000000000000000000..bf39213d4df5b9af25f986637a1c732a72f8426d
GIT binary patch
literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003ZNkl<ZScUDE
zF%E(-6o#M18!(vE!3)@hka(6(9)gw8l|wLb78B!AFW_Jk2hV^5DS@Vi_u4m@=$|mP
zec#6`qyX^iS<MYr3OX*(x%IPx0+oVpzXRBcbok2vJf40DuYiRg59x55%iS-r4lUrg
zb4<MrX0ebZWVs?k-?tWwu4m^2J1|ZR9J>zH0UO;E!7(Ar;ch7%Lv>&&E}W8N0Uvy6
z-`NCG;Yk7<@Mr-pc$5GqoGic%Ckt@H$pYMPvH&-nEWiyX3vk2H0`?G+rz@(coi}%Q
zkpuwxvmGO0$L)MJ0i)}QgnQ}<Sx(^C?IL{-*rHjkhRY2F4iNbkg!Wc91^GcGb-;yj
tB-nwMVX41Z?>m1?#uDlHKA~T;e?I2SkvPOe*mD2?002ovPDHLkV1g$Yk01a5

literal 0
HcmV?d00001

diff --git a/Resources/migration.yml b/Resources/migration.yml
index 8f948d75bce..6aabefb387a 100644
--- 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