Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Construction Bag #1487

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Resources/Locale/en-US/_NF/research/technologies.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions Resources/Prototypes/Entities/Objects/Materials/parts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@
name: metal rod
suffix: Full
components:
- type: Tag # Frontier
tags: # Frontier
- RodMetal # Frontier
dvir001 marked this conversation as resolved.
Show resolved Hide resolved
- type: PhysicalComposition
materialComposition:
Steel: 50 #Half of a regular steel sheet to reflect the crafting recipe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -375,6 +375,7 @@
- ClothingOuterHardsuitMaximPrototype # Frontier
- ClothingHeadHelmetAncient # Frontier
- ClothingOuterHardsuitAncientEVA # Frontier
- ConstructionBagOfHolding # Frontier
- type: EmagLatheRecipes
emagDynamicRecipes:
- ExplosivePayload
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -324,7 +324,5 @@
- Glass
- Plastic
- Steel
# Frontier Start
- Gold
- Silver
# Frontier End
- Gold # Frontier
- Silver # Frontier
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
- 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
- RawMaterial
- RodMetal
- RodMetal1
- Sheet
- 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
shader: unshaded
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great with the blue bit unshaded, but it seems strange that the wires are unshaded. The ore bag is also weirdly inconsistent, both the wires and middle are unshaded.
image

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed this one

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

- type: Item
size: Ginormous
inhandVisuals:
left:
- state: inhand-left
- state: inhand-left-bluespace-overlay
shader: unshaded
right:
- state: inhand-right
- state: inhand-right-bluespace-overlay
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
shader: unshaded
- type: Storage
grid:
- 0,0,19,9
10 changes: 10 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/devices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,12 @@
materials:
Steel: 500
Cloth: 500

- type: latheRecipe
id: ConstructionBag
result: ConstructionBag
completetime: 1
category: Tools
materials:
Steel: 500
Cloth: 500
13 changes: 13 additions & 0 deletions Resources/Prototypes/_NF/Research/industrial.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
# 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:
- ConstructionBag
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Technically, the ConstructionBag recipe isn't used in the protolathe, and isn't unlocked by this in the engineering techfab since it's a static recipe. I think it could be removed from this list.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure, can do

- ConstructionBagOfHolding

- type: technology
id: HardsuitsBasic
name: research-technology-hardsuits-basic
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/tags.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@

- type: Tag
id: SpeedLoaderRifleHeavy

- type: Tag
id: RodMetal
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "Original ore bag sprites homegrown by @ninruB#7795, inhand sprites by лазік#7305; resprited in engineering department colors by erhardsteinhauer (discord/github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "equipped-BELT",
"directions": 4
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "icon-bluespace-overlay",
"delays":
[
[ 0.1, 0.1, 0.1, 0.1, 0.1 ]
]
},
{
"name": "equipped-BELT-bluespace-overlay",
"directions": 4,
"delays":
[
[ 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1 ]
]
},
{
"name": "inhand-left-bluespace-overlay",
"directions": 4,
"delays":
[
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
]
},
{
"name": "inhand-right-bluespace-overlay",
"directions": 4,
"delays":
[
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ],
[ 0.1, 0.1, 0.1, 0.1, 0.1, 0.1, 0.1 ]
]
}
]
}
Loading