Merge pull request #6 from Vault-Overseers/master

up290624

Resources/Prototypes/Nuclear14/Entities/Mobs/NPCs/animals.yml

@@ -95,7 +95,7 @@
     damage:
       groups:
         Brute: 5
-        
+
 - type: entity
   name: gecko
   id: N14MobGecko
@@ -147,7 +147,7 @@
     spawned:
     - id: N14FoodMeatGecko
       amount: 3
-        
+
 - type: entity
   name: nightstalker cub
   id: N14MobNightstalkerCub
@@ -203,7 +203,7 @@
         reagents:
         - ReagentId: Toxin
           Quantity: 2.5
-          
+
 - type: entity
   name: nightstalker
   id: N14MobNightstalker
@@ -281,7 +281,7 @@
       fix1:
         shape:
           !type:PhysShapeCircle
-            radius: 0.5
+            radius: 0.49
         density: 100
         mask:
         - MobMask
@@ -312,6 +312,7 @@
     damage:
       types:
         Slash: 15
+        Structural: 5
     range: 1.25
   - type: MovementSpeedModifier
     baseWalkSpeed : 3
@@ -363,6 +364,7 @@
     damage:
       types:
         Slash: 15
+        Structural: 5
     range: 1.5
   - type: MovementSpeedModifier
     baseWalkSpeed : 3
@@ -373,6 +375,11 @@
     speed: 1.5
     qualities:
       - Prying
+  - type: Prying
+    pryPowered: !type:Bool
+        true
+    force: !type:Bool
+      true
     useSound:
       path: /Audio/Items/crowbar.ogg
   - type: Insulated
@@ -405,6 +412,7 @@
     damage:
       types:
         Slash: 22
+        Structural: 10
   - type: MobThresholds
     thresholds:
       0: Alive
@@ -417,7 +425,7 @@
         Base: deathclaw # TODO: Crit sprite
       Dead:
         Base: dead
-        
+
 - type: entity
   name: metal deathclaw
   id: N14MobDeathclawMetal
@@ -439,6 +447,7 @@
     damage:
       types:
         Slash: 20
+        Structural: 10
   - type: MobThresholds
     thresholds:
       0: Alive

Resources/Prototypes/Nuclear14/Entities/Structures/Power/generators.yml

@@ -44,7 +44,10 @@
     totalIntensity: 100
     intensitySlope: 1
     maxIntensity: 150
-
+  - type: Damageable
+    damageContainer: Inorganic
+    damageModifierSet: StructuralMetallic
+
 - type: entity
   parent: N14GeneratorFusioncore
   id: N14GeneratorFusionMini
@@ -101,7 +104,7 @@
             - 0 # nitrogen
             - 340.5701689 # carbon dioxide
           temperature: 373.15
-    
+
 - type: entity
   parent: N14GeneratorFusionMini
   id: N14GeneratorFusionEnclave
@@ -131,7 +134,7 @@
     supplyRate: 1000
     supplyRampRate: 250
     supplyRampTolerance: 250
-    
+
 - type: entity
   parent: N14GeneratorFusionMini
   id: N14GeneratorFusionMiniRusted
@@ -142,7 +145,7 @@
     sprite: Nuclear14/Structures/Power/32x48_machines.rsi
     layers:
     - state: generator_rust
-    
+
 - type: entity
   parent: N14GeneratorFusioncore
   id: N14GeneratorPrewar
@@ -155,7 +158,7 @@
     - state: generator_off
     - state: generator_on
     offset: 0.5, 0
-    
+
 - type: entity
   parent: N14GeneratorPrewar
   id: N14GeneratorPrewarUranium
@@ -167,7 +170,7 @@
     layers:
     - state: generator_off
     - state: generator_uranium
-      
+
 - type: entity
   parent: BaseGenerator
   id: N14GeneratorVaultTecReactor
@@ -202,7 +205,7 @@
     energy: 4.5
     softness: 0.5
     color: "#B4FCF0"
-    
+
 - type: entity
   parent: N14GeneratorVaultTecReactor
   id: N14GeneratorReactorFloor
@@ -224,7 +227,7 @@
     totalIntensity: 20000 # ~15 tile radius.
     intensitySlope: 5
     maxIntensity: 50
-    
+
 - type: entity
   parent: BaseStructure
   id: N14GeneratorReactorFloorDestroyed