up

Resources/Locale/en-US/_Nuclear14/reagents.ftl

@@ -250,8 +250,10 @@ reagent-desc-antiseptic = A cleaning solution made from Abraxo Cleaner and some
 # Ores, Metals, Materials
 materials-gunpowder = gunpowder
 materials-lead = lead
+materials-aluminum = aluminum
 materials-sulfur = sulfur
 materials-raw-lead = raw lead
+materials-raw-aluminum = raw aluminum
 materials-raw-sulfur = raw sulfur
 reagent-name-gunpowder = gunpowder
 reagent-desc-gunpowder = Small pellet gunpowder. Now just add lead.
@@ -268,4 +270,4 @@ reagent-name-scorpiontail = scorpion tail
 reagent-desc-scorpiontail = scorpion tail. Stingy.
 
 compost-mixing-success = compost mixed
-mixing-verb-composting = mix compost
+mixing-verb-composting = mix compost

Resources/Prototypes/Damage/modifier_sets.yml

@@ -22,7 +22,7 @@
     Slash: 20
     Piercing: 20
     Heat: 20
-    Structural: 20
+    Structural: 30 # 30 cuz of pickaxes
 
 - type: damageModifierSet
   id: StructuralMetallic

Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_rp.yml

@@ -1583,9 +1583,6 @@
         - id: N14WeaponSniperHunting
           prob: 0.2
           orGroup: Weapon
-        - id: N14WeaponAntiMateriel
-          prob: 0.1
-          orGroup: Weapon
         - id: N14WeaponLeverCarbine
           prob: 0.1
           orGroup: Weapon

Resources/Prototypes/_Nuclear14/Catalog/Fills/storage_fills_timed.yml

@@ -1583,9 +1583,6 @@
         - id: N14WeaponSniperHunting
           prob: 0.2
           orGroup: Weapon
-        - id: N14WeaponAntiMateriel
-          prob: 0.1
-          orGroup: Weapon
         - id: N14WeaponLeverCarbine
           prob: 0.1
           orGroup: Weapon

Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml

@@ -1,3 +1,4 @@
+#MARK: Lead
 - type: entity
   parent: IngotBase
   id: IngotLead
@@ -43,3 +44,50 @@
     state: ingot_lead
   - type: Stack
     count: 1
+
+#MARK: Aluminum
+- type: entity
+  parent: IngotBase
+  id: IngotAluminum
+  name: aluminum bar
+  suffix: Full
+  components:
+  - type: Material
+  - type: PhysicalComposition
+    materialComposition:
+      Aluminum: 100
+  - type: Stack
+    stackType: Aluminum
+    baseLayer: base
+    layerStates:
+    - ingot_aluminum
+    - ingot_aluminum
+    - ingot_aluminum
+  - type: Sprite
+    sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi
+    state: ingot_aluminum
+    layers:
+    - state: ingot_aluminum
+      map: ["base"]
+  - type: Item
+    heldPrefix: ingot_aluminum
+  - type: Appearance
+  - type: Extractable
+    grindableSolutionName: aluminum
+  - type: SolutionContainerManager
+    solutions:
+      aluminum:
+        reagents:
+        - ReagentId: Aluminium
+          Quantity: 10
+
+- type: entity
+  parent: IngotAluminum
+  id: IngotAluminum1
+  name: aluminum bar
+  suffix: Single
+  components:
+  - type: Sprite
+    state: ingot_aluminum
+  - type: Stack
+    count: 1

Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/tiles.yml

@@ -316,7 +316,7 @@
     heldPrefix: wood
   - type: FloorTile
     outputs:
-      - FloorAsteroidSand
+      - FloorWasteland
       - FloorWoodOak
   - type: Stack
     stackType: FloorTileWoodOak
@@ -335,7 +335,7 @@
     heldPrefix: wood
   - type: FloorTile
     outputs:
-      - FloorAsteroidSand
+      - FloorWasteland
       - FloorWoodHouse
   - type: Stack
     stackType: FloorTileWoodHouse
@@ -354,14 +354,78 @@
     heldPrefix: wood
   - type: FloorTile
     outputs:
-      - FloorAsteroidSand
+      - FloorWasteland
       - FloorWoodMaple
   - type: Stack
     stackType: FloorTileWoodMaple
 #  - type: Construction
 #    graph: TileWood
 #    node: woodtilelight
 
+- type: entity
+  name: industrial floor
+  parent: FloorTileItemBase
+  id: FloorTileItemMetalIndustrial
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - FloorWasteland
+      - FloorMS13MetalIndustrial
+  - type: Stack
+    stackType: FloorTileMetalIndustrial
+
+- type: entity
+  name: metal floor
+  parent: FloorTileItemBase
+  id: FloorTileItemMetalMS13
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - FloorWasteland
+      - FloorMS13MetalTile
+  - type: Stack
+    stackType: FloorTileMetalMS13
+
+- type: entity
+  name: metal grate floor
+  parent: FloorTileItemBase
+  id: FloorTileItemMetalGrate
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - FloorWasteland
+      - FloorMS13MetalGrate
+  - type: Stack
+    stackType: FloorTileMetalGrate
+
+- type: entity
+  name: metal solid floor
+  parent: FloorTileItemBase
+  id: FloorTileItemMetalSolid
+  components:
+  - type: Sprite
+    state: wood
+  - type: Item
+    heldPrefix: wood
+  - type: FloorTile
+    outputs:
+      - FloorWasteland
+      - FloorMS13MetalSolid
+  - type: Stack
+    stackType: FloorTileMetalSolid
+
 # Carpets
 
 - type: entity
@@ -375,7 +439,7 @@
     heldPrefix: wood
   - type: FloorTile
     outputs:
-      - FloorAsteroidSand
+      - FloorWasteland
       - FloorCarpetRed
   - type: Stack
     stackType: FloorTileCarpetRed

Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml

@@ -455,7 +455,9 @@
     items:
       - id: ClothingBeltNCRPouches
       - id: N14WeaponAntiMateriel
-      - id: MagazineBox50
+      - id: N14Magazine50AMR
+      - id: N14Magazine50AMR
+      - id: N14Magazine50AMR
       - id: MagazineBox50
       - id: N14Stimpak
       - id: N14Stimpak

Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml

@@ -402,14 +402,16 @@
     emptySpriteName: smellingsalts0
   - type: Hypospray
     solutionName: pen
-    transferAmount: 25
+    transferAmount: 10
   - type: SolutionContainerManager
     solutions:
       pen:
-        maxVol: 10
+        maxVol: 15
         reagents:
         - ReagentId: SmellingSalts
           Quantity: 10
+        - ReagentId: Epinephrine
+          Quantity: 5
 
 - type: entity
   parent: N14HealingPowder
@@ -478,7 +480,7 @@
   - type: SolutionContainerVisuals
     maxFillLevels: 1
     changeColor: false
-    emptySpriteName: ultrarstimpak0
+    emptySpriteName: ultrastimpak0
   - type: Hypospray
     solutionName: pen
     transferAmount: 25
@@ -489,3 +491,58 @@
         reagents:
         - ReagentId: UltraRobustHealingMixture
           Quantity: 25
+
+- type: entity
+  parent: N14HealingPowder
+  id: N14Traumapack
+  name: traumapack
+  description: A backpack filled with a blend of healing chemicals that inject automatically upon the wearer being hurt.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi
+    state: traumapack
+  - type: SolutionContainerManager
+    solutions:
+      food:
+        maxVol: 30
+        reagents:
+        - ReagentId: TraumaPowder
+          Quantity: 30
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 10
+      behaviors:
+      - !type:SpillBehavior
+        solution: food
+        transferForensics: true
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+
+- type: entity
+  parent: Gauze
+  id: N14Bandage
+  name: bandage
+  description: A long strip cloth which can stop bleeding. Mostly sterile.
+  components:
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi
+    state: bandage
+
+- type: entity
+  parent: DrinkBottleGlassBaseFull
+  id: N14Ethanol
+  name: ethanol bottle
+  description: A small brownish bottle containing ethanol. Great for disinfecting wounds.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      drink:
+        maxVol: 50
+        reagents:
+        - ReagentId: Ethanol
+          Quantity: 50
+  - type: Sprite
+    sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi
+    state: ethanol