diff --git a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml index 2b0fdfae6ce..99878bb9be0 100644 --- a/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml +++ b/Resources/Prototypes/Catalog/ReagentDispensers/chemical.yml @@ -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 diff --git a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml index 88dd3896b60..fea4c044dff 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/lathe.yml @@ -366,6 +366,7 @@ - JugBluespace # Frontier - VialBluespace # Frontier - Jug + - ReinforcedJug # Frontier - WeaponCrusher - WeaponCrusherDagger - WeaponCrusherGlaive @@ -1047,6 +1048,7 @@ - CryostasisBeaker - BluespaceBeaker - JugBluespace # Frontier + - ReinforcedJug # Frontier - SyringeBluespace - Jug - SyringeCryostasis diff --git a/Resources/Prototypes/Research/civilianservices.yml b/Resources/Prototypes/Research/civilianservices.yml index d1b7f7b216f..d720455fbac 100644 --- a/Resources/Prototypes/Research/civilianservices.yml +++ b/Resources/Prototypes/Research/civilianservices.yml @@ -179,6 +179,7 @@ - AdvMopItem - MegaSprayBottle - NFBlueprintAdvMopItem # Frontier + - ReinforcedJug # Frontier - type: technology id: HONKMech diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml index 7bb29f92987..2b73d185d74 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -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 @@ -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 diff --git a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml index 7476b47670f..7cf219f24fd 100644 --- a/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml +++ b/Resources/Prototypes/_NF/Recipes/Lathes/chemistry.yml @@ -28,3 +28,12 @@ materials: Plastic: 25 Steel: 25 + +- type: latheRecipe + id: ReinforcedJug + result: ReinforcedJug + completetime: 6 + materials: + Plastic: 400 + Steel: 100 + Silver: 25 diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png new file mode 100644 index 00000000000..98d7e529676 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/icon.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png new file mode 100644 index 00000000000..42945934ac4 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png new file mode 100644 index 00000000000..bf026b22d9f Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png new file mode 100644 index 00000000000..94830d652ad Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png new file mode 100644 index 00000000000..3df175a0854 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png new file mode 100644 index 00000000000..24725612014 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png new file mode 100644 index 00000000000..fc64c7dbf5e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png new file mode 100644 index 00000000000..c03542abbdf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png new file mode 100644 index 00000000000..8591a038470 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png new file mode 100644 index 00000000000..0e04b0a5dda Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png new file mode 100644 index 00000000000..2b5250278d2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png new file mode 100644 index 00000000000..a9ff0ca0fee Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png new file mode 100644 index 00000000000..1949d2ed13d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png new file mode 100644 index 00000000000..07a6e425f67 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png new file mode 100644 index 00000000000..a46ab2f42fc Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png new file mode 100644 index 00000000000..7b79098a02e Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png new file mode 100644 index 00000000000..cb3a0e490d5 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/jug6.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json new file mode 100644 index 00000000000..d7131a9aacb --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/meta.json @@ -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" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png new file mode 100644 index 00000000000..4aa48c39e5d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/reinforced_jug.rsi/stopper.png differ