Merge pull request #62 from Corvax-Frontier/Уээээээ

Мелкие обновления по голосовалкам
Corvax-Frontier · Apr 24, 2024 · dc634e8 · dc634e8
2 parents 61bd74e + 0b43ddd
commit dc634e8
Show file tree

Hide file tree

Showing 16 changed files with 66 additions and 19 deletions.
diff --git a/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs b/Content.Server/_NF/GameRule/NfAdventureRuleSystem.cs
@@ -216,7 +216,7 @@ private void OnStartup(RoundStartingEvent ev)
             }))
         {
             var meta = EnsureComp<MetaDataComponent>(depotUid5s[0]);
-            _meta.SetEntityName(depotUid5s[0], "Дыра", meta); // Corvax RU
+            _meta.SetEntityName(depotUid5s[0], "Яма", meta); // Corvax RU
             _shuttle.SetIFFColor(depotUid5s[0], civilianColor);
         }
 

diff --git a/Resources/Prototypes/Atmospherics/gases.yml b/Resources/Prototypes/Atmospherics/gases.yml
@@ -99,4 +99,4 @@
   gasMolesVisible: 0.6
   color: 3a758c
   reagent: Frezon
-  pricePerMole: 3
+  pricePerMole: 15
diff --git a/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml b/Resources/Prototypes/Corvax/Entities/Mobs/Species/vulpkanin.yml
@@ -16,6 +16,10 @@
       Starving: 100
       Dead: 0
     baseDecayRate: 0.02
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst # on 1.5x more
     thresholds:
       OverHydrated: 650

diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Species/harpy.yml
@@ -83,6 +83,11 @@
         visible: false
   - type: HumanoidAppearance
     species: Harpy
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:

diff --git a/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml b/Resources/Prototypes/Entities/Mobs/Species/arachnid.yml
@@ -10,7 +10,11 @@
     requiredLegs: 2 # It would be funny if arachnids could use their little back limbs to move around once they lose their legs, but just something to consider post-woundmed
   - type: HumanoidAppearance
     species: Arachnid
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst
   - type: Sericulture
     action: ActionSericulture

diff --git a/Resources/Prototypes/Entities/Mobs/Species/diona.yml b/Resources/Prototypes/Entities/Mobs/Species/diona.yml
@@ -7,8 +7,12 @@
   components:
   - type: HumanoidAppearance
     species: Diona
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
     baseDecayRate: 0.0083
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst
     baseDecayRate: 0.0083
   - type: Carriable # Carrying system from nyanotrasen.

diff --git a/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml b/Resources/Prototypes/Entities/Mobs/Species/dwarf.yml
@@ -5,7 +5,11 @@
   id: BaseMobDwarf
   abstract: true
   components:
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: SSDIndicator # Where?

diff --git a/Resources/Prototypes/Entities/Mobs/Species/human.yml b/Resources/Prototypes/Entities/Mobs/Species/human.yml
@@ -5,7 +5,11 @@
   name: Urist McHands
   abstract: true
   components:
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Icon # It will not have an icon in the adminspawn menu without this. Body parts seem fine for whatever reason.
     sprite: Mobs/Species/Human/parts.rsi
     state: full

diff --git a/Resources/Prototypes/Entities/Mobs/Species/moth.yml b/Resources/Prototypes/Entities/Mobs/Species/moth.yml
@@ -7,7 +7,11 @@
   components:
   - type: HumanoidAppearance
     species: Moth
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon

diff --git a/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml b/Resources/Prototypes/Entities/Mobs/Species/reptilian.yml
@@ -7,7 +7,11 @@
   components:
   - type: HumanoidAppearance
     species: Reptilian
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Puller
     needsHands: false
   - type: Thirst

diff --git a/Resources/Prototypes/Entities/Mobs/Species/slime.yml b/Resources/Prototypes/Entities/Mobs/Species/slime.yml
@@ -4,7 +4,11 @@
   id: BaseMobSlimePerson
   abstract: true
   components:
-  - type: Hunger
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Thirst
   - type: Carriable # Carrying system from nyanotrasen.
   - type: Icon

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml
@@ -9,6 +9,11 @@
   - type: SSDIndicator # Corvax-Frontier
   - type: HumanoidAppearance
     species: Felinid
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Fixtures
     fixtures: # TODO: This needs a second fixture just for mob collisions.
       fix1:

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/oni.yml b/Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/oni.yml
@@ -8,6 +8,11 @@
     speechSounds: Baritone
   - type: HumanoidAppearance
     species: Oni
+  - type: Hunger # Corvax-Frontier
+    starvationDamage:
+      types:
+        Cold: 0.5
+        Bloodloss: 0.5
   - type: Sprite
     scale: 1.2, 1.2
   - type: Oni

diff --git a/Resources/Prototypes/_NF/Catalog/Cargo/cargo_trade.yml b/Resources/Prototypes/_NF/Catalog/Cargo/cargo_trade.yml
@@ -4,7 +4,7 @@
     sprite: _NF/Structures/Storage/Crates/tradedark.rsi
     state: icon
   product: CrateTradeSecureNormalFilled
-  cost: 1000
+  cost: 25000
   category: cargoproduct-category-name-cargo
   group: market
 
@@ -14,6 +14,6 @@
     sprite: _NF/Structures/Storage/Crates/tradelight.rsi
     state: icon
   product: CrateTradeSecureHighFilled
-  cost: 2000
+  cost: 50000
   category: cargoproduct-category-name-cargo
   group: market
diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/crates.yml
@@ -49,7 +49,7 @@
         layer:
         - MachineLayer
   - type: StaticPrice
-    price: 1000
+    price: 19000
 
 - type: entity
   parent: CrateTradeBaseSecure
@@ -75,7 +75,7 @@
         layer:
         - MachineLayer
   - type: StaticPrice
-    price: 2000
+    price: 38000
 
 - type: entity
   parent: CrateTradeBaseSecure
@@ -195,4 +195,4 @@
   - type: Sprite
     sprite: _NF/Structures/Storage/Crates/nfsd_secure2.rsi
   - type: AccessReader
-    access: [["Security"]]
+    access: [["Security"]]
diff --git a/Resources/Prototypes/_NF/Maps/POI/nfsd.yml b/Resources/Prototypes/_NF/Maps/POI/nfsd.yml
@@ -13,11 +13,11 @@
           overflowJobs: []
           availableJobs:
             Sheriff: [ 1, 1 ]
-            Bailiff: [ 0, 0 ]
-            SeniorOfficer: [ 0, 0 ]
-            Brigmedic: [ 0, 0 ]
+            Bailiff: [ 1, 1 ] # Corvax-Frontier
+            SeniorOfficer: [ 1, 1 ] # Corvax-Frontier
+            Brigmedic: [ 1, 2 ] # Corvax-Frontier
             DetectiveNF: [ 0, 0 ]
-            Deputy: [ 0, 0 ]
-            Cadet: [ 0, 0 ]
+            Deputy: [ 3, 4 ] # Corvax-Frontier
+            Cadet: [ 2, 2 ] # Corvax-Frontier
             # Others:
             Lawyer: [ 0, 0 ]