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

Adds reinforced jug #2601

Merged
merged 14 commits into from
Jan 18, 2025
22 changes: 11 additions & 11 deletions Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@
id: ChemDispenserStandardInventory
inventory:
- JugAluminium
- JugCarbon
- JugChlorine
- ReinforcedJugCarbon # Frontier
- ReinforcedJugChlorine # Frontier
- JugCopper
- JugEthanol
- ReinforcedJugEthanol # Frontier
- JugFluorine
- JugSugar
- JugHydrogen
- ReinforcedJugSugar # Frontier
- ReinforcedJugHydrogen # Frontier
- JugIodine
- JugIron
- JugLithium
- ReinforcedJugLithium # Frontier
- JugMercury
- JugNitrogen
- JugOxygen
- JugPhosphorus
- JugPotassium
- ReinforcedJugNitrogen # Frontier
- ReinforcedJugOxygen # Frontier
- ReinforcedJugPhosphorus # Frontier
- ReinforcedJugPotassium # Frontier
- JugRadium
- JugSilicon
- ReinforcedJugSilicon # Frontier
- JugSodium
- JugSulfur

Expand Down
2 changes: 2 additions & 0 deletions Resources/Prototypes/Entities/Structures/Machines/lathe.yml
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,7 @@
- JugBluespace # Frontier
- VialBluespace # Frontier
- Jug
- ReinforcedJug # Frontier
- WeaponCrusher
- WeaponCrusherDagger
- WeaponCrusherGlaive
Expand Down Expand Up @@ -1010,6 +1011,7 @@
- CryostasisBeaker
- BluespaceBeaker
- JugBluespace # Frontier
- ReinforcedJug # Frontier
- SyringeBluespace
- Jug
- SyringeCryostasis
Expand Down
1 change: 1 addition & 0 deletions Resources/Prototypes/Research/civilianservices.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
- AdvMopItem
- MegaSprayBottle
- NFBlueprintAdvMopItem # Frontier
- ReinforcedJug # Frontier

- type: technology
id: HONKMech
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@
- type: entity
name: reinforced jug
parent: Jug
id: ReinforcedJug
description: The sterile plastic of this jug has been reinforced with a metallic shell allowing it to contain an impressive amount of liquid.
components:
- type: SolutionContainerVisuals
inHandsMaxFillLevels: 4
- type: SolutionContainerManager
solutions:
beaker:
maxVol: 400
- type: Sprite
sprite: _NF/Objects/Specific/Chemistry/reinforced_jug.rsi
layers:
- state: icon
- state: stopper
visible: true
map: ["enum.OpenableVisuals.Layer"]
- state: jug1
map: [ "enum.SolutionContainerLayers.Fill" ]
visible: false
- type: Item
size: Large
shape:
- 0,0,2,2
sprite: _NF/Objects/Specific/Chemistry/reinforced_jug.rsi
inhandVisuals:
left:
- state: inhand-left
- state: inhand-left-fill-1
map: [ "enum.SolutionContainerLayers.Fill" ]
visible: false
right:
- state: inhand-right
- state: inhand-right-fill-1
map: [ "enum.SolutionContainerLayers.Fill" ]
visible: false
- type: Openable
sound:
collection: bottleOpenSounds
closeable: true
closeSound:
collection: bottleCloseSounds
- type: StaticPrice
price: 30 # Consistent with BaseBeakerMetallic
- type: Destructible # Hacky - takes damage, but shouldn't be destructible
thresholds: []
- type: GenericVisualizer
visuals:
enum.OpenableVisuals.Opened:
enum.OpenableVisuals.Layer:
True: { visible: false }
False: { visible: true }

- type: entity
name: bluespace jug
parent: Jug
Expand Down Expand Up @@ -243,3 +298,170 @@
count: 1
- type: StaticPrice
vendPrice: 0

#Reinforced Jug chem fills.

- type: entity
parent: ReinforcedJug
suffix: carbon
id: ReinforcedJugCarbon
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-carbon
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Carbon
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: chlorine
id: ReinforcedJugChlorine
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-chlorine
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Chlorine
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: ethanol
id: ReinforcedJugEthanol
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-ethanol
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Ethanol
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: sugar
id: ReinforcedJugSugar
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-sugar
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Sugar
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: hydrogen
id: ReinforcedJugHydrogen
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-hydrogen
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Hydrogen
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: lithium
id: ReinforcedJugLithium
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-lithium
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Lithium
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: nitrogen
id: ReinforcedJugNitrogen
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-nitrogen
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Nitrogen
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: oxygen
id: ReinforcedJugOxygen
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-oxygen
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Oxygen
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: phosphorus
id: ReinforcedJugPhosphorus
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-phosphorus
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Phosphorus
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: potassium
id: ReinforcedJugPotassium
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-potassium
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Potassium
Quantity: 400

- type: entity
parent: ReinforcedJug
suffix: silicon
id: ReinforcedJugSilicon
categories: [ HideSpawnMenu ]
components:
- type: Label
currentLabel: reagent-name-potassium
- type: SolutionContainerManager
solutions:
beaker:
reagents:
- ReagentId: Silicon
Quantity: 400
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,12 @@
materials:
Plastic: 25
Steel: 25

- type: latheRecipe
id: ReinforcedJug
result: ReinforcedJug
completetime: 6
materials:
Plastic: 400
Steel: 100
Silver: 25
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.
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.
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,75 @@
{
"version": 1,
"license": "CC-BY-SA-3.0",
"copyright": "created by wallflowerghost (discord) edited by dustylens(github)",
"size": {
"x": 32,
"y": 32
},
"states": [
{
"name": "icon"
},
{
"name": "jug1"
},
{
"name": "jug2"
},
{
"name": "jug3"
},
{
"name": "jug4"
},
{
"name": "jug5"
},
{
"name": "jug6"
},
{
"name": "inhand-left",
"directions": 4
},
{
"name": "inhand-right",
"directions": 4
},
{
"name": "inhand-left-fill-1",
"directions": 4
},
{
"name": "inhand-left-fill-2",
"directions": 4
},
{
"name": "inhand-left-fill-3",
"directions": 4
},
{
"name": "inhand-left-fill-4",
"directions": 4
},
{
"name": "inhand-right-fill-1",
"directions": 4
},
{
"name": "inhand-right-fill-2",
"directions": 4
},
{
"name": "inhand-right-fill-3",
"directions": 4
},
{
"name": "inhand-right-fill-4",
"directions": 4
},
{
"name": "stopper"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading