General Fixup (#2148)

* Cleanup * Update cargo.yml * Fixup for mask * Update masks_blood_cult.yml * Masks * Remove data carrier * Update syndiedrobe.yml * Remove all random frontier added StaticPrice from older syndicate items * More edits * no freezer, NFSD bomb cabinet, jani crates, mags * Fix missing "contrablade" reference --------- Co-authored-by: Whatstone <[email protected]>
new-frontiers-14 · Oct 5, 2024 · 6fb402e · 6fb402e
1 parent 8ec74cb
commit 6fb402e
Show file tree

Hide file tree

Showing 66 changed files with 496 additions and 15,962 deletions.
diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
@@ -1,5 +1,7 @@
 uplink-emp-grenade-launcher-bundle-name = EMP China-Lake Bundle
 uplink-emp-grenade-launcher-bundle-desc = An old China-Lake grenade launcher bundled with 8 rounds of EMP.
+uplink-spaceblade-syndicate-name = Contra SpaceBlade
+uplink-spaceblade-syndicate-desc = Made from real metal!
 
 store-category-sechardsuits = EVA Suits
 store-category-secweapons = Weapons

diff --git a/Resources/Maps/_NF/Bluespace/datacarrier.yml b/Resources/Maps/_NF/Bluespace/datacarrier.yml
diff --git a/Resources/Maps/_NF/Bluespace/vault.yml b/Resources/Maps/_NF/Bluespace/vault.yml
@@ -6094,7 +6094,7 @@ entities:
     - type: Transform
       pos: 2.5,12.5
       parent: 1
-- proto: LockerSecurityFilled
+- proto: NFLockerSecurityFilled
   entities:
   - uid: 1062
     components:

diff --git a/Resources/Maps/_NF/Dungeon/lava_brig.yml b/Resources/Maps/_NF/Dungeon/lava_brig.yml
@@ -7046,7 +7046,7 @@ entities:
     - type: Transform
       pos: 7.4719925,36.539555
       parent: 588
-- proto: ClosetBombFilled
+- proto: NFClosetBombFilled
   entities:
   - uid: 1014
     components:
@@ -8517,7 +8517,7 @@ entities:
     - type: Transform
       pos: 16.5,22.5
       parent: 588
-- proto: LockerSecurityFilled
+- proto: NFLockerSecurityFilled
   entities:
   - uid: 416
     components:

diff --git a/Resources/Maps/_NF/POI/anomalouslab.yml b/Resources/Maps/_NF/POI/anomalouslab.yml
@@ -4389,7 +4389,7 @@ entities:
     - type: Transform
       pos: 15.5,-13.5
       parent: 1
-- proto: ClosetBombFilled
+- proto: NFClosetBombFilled
   entities:
   - uid: 335
     components:

diff --git a/Resources/Maps/_NF/POI/nfsd.yml b/Resources/Maps/_NF/POI/nfsd.yml
@@ -6405,7 +6405,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -17.505972,12.480058
       parent: 1
-- proto: ClosetBombFilled
+- proto: NFClosetBombFilled
   entities:
   - uid: 865
     components:

diff --git a/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml b/Resources/Maps/_NF/Shuttles/Nfsd/broadhead.yml
@@ -3659,7 +3659,7 @@ entities:
         - Pressed: Toggle
         3:
         - Pressed: DoorBolt
-- proto: LockerDetectiveFilled
+- proto: LockerNfsdSilverDetectiveFilled
   entities:
   - uid: 439
     components: