Construction Bag (new-frontiers-14#1487)

* initial commit * Un Tag * fixes * no tickets * research thingy * inflatable walls, shared.comp --------- Co-authored-by: Dvir <[email protected]>
blueDev2 · Jun 11, 2024 · 3d61b18 · 3d61b18
1 parent df97e8b
commit 3d61b18
Show file tree

Hide file tree

Showing 28 changed files with 276 additions and 27 deletions.
diff --git a/Content.Shared/_NF/Materials/Components/ConstructionMaterialsComponent.cs b/Content.Shared/_NF/Materials/Components/ConstructionMaterialsComponent.cs
@@ -0,0 +1,7 @@
+namespace Content.Server.Materials.Components;
+
+[RegisterComponent]
+public sealed partial class ConstructionMaterialsComponent : Component
+{
+
+}
diff --git a/Resources/Locale/en-US/_NF/research/technologies.ftl b/Resources/Locale/en-US/_NF/research/technologies.ftl
@@ -6,4 +6,5 @@ research-technology-hardsuits-advanced = Advanced Hardsuits
 research-technology-hardsuits-experimental-industrial = Experimental Salvager Hardsuit
 research-technology-hardsuits-armored = Armored Hardsuits
 research-technology-hardsuits-armored-advanced = Advanced Armored Hardsuits
-research-technology-hardsuits-experimental-rd = Experimental Research Hardsuit
+research-technology-hardsuits-experimental-rd = Experimental Research Hardsuit
+research-technology-construction-bags = Construction Bags
diff --git a/Resources/Prototypes/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/Entities/Objects/Materials/materials.yml
@@ -82,6 +82,7 @@
   name: cloth
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: Healing
     damageContainers:
       - Biological
@@ -161,6 +162,7 @@
   name: durathread
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: Stack
     stackType: Durathread
     baseLayer: base
@@ -219,6 +221,7 @@
   name: wood
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: Material
   - type: PhysicalComposition
     materialComposition:
@@ -485,6 +488,7 @@
   name: bananium
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: Material
   - type: PhysicalComposition
     materialComposition:
@@ -546,6 +550,7 @@
   description: A webby material.
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: PhysicalComposition
     materialComposition:
       WebSilk: 100
@@ -602,6 +607,7 @@
   name: bones
   suffix: Full
   components:
+  - type: ConstructionMaterials # Frontier
   - type: Material # Frontier
   - type: PhysicalComposition # Frontier
     materialComposition: # Frontier

diff --git a/Resources/Prototypes/Entities/Objects/Materials/parts.yml b/Resources/Prototypes/Entities/Objects/Materials/parts.yml
@@ -68,6 +68,7 @@
           Quantity: 4.5
         - ReagentId: Carbon
           Quantity: 0.5
+  - type: ConstructionMaterials # Frontier
 
 - type: entity
   parent: PartRodMetal

diff --git a/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml b/Resources/Prototypes/Entities/Objects/Tools/inflatable_wall.yml
@@ -5,6 +5,7 @@
   description: A folded membrane which rapidly expands into a large cubical shape on activation.
   suffix: Full
   components:
+    - type: ConstructionMaterials # Frontier
     - type: Stack
       stackType: InflatableWall
       count: 10
@@ -33,6 +34,7 @@
   description: A folded membrane which rapidly expands into a large cubical shape on activation.
   suffix: Full
   components:
+    - type: ConstructionMaterials # Frontier
     - type: Stack
       stackType: InflatableDoor
       count: 4

diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml
@@ -376,6 +376,7 @@
       - ClothingOuterHardsuitMaximPrototype # Frontier
       - ClothingHeadHelmetAncient # Frontier
       - ClothingOuterHardsuitAncientEVA # Frontier
+      - ConstructionBagOfHolding # Frontier
   - type: EmagLatheRecipes
     emagDynamicRecipes:
       - ExplosivePayload

diff --git a/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Nyanotrasen/Entities/Structures/Machines/lathe.yml
@@ -245,23 +245,24 @@
       - WeaponCapacitorRechargerCircuitboard
       - Durathread
       - Plasteel
-      - ClothingOuterSuitEmergency
-      - ClothingHeadHelmetEVA
-      - ClothingHeadHelmetEVALarge
-      - ClothingOuterHardsuitEVA
+      - ClothingOuterSuitEmergency # Frontier
+      - ClothingHeadHelmetEVA # Frontier
+      - ClothingHeadHelmetEVALarge # Frontier
+      - ClothingOuterHardsuitEVA # Frontier
       # Engi fab has shuttle power and tech at base
-      - SolarControlComputerCircuitboard
-      - SolarTrackerElectronics
-      - ShuttleConsoleCircuitboard
-      - PortableGeneratorPacmanMachineCircuitboard
-      - PortableGeneratorSuperPacmanMachineCircuitboard
-      - PortableGeneratorJrPacmanMachineCircuitboard
-      - ThrusterMachineCircuitboard
-      - GyroscopeMachineCircuitboard
-      - MiniGravityGeneratorCircuitboard
+      - SolarControlComputerCircuitboard # Frontier
+      - SolarTrackerElectronics # Frontier
+      - ShuttleConsoleCircuitboard # Frontier
+      - PortableGeneratorPacmanMachineCircuitboard # Frontier
+      - PortableGeneratorSuperPacmanMachineCircuitboard # Frontier
+      - PortableGeneratorJrPacmanMachineCircuitboard # Frontier
+      - ThrusterMachineCircuitboard # Frontier
+      - GyroscopeMachineCircuitboard # Frontier
+      - MiniGravityGeneratorCircuitboard # Frontier
+      - ConstructionBag # Frontier
       - SmallThrusterMachineCircuitboard # Frontier
       - SmallGyroscopeMachineCircuitboard # Frontier
-      - WallmountSubstationElectronics
+      - WallmountSubstationElectronics # Frontier
     # Frontier end
     dynamicRecipes:
       - Flash
@@ -306,14 +307,13 @@
       - CableStack
       - CableMVStack
       - CableHVStack
-      # Frontier Start
-      - ClothingOuterHardsuitBasic
-      - ClothingOuterHardsuitAtmos
-      - ClothingOuterHardsuitEngineering
-      - ClothingOuterHardsuitEngineeringWhite
-      - ClothingHeadHelmetAncient
-      - ClothingOuterHardsuitAncientEVA
-      # Frontier end
+      - ClothingOuterHardsuitBasic # Frontier
+      - ClothingOuterHardsuitAtmos # Frontier
+      - ClothingOuterHardsuitEngineering # Frontier
+      - ClothingOuterHardsuitEngineeringWhite # Frontier
+      - ClothingHeadHelmetAncient # Frontier
+      - ClothingOuterHardsuitAncientEVA # Frontier
+      - ConstructionBagOfHolding # Frontier
   - type: MaterialStorage
     whitelist:
       tags:
@@ -324,7 +324,5 @@
     - Glass
     - Plastic
     - Steel
-    # Frontier Start
-    - Gold
-    - Silver
-    # Frontier End
+    - Gold # Frontier
+    - Silver # Frontier
diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Engineering/construction_bag.yml
@@ -0,0 +1,80 @@
+- type: entity
+  parent: BaseStorageItem
+  id: ConstructionBag
+  name: construction bag
+  description: A robust bag for construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt.
+  components:
+  - type: MagnetPickup
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    state: icon
+  - type: Clothing
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+  - type: Item
+    size: Ginormous
+  - type: Storage
+    maxItemSize: Normal
+    grid:
+    - 0,0,9,3
+    quickInsert: true
+    areaInsert: true
+    whitelist:
+      tags:
+      - Ingot
+      - RodMetal1
+      - Sheet
+      - CableCoil
+      components:
+      - ConstructionMaterials
+    blacklist:
+      tags:
+      - PrizeTicket
+  - type: Dumpable
+  - type: StaticPrice
+    price: 55.5
+
+- type: entity
+  parent: ConstructionBag
+  id: ConstructionBagOfHolding
+  name: construction bag of holding
+  description: A robust bag of holding for rich construction specialists and engineers alike to carry large amounts of construction materials. Magnetises any nearby construction materials when attached to a belt.
+  components:
+  - type: MagnetPickup
+    range: 2
+  - type: Sprite
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    layers:
+    - state: icon
+    - state: icon-bluespace-overlay
+    - state: icon-bluespace-overlay-unshaded
+      shader: unshaded
+  - type: Item
+    size: Ginormous
+    inhandVisuals:
+      left:
+      - state: inhand-left
+      - state: inhand-left-bluespace-overlay
+      - state: inhand-left-bluespace-overlay-unshaded
+        shader: unshaded
+      right:
+      - state: inhand-right
+      - state: inhand-right-bluespace-overlay
+      - state: inhand-right-bluespace-overlay-unshaded
+        shader: unshaded
+  - type: Clothing
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    quickEquip: false
+    slots:
+    - belt
+    clothingVisuals:
+      belt:
+      - state: equipped-BELT
+      - state: equipped-BELT-bluespace-overlay
+      - state: equipped-BELT-bluespace-overlay-unshaded
+        shader: unshaded
+  - type: Storage
+    grid:
+    - 0,0,19,9
diff --git a/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml b/Resources/Prototypes/_NF/Loadouts/Jobs/Contractor/belt.yml
@@ -280,6 +280,19 @@
   equipment:
     belt: PlantBag
 
+- type: loadout
+  id: ContractorConstructionBag
+  equipment: ContractorConstructionBag
+  effects:
+  - !type:GroupLoadoutEffect
+    proto: ContractorT1
+  price: 750
+
+- type: startingGear
+  id: ContractorConstructionBag
+  equipment:
+    belt: ConstructionBag
+
 #T2
 - type: loadout
   id: ContractorClothingBeltMartialBlack

diff --git a/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/contractor_loadout_groups.yml
@@ -331,6 +331,7 @@
   - ContractorChemBag
   - ContractorOreBag
   - ContractorPlantBag
+  - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
   - ContractorClothingBeltChampion
 

diff --git a/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/mercenary_loadout_groups.yml
@@ -649,5 +649,6 @@
   - ContractorChemBag
   - ContractorOreBag
   - ContractorPlantBag
+  - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
   - ContractorClothingBeltChampion
diff --git a/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml b/Resources/Prototypes/_NF/Loadouts/pilot_loadout_groups.yml
@@ -626,5 +626,6 @@
   - ContractorChemBag
   - ContractorOreBag
   - ContractorPlantBag
+  - ContractorConstructionBag
   - ContractorClothingBeltMartialBlack
   - ContractorClothingBeltChampion
diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml b/Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
@@ -8,6 +8,16 @@
     Plasma: 1500
     Uranium: 150
 
+- type: latheRecipe
+  id: ConstructionBagOfHolding
+  result: ConstructionBagOfHolding
+  completetime: 5
+  materials:
+    Steel: 2000
+    Silver: 750
+    Plasma: 1500
+    Uranium: 150
+
 - type: latheRecipe
   id: WeaponCrusher
   result: WeaponCrusher

diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml b/Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
@@ -97,3 +97,12 @@
   materials:
     Steel: 500
     Cloth: 500
+
+- type: latheRecipe
+  id: ConstructionBag
+  result: ConstructionBag
+  completetime: 1
+  category: Tools
+  materials:
+    Steel: 500
+    Cloth: 500
diff --git a/Resources/Prototypes/_NF/Research/industrial.yml b/Resources/Prototypes/_NF/Research/industrial.yml
@@ -1,5 +1,17 @@
 # Tier 1
 
+- type: technology
+  id: ConstructionBags
+  name: research-technology-construction-bags
+  icon:
+    sprite: _NF/Objects/Specific/Engineering/construction_bag.rsi
+    state: icon
+  discipline: Industrial
+  tier: 1
+  cost: 5000
+  recipeUnlocks:
+  - ConstructionBagOfHolding
+
 - type: technology
   id: HardsuitsBasic
   name: research-technology-hardsuits-basic

diff --git a/...c/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png b/...c/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay-unshaded.png
diff --git a/...s/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png b/...s/Specific/Engineering/construction_bag.rsi/equipped-BELT-bluespace-overlay.png
diff --git a/...extures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png b/...extures/_NF/Objects/Specific/Engineering/construction_bag.rsi/equipped-BELT.png
diff --git a/...s/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png b/...s/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay-unshaded.png
diff --git a/...NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png b/...NF/Objects/Specific/Engineering/construction_bag.rsi/icon-bluespace-overlay.png
diff --git a/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/icon.png
diff --git a/...fic/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png b/...fic/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay-unshaded.png
diff --git a/...cts/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png b/...cts/Specific/Engineering/construction_bag.rsi/inhand-left-bluespace-overlay.png
diff --git a/.../Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png b/.../Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-left.png
diff --git a/...ic/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png b/...ic/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay-unshaded.png
diff --git a/...ts/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png b/...ts/Specific/Engineering/construction_bag.rsi/inhand-right-bluespace-overlay.png
diff --git a/...Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png b/...Textures/_NF/Objects/Specific/Engineering/construction_bag.rsi/inhand-right.png