Линтер фиксы

Corvax-Frontier · Oct 26, 2024 · 4b212ae · 4b212ae
1 parent 1e852e9
commit 4b212ae
Show file tree

Hide file tree

Showing 17 changed files with 54 additions and 357 deletions.
diff --git a/Resources/Maps/Corvax/Shuttles/Expedition/boyaryshnik.yml b/Resources/Maps/Corvax/Shuttles/Expedition/boyaryshnik.yml
@@ -24,7 +24,7 @@ entities:
     components:
     - type: MetaData
       name: grid
-    - type: Transform   
+    - type: Transform
       pos: 0.2982388,12.765411
     - type: MapGrid
       chunks:
@@ -3436,13 +3436,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,2.5
       parent: 1
-- proto: GunSafeShuttleT1Spawner
-  entities:
-  - uid: 426
-    components:
-    - type: Transform
-      pos: -2.5,-0.5
-      parent: 1
 - proto: Gyroscope
   entities:
   - uid: 581

diff --git a/Resources/Prototypes/Corvax/PointsOflnterest/Charlie.yml b/Resources/Prototypes/Corvax/PointsOflnterest/Charlie.yml
@@ -13,8 +13,6 @@
   name: 'Синдикатовcкий аванпост Чарли'
   rangeMin: 8150
   rangeMax: 13550
-  iffColor: "#C83737" #red the color of ebil
-  isHidden: true
   spawnChance: 1
   gridPath: /Maps/Corvax/POI/charlie.yml
 

diff --git a/Resources/Prototypes/Corvax/PointsOflnterest/Hospital.yml b/Resources/Prototypes/Corvax/PointsOflnterest/Hospital.yml
@@ -3,5 +3,4 @@
   name: "Клиника Здоровый лис"
   rangeMin: 1000
   rangeMax: 1800
-  iffColor: "#1895a3" #yellorange for faction style
-  gridPath: /Maps/Corvax/POI/Hospital.yml
+  gridPath: /Maps/Corvax/POI/Hospital.yml
diff --git a/Resources/Prototypes/Corvax/Shipyard/Nfsd/Baron.yml b/Resources/Prototypes/Corvax/Shipyard/Nfsd/Baron.yml
@@ -27,7 +27,7 @@
 #            PrisonGuard: [ 0, 0 ]
             SeniorOfficer: [ 0, 0 ]
             Brigmedic: [ 0, 0 ]
-            DetectiveNF: [ 0, 0 ]
+            NFDetective: [ 0, 0 ]
             Deputy: [ 0, 0 ]
             Cadet: [ 0, 0 ]
             Chef: [ 0, 0 ]

diff --git a/Resources/Prototypes/Corvax/Shipyard/Nfsd/bigskat.yml b/Resources/Prototypes/Corvax/Shipyard/Nfsd/bigskat.yml
@@ -27,7 +27,7 @@
 #            PrisonGuard: [ 0, 0 ]
             SeniorOfficer: [ 0, 0 ]
             Brigmedic: [ 0, 0 ]
-            DetectiveNF: [ 0, 0 ]
+            NFDetective: [ 0, 0 ]
             Deputy: [ 0, 0 ]
             Cadet: [ 0, 0 ]
             Chef: [ 0, 0 ]

diff --git a/Resources/Prototypes/DeltaV/Species/rodentia.yml b/Resources/Prototypes/DeltaV/Species/rodentia.yml
@@ -10,7 +10,8 @@
   skinColoration: Hues
   maleFirstNames: names_rodentia_male
   femaleFirstNames: names_rodentia_female
-  lastNames: names_rodentia_last
+  maleLastNames: names_rodentia_last # Corvax-LastnameGender
+  femaleLastNames: names_rodentia_last # Corvax-LastnameGender
   naming: LastFirst
 
 - type: speciesBaseSprites

diff --git a/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml b/Resources/Prototypes/_NF/Catalog/Fills/Items/weapon_cases_shuttle_guns.yml
diff --git a/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml b/Resources/Prototypes/_NF/Entities/Markers/Spawners/Random/dungeon_items_mercenary.yml
@@ -433,11 +433,11 @@
     - CrateSecureMercenaryPrivateSecHardsuit
     - CrateSecurityArmor
     - CrateSecurityHelmet
-    - CrateArmoryShotgun
-    - CrateArmoryPistols
-    - CrateArmoryRifleGestio
-    - CrateArmoryRifleNovaliteC1
-    - CrateArmoryEnergyGun
+    - CrateArmoryShotgunExpedition
+    - CrateArmoryPistolsExpedition
+    - CrateArmoryRifleGestioExpedition
+    - CrateArmoryRifleNovaliteC1Expedition
+    - CrateArmoryEnergyGunExpedition
     # Ammo
     - CrateAmmoBoxLethal20
     - CrateAmmoBoxLethal25
@@ -455,10 +455,10 @@
     chance: 0.85
     offset: 0.0
     rarePrototypes:
-    - CrateArmorySMG
-    - CrateArmoryLaser
-    - CrateArmorySMG
-    - CrateArmoryLaser
+    - CrateArmorySMGExpedition
+    - CrateArmoryLaserExpedition
+    - CrateArmorySMGExpedition
+    - CrateArmoryLaserExpedition
     - CrateSecurityNonlethal
     - CrateSecureMercenaryHardsuitMagBoots
     - CrateSecureMercenaryPrivateSecHardsuitMagBoots