diff --git a/Content.Client/Tools/UI/WelderStatusControl.cs b/Content.Client/Tools/UI/WelderStatusControl.cs index de56286641b..f3b6b3d62cc 100644 --- a/Content.Client/Tools/UI/WelderStatusControl.cs +++ b/Content.Client/Tools/UI/WelderStatusControl.cs @@ -29,11 +29,22 @@ public sealed class WelderStatusControl : PollingItemStatusControl [DataField, AutoNetworkedField] - public ProtoId QualityNeeded = "Welding"; + public ProtoId QualityNeeded = "Applicating"; // Monolith - Nanite Applicator /// /// The base tool use delay (seconds). This will be modified by the tool's quality diff --git a/Content.Shared/Repairable/RepairableSystem.cs b/Content.Shared/Repairable/RepairableSystem.cs index bbb4b40b2fc..feec9edad21 100644 --- a/Content.Shared/Repairable/RepairableSystem.cs +++ b/Content.Shared/Repairable/RepairableSystem.cs @@ -5,6 +5,7 @@ using Content.Shared.Database; using Content.Shared.DoAfter; using Content.Shared.Interaction; using Content.Shared.Popups; +using Content.Shared.Tools.Components; // Monolith - Nanite Applicators using Content.Shared.Tools.Systems; using Robust.Shared.Serialization; @@ -115,8 +116,26 @@ public sealed partial class RepairableSystem : EntitySystem delay *= ent.Comp.SelfRepairPenalty; } + // BEGIN DeltaV - Scale Repair Time with Damage + // If its a self-repair, ignore it since they've already been penalized. + if (args.User != args.Target && TryComp(args.Target, out var damageComp)) + { + // TODO: Scale with the destructible threshold if DestructibleSystem ever gets more prediction added. + // For now, just scale up the delay per 100 damage, or reduce the delay if its less. + var totalDamage = _damageableSystem.GetPositiveDamage((args.Target, damageComp)).GetTotal(); + delay *= Math.Clamp((float)totalDamage / 100.0f, 0.5f, 3.0f); + } + // END DeltaV + + // BEGIN Monolith - Nanite Applicators + if (!TryComp(args.Used, out var tool)) + return; + // END Monolith + // Run the repairing doafter args.Handled = _toolSystem.UseTool(args.Used, args.User, ent.Owner, delay, ent.Comp.QualityNeeded, new RepairDoAfterEvent(), ent.Comp.FuelCost); + + } } diff --git a/Content.Shared/Tools/Components/WelderComponent.cs b/Content.Shared/Tools/Components/WelderComponent.cs index a9111c7f534..aa22fb36a1b 100644 --- a/Content.Shared/Tools/Components/WelderComponent.cs +++ b/Content.Shared/Tools/Components/WelderComponent.cs @@ -73,4 +73,10 @@ public sealed partial class WelderComponent : Component /// [DataField] public bool TankSafe; + + /// + /// Monolith - This variable gets rid of the status display. + /// + [DataField] + public bool OnlyDisplayFuel = false; } diff --git a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs index 3d28979fd3a..31434127b81 100644 --- a/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs +++ b/Content.Shared/Tools/Systems/SharedToolSystem.Welder.cs @@ -84,19 +84,33 @@ public abstract partial class SharedToolSystem { using (args.PushGroup(nameof(WelderComponent))) { - if (ItemToggle.IsActivated(entity.Owner)) + // BEGIN Monolith - Nanite Applicators + if (!entity.Comp.OnlyDisplayFuel) { - args.PushMarkup(Loc.GetString("welder-component-on-examine-welder-lit-message")); - } - else - { - args.PushMarkup(Loc.GetString("welder-component-on-examine-welder-not-lit-message")); + var lit = Loc.GetString("welder-component-on-examine-welder-not-lit-message"); + + if (ItemToggle.IsActivated(entity.Owner)) + lit = Loc.GetString("welder-component-on-examine-welder-lit-message"); + + args.PushMarkup(lit); } + // END Monolith if (args.IsInDetailsRange) { var (fuel, capacity) = GetWelderFuelAndCapacity(entity.Owner, entity.Comp); + // BEGIN Monolith - Nanite Applicator + if (entity.Comp.OnlyDisplayFuel) + { + args.PushMarkup(Loc.GetString("welder-component-on-examine-less-detailed-message", + ("colorName", fuel < capacity / FixedPoint2.New(4f) ? "darkorange" : "orange"), + ("fuelLeft", fuel), + ("fuelCapacity", capacity))); + return; + } + // END Monolith + args.PushMarkup(Loc.GetString("welder-component-on-examine-detailed-message", ("colorName", fuel < capacity / FixedPoint2.New(4f) ? "darkorange" : "orange"), ("fuelLeft", fuel), @@ -120,6 +134,19 @@ public abstract partial class SharedToolSystem && _whitelist.IsWhitelistPass(tank.FuelWhitelist, entity.Owner) //imp && SolutionContainerSystem.TryGetSolution(entity.Owner, entity.Comp.FuelSolutionName, out var solutionComp, out var welderSolution)) { + // BEGIN Monolith - Nanite Applicators + foreach (var reagent in targetSolution.Contents) + { + if (reagent.Reagent.Prototype != entity.Comp.FuelReagent.Id) + { + _popup.PopupClient( + Loc.GetString("welder-component-incompatible-fuel", ("owner", args.Target)), entity, args.User); + + return; + } + } + // END Monolith + var trans = FixedPoint2.Min(welderSolution.AvailableVolume, targetSolution.Volume); if (trans > 0) { diff --git a/Resources/Locale/en-US/_DV/damage-examine/structures.ftl b/Resources/Locale/en-US/_DV/damage-examine/structures.ftl new file mode 100644 index 00000000000..6a0ff954327 --- /dev/null +++ b/Resources/Locale/en-US/_DV/damage-examine/structures.ftl @@ -0,0 +1,7 @@ +# Base structure damage examine values +comp-structure-damaged-1 = It looks fully intact. +comp-structure-damaged-2 = It has a few scratches. +comp-structure-damaged-3 = It has a few large dents. +comp-structure-damaged-4 = [color=yellow]It has several big cracks running along its surface.[/color] +comp-structure-damaged-5 = [color=orange]It has deep cracks across multiple layers.[/color] +comp-structure-damaged-6 = [color=red]It's extremely damaged and on the verge of falling apart.[/color] diff --git a/Resources/Locale/en-US/_Mono/reagents/technological.ftl b/Resources/Locale/en-US/_Mono/reagents/technological.ftl new file mode 100644 index 00000000000..cc41197ebc7 --- /dev/null +++ b/Resources/Locale/en-US/_Mono/reagents/technological.ftl @@ -0,0 +1,2 @@ +reagent-name-nanite-fuel = Nanites +reagent-desc-nanite-fuel = Nanobots used for repairing. diff --git a/Resources/Locale/en-US/_Mono/store/pirate-uplink-catalog.ftl b/Resources/Locale/en-US/_Mono/store/pirate-uplink-catalog.ftl new file mode 100644 index 00000000000..cb2806011d9 --- /dev/null +++ b/Resources/Locale/en-US/_Mono/store/pirate-uplink-catalog.ftl @@ -0,0 +1,4 @@ +# MARK: Utility + +uplink-syndicate-applicator-name = Advanced Nanite Applicator +uplink-syndicate-applicator-desc = Advanced nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation. diff --git a/Resources/Locale/en-US/_Mono/tools/components/welder-component.ftl b/Resources/Locale/en-US/_Mono/tools/components/welder-component.ftl new file mode 100644 index 00000000000..f44db8d965f --- /dev/null +++ b/Resources/Locale/en-US/_Mono/tools/components/welder-component.ftl @@ -0,0 +1,2 @@ +welder-component-on-examine-less-detailed-message = Fuel: [color={$colorName}]{$fuelLeft}/{$fuelCapacity}[/color] +welder-component-incompatible-fuel = { $owner } contains incorrect or contaminated fuel! \ No newline at end of file diff --git a/Resources/Locale/en-US/_Mono/tools/tool-qualities.ftl b/Resources/Locale/en-US/_Mono/tools/tool-qualities.ftl new file mode 100644 index 00000000000..43b1efe77bd --- /dev/null +++ b/Resources/Locale/en-US/_Mono/tools/tool-qualities.ftl @@ -0,0 +1,2 @@ +tool-quality-nanite-applicator-name = Nanite Applicator +tool-quality-applicating-name = Nanite Applicating diff --git a/Resources/Prototypes/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/Catalog/Fills/Items/belt.yml index cc52531d243..7802d50ae02 100644 --- a/Resources/Prototypes/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/Catalog/Fills/Items/belt.yml @@ -46,6 +46,7 @@ - id: HolofanProjector - id: GasAnalyzer - id: trayScanner + - id: NaniteApplicatorExperimental # DeltaV - Nanite Applicators - type: entityTable id: BeltSecurityEntityTable diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml index 33bcea0ab24..4b7ee44819b 100644 --- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml +++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml @@ -8,6 +8,9 @@ CrowbarYellow: 8 Multitool: 4 NetworkConfigurator: 5 + NaniteApplicator: 4 # Monolith - Nanite Applicator + JerryCanWeldingFuel: 2 # New Frontier - Jerry Cans + JerryCanNaniteFuel: 2 # Monolith - Nanite Applicator PowerCellMedium: 5 ClothingHandsGlovesColorYellow: 6 MetalFoamGrenade: 3 # DeltaV - added diff --git a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml index 29ec9338ca6..f090d307aa1 100644 --- a/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml +++ b/Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml @@ -118,6 +118,7 @@ damageValue: -10 # 10 seconds to repair from crit doAfterDelay: 1 fuelCost: 0.5 + qualityNeeded: Welding # DeltaV - for now allowSelfRepair: true # DeltaV - was false - type: BorgChassis - type: LockingWhitelist diff --git a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml index 23d8cef58ab..9ef377d681a 100644 --- a/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml +++ b/Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml @@ -20,6 +20,7 @@ damageValue: -15 # 8 seconds to repair from dead doAfterDelay: 1 fuelCost: 0.5 + qualityNeeded: Welding # DeltaV - for now - type: Pullable - type: Tag tags: diff --git a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml index f5897fd2c9d..2419f2b9454 100644 --- a/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml +++ b/Resources/Prototypes/Entities/Mobs/Player/mothershipcore.yml @@ -82,6 +82,7 @@ temperature: 373.15 - type: Repairable doAfterDelay: 30 # you can heal the mothership core, but it takes a while + qualityNeeded: Welding # DeltaV - type: DamagedSiliconAccent enableChargeCorruption: false # TODO: make it explosive again once until issue https://github.com/space-wizards/space-station-14/issues/40606 is fixed diff --git a/Resources/Prototypes/Entities/Objects/Shields/shields.yml b/Resources/Prototypes/Entities/Objects/Shields/shields.yml index 4e7698ecca8..3a9c85f7357 100644 --- a/Resources/Prototypes/Entities/Objects/Shields/shields.yml +++ b/Resources/Prototypes/Entities/Objects/Shields/shields.yml @@ -89,7 +89,7 @@ fuelCost: 10 # 1/2 of a Welder for a full repair doAfterDelay: 5 allowSelfRepair: false - + qualityNeeded: Welding # DeltaV #Security Shields - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml index f725e329cd6..088b3da7c2e 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml @@ -583,6 +583,7 @@ - item: Screwdriver - item: Wirecutter - item: WelderIndustrial + - item: NaniteApplicator # Monolith - item: Multitool - type: BorgModuleIcon icon: { sprite: Interface/Actions/actions_borg.rsi, state: tool-module } @@ -711,6 +712,7 @@ - item: PowerDrill - item: WelderExperimental - item: Multitool + - item: NaniteApplicatorExperimental # Monolith - item: RemoteSignallerAdvanced - item: NFWeaponHoloflareGun # DeltaV - type: BorgModuleIcon diff --git a/Resources/Prototypes/Entities/Objects/Tools/welders.yml b/Resources/Prototypes/Entities/Objects/Tools/welders.yml index 4c0c550c5e9..707cd34597e 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/welders.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/welders.yml @@ -162,8 +162,8 @@ Welder: reagents: - ReagentId: WeldingFuel - Quantity: 1000 - maxVol: 1000 + Quantity: 200 # DeltaV - Experimental Welder Nerf + maxVol: 200 # DeltaV - Experimental Welder Nerf - type: PointLight enabled: false radius: 1.5 @@ -174,6 +174,7 @@ reagents: - ReagentId: WeldingFuel Quantity: 1 + duration: 2 # DeltaV - Experimental Welder Nerf - Loses fuel while active - type: RequiresEyeProtection statusEffectTime: 5 # less harmful; sunglasses can block it diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml index f2cdbab4962..3af5219c472 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Turrets/turrets_ballistic.yml @@ -45,7 +45,7 @@ graph: WeaponTurretSyndicateDisposable node: disposableTurret - type: Repairable - qualityNeeded: "Anchoring" + qualityNeeded: Anchoring doAfterDelay: 3 - type: TriggerOnEmptyGunshot - type: ExplodeOnTrigger diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml index e7f6082734e..14a92e30265 100644 --- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml +++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/coil.yml @@ -84,6 +84,7 @@ - type: ExaminableDamage messages: WindowMessages - type: Repairable + qualityNeeded: Welding # DeltaV - type: DamageVisuals thresholds: [8, 16, 25] damageDivisor: 3.333 @@ -177,6 +178,7 @@ - type: ExaminableDamage messages: WindowMessages - type: Repairable + qualityNeeded: Welding # DeltaV - type: Damageable damageContainer: StructuralInorganic - type: DamageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml index f1ce706847f..717bbc11d52 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/glass_box.yml @@ -61,6 +61,7 @@ - type: Repairable fuelCost: 15 doAfterDelay: 5 + qualityNeeded: Welding # DeltaV - type: Lock - type: LockVisuals - type: DamageVisuals diff --git a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml index 3eb6239efb8..f82c9122eaf 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/clockwork.yml @@ -12,6 +12,7 @@ - type: Repairable fuelCost: 10 doAfterDelay: 2 + qualityNeeded: Welding # DeltaV - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass diff --git a/Resources/Prototypes/Entities/Structures/Windows/mining.yml b/Resources/Prototypes/Entities/Structures/Windows/mining.yml index 583a376e2fc..88dc5026726 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/mining.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/mining.yml @@ -11,6 +11,7 @@ - type: Repairable fuelCost: 15 doAfterDelay: 3 + qualityNeeded: Welding # DeltaV - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass diff --git a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml index 295e9d59cea..c31b78a7153 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/plastitanium.yml @@ -120,6 +120,7 @@ - type: Repairable fuelCost: 15 doAfterDelay: 3 + qualityNeeded: Welding - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass @@ -215,6 +216,7 @@ - type: Repairable fuelCost: 15 doAfterDelay: 3 + qualityNeeded: Welding - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass diff --git a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml index 6fc24e80048..7c83487c491 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/reinforced.yml @@ -11,6 +11,7 @@ - type: Repairable fuelCost: 10 doAfterDelay: 2 + qualityNeeded: Welding # DeltaV - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass diff --git a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml index 6c0293a5bc0..ac461353ab4 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/shuttle.yml @@ -11,6 +11,7 @@ - type: Repairable fuelCost: 15 doAfterDelay: 3 + qualityNeeded: Welding # DeltaV - type: Damageable damageContainer: StructuralInorganic damageModifierSet: RGlass diff --git a/Resources/Prototypes/Entities/Structures/Windows/window.yml b/Resources/Prototypes/Entities/Structures/Windows/window.yml index 00ff39d766e..1099a7985c2 100644 --- a/Resources/Prototypes/Entities/Structures/Windows/window.yml +++ b/Resources/Prototypes/Entities/Structures/Windows/window.yml @@ -45,6 +45,8 @@ - type: ExaminableDamage messages: WindowMessages - type: Repairable + doAfterDelay: 2 # DeltaV + qualityNeeded: Welding - type: RCDDeconstructable cost: 6 delay: 4 @@ -171,6 +173,8 @@ layer: - GlassLayer - type: Repairable + doAfterDelay: 2 # DeltaV + qualityNeeded: Welding - type: Damageable damageContainer: StructuralInorganic damageModifierSet: Glass diff --git a/Resources/Prototypes/Entities/Structures/base_structure.yml b/Resources/Prototypes/Entities/Structures/base_structure.yml index 99c5c62b4ea..8d90847aa6b 100644 --- a/Resources/Prototypes/Entities/Structures/base_structure.yml +++ b/Resources/Prototypes/Entities/Structures/base_structure.yml @@ -26,6 +26,11 @@ - type: Tag tags: - Structure + - type: ExaminableDamage # DeltaV + messages: BaseStructureMessages + - type: Repairable # Monolith - Nanite Applicator + doAfterDelay: 3 + qualityNeeded: Applicating - type: entity # This means that it's not anchored on spawn. diff --git a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml index e9eb17ad16f..b0bd3954445 100644 --- a/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/Recipes/Lathes/Packs/engineering.yml @@ -63,6 +63,7 @@ - WelderExperimental - JawsOfLife - TrayGoggles # DeltaV + - ExperimentalNaniteApplicator # Monolith #- Fulton # DeltaV - moved to MiningDeltaV #- FultonBeacon # DeltaV - moved to MiningDeltaV diff --git a/Resources/Prototypes/Research/industrial.yml b/Resources/Prototypes/Research/industrial.yml index f1cea326102..5ef9738b8f7 100644 --- a/Resources/Prototypes/Research/industrial.yml +++ b/Resources/Prototypes/Research/industrial.yml @@ -184,6 +184,7 @@ - JawsOfLife - BorgModuleAdvancedTool - TrayGoggles # DeltaV + - ExperimentalNaniteApplicator # Monolith #- Fulton # DeltaV - seperate tech Aerial Extraction #- FultonBeacon # DeltaV - seperate tech Aerial Extraction diff --git a/Resources/Prototypes/_DV/Damage/examine_messages.yml b/Resources/Prototypes/_DV/Damage/examine_messages.yml new file mode 100644 index 00000000000..49c55e5a37b --- /dev/null +++ b/Resources/Prototypes/_DV/Damage/examine_messages.yml @@ -0,0 +1,5 @@ +- type: localizedDataset + id: BaseStructureMessages + values: + prefix: comp-structure-damaged- + count: 6 diff --git a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml index 38a01ce0713..3c8f40273e8 100644 --- a/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml +++ b/Resources/Prototypes/_DV/Entities/Structures/Machines/lathe.yml @@ -13,6 +13,7 @@ - BorgModulesStatic - BorgLimbsStatic - BorgModulesResearched + - RoboticsEmagStatic - type: Machine board: SyndieExosuitFabricatorMachineCircuitboard diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml index 8b86cefae7c..cece03e392d 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/engineering.yml @@ -5,6 +5,7 @@ recipes: - HolotapeProjector - SheetPlasteel1Engineering + - NaniteApplicator ## Dynamic diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml index fed599a1565..79b6a0d30d0 100644 --- a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/robotics.yml @@ -1,10 +1,5 @@ ## Static -- type: latheRecipePack - id: RoboticsEmagStatic - recipes: - - IdChipSyndie - - type: latheRecipePack id: BorgModulesSyndicateStatic recipes: diff --git a/Resources/Prototypes/_DV/Recipes/Lathes/Packs/syndicate.yml b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/syndicate.yml new file mode 100644 index 00000000000..38f202f1926 --- /dev/null +++ b/Resources/Prototypes/_DV/Recipes/Lathes/Packs/syndicate.yml @@ -0,0 +1,5 @@ +- type: latheRecipePack + id: RoboticsEmagStatic + recipes: + - IdChipSyndie + - NaniteApplicatorSyndicate diff --git a/Resources/Prototypes/_DV/Roles/Jobs/CentComm/EmergencyResponseTeam.yml b/Resources/Prototypes/_DV/Roles/Jobs/CentComm/EmergencyResponseTeam.yml index 16f183684db..119144b2abf 100644 --- a/Resources/Prototypes/_DV/Roles/Jobs/CentComm/EmergencyResponseTeam.yml +++ b/Resources/Prototypes/_DV/Roles/Jobs/CentComm/EmergencyResponseTeam.yml @@ -130,7 +130,6 @@ - CableApcStack - SheetPlasteel - SheetSteel - belt: - RCDRecharging - type: startingGear @@ -164,7 +163,6 @@ - SheetPlasteel - SheetSteel - WeaponAdvancedLaser - belt: - RCDCombat # Security diff --git a/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml new file mode 100644 index 00000000000..154aa75017a --- /dev/null +++ b/Resources/Prototypes/_Mono/Catalogs/uplink_catalog.yml @@ -0,0 +1,9 @@ +- type: listing + id: UplinkSyndicateApplicator + name: uplink-syndicate-applicator-name + description: uplink-syndicate-applicator-desc + productEntity: NaniteApplicatorSyndicate + cost: + Telecrystal: 2 + categories: + - UplinkDisruption diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_Mono/Entities/Objects/Specific/chemical-containers.yml new file mode 100644 index 00000000000..c2888e57f73 --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Objects/Specific/chemical-containers.yml @@ -0,0 +1,13 @@ +- type: entity + parent: JerryCan + suffix: nanite fuel + id: JerryCanNaniteFuel + components: + - type: Label + currentLabel: reagent-name-nanite-fuel + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: NaniteFuel + Quantity: 200 \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml new file mode 100644 index 00000000000..abff55be626 --- /dev/null +++ b/Resources/Prototypes/_Mono/Entities/Objects/Tools/nanite_applicator.yml @@ -0,0 +1,91 @@ +- type: entity + name: nanite applicator + parent: BaseItem + id: NaniteApplicator + description: "Advanced tool that uses nanotechnology to repair structures." + components: + - type: EmitSoundOnLand + sound: + path: /Audio/Items/welder_drop.ogg + - type: Sprite + sprite: _Mono/Objects/Tools/nanite_applicator.rsi + layers: + - state: icon + - type: MeleeWeapon + wideAnimationRotation: 135 + attackRate: 1.5 + damage: + types: + Blunt: 5 + soundHit: + collection: MetalThud + - type: Tool + qualities: + - Applicating + useSound: + collection: Welder + - type: Welder + fuelReagent: NaniteFuel + onlyDisplayFuel: true + - type: RefillableSolution + solution: Welder + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: NaniteFuel + Quantity: 50 + maxVol: 50 + - type: PhysicalComposition + materialComposition: + Steel: 100 + - type: StaticPrice + price: 100 + - type: GuideHelp + guides: + - Construction + +- type: entity + name: experimental nanite applicator + parent: NaniteApplicator + id: NaniteApplicatorExperimental + description: "An experimental nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." + components: + - type: Sprite + sprite: _Mono/Objects/Tools/nanite_applicator_experimental.rsi + layers: + - state: icon + - type: SolutionRegeneration + solution: Welder + generated: + reagents: + - ReagentId: NaniteFuel + Quantity: 1 + - type: StaticPrice + price: 200 + +- type: entity + name: advanced nanite applicator + parent: NaniteApplicatorExperimental + id: NaniteApplicatorSyndicate + description: "Advanced nanite applicator with a heavily upgraded nanite capacity capable of self-nanite generation." + components: + - type: Sprite + sprite: _Mono/Objects/Tools/nanite_applicator_syndicate.rsi + layers: + - state: icon + - type: SolutionContainerManager + solutions: + Welder: + reagents: + - ReagentId: NaniteFuel + Quantity: 200 + maxVol: 200 + - type: SolutionRegeneration + solution: Welder + generated: + reagents: + - ReagentId: NaniteFuel + Quantity: 3 + - type: StaticPrice + price: 400 \ No newline at end of file diff --git a/Resources/Prototypes/_Mono/Reagents/technological.yml b/Resources/Prototypes/_Mono/Reagents/technological.yml new file mode 100644 index 00000000000..5f71c09c1ef --- /dev/null +++ b/Resources/Prototypes/_Mono/Reagents/technological.yml @@ -0,0 +1,23 @@ +- type: reagent + id: NaniteFuel + name: reagent-name-nanite-fuel + desc: reagent-desc-nanite-fuel + physicalDesc: reagent-physical-desc-oily + slipData: + requiredSlipSpeed: 3.5 + flavor: bitter + flavorMinimum: 0.01 + color: "#5775f4" + recognizable: true + boilingPoint: 8000.6 + meltingPoint: 659.7 + friction: 0.4 + metabolisms: + Bloodstream: + effects: + - !type:HealthChange + damage: + types: + Poison: 0.4 + Slash: 0.3 + Piercing: 0.3 diff --git a/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml new file mode 100644 index 00000000000..cef72e463ec --- /dev/null +++ b/Resources/Prototypes/_Mono/Recipes/Lathes/tools.yml @@ -0,0 +1,22 @@ +- type: latheRecipe + parent: BaseToolRecipe + id: NaniteApplicator + result: NaniteApplicator + materials: + Steel: 400 + +- type: latheRecipe + parent: BaseToolRecipe + id: ExperimentalNaniteApplicator + result: NaniteApplicatorExperimental + materials: + Steel: 800 + Plasma: 200 + +- type: latheRecipe + parent: BaseToolRecipe + id: NaniteApplicatorSyndicate + result: NaniteApplicatorSyndicate + materials: + Steel: 800 + Plasma: 200 diff --git a/Resources/Prototypes/_Mono/tool_qualities.yml b/Resources/Prototypes/_Mono/tool_qualities.yml new file mode 100644 index 00000000000..8a88878e883 --- /dev/null +++ b/Resources/Prototypes/_Mono/tool_qualities.yml @@ -0,0 +1,6 @@ +- type: tool + id: Applicating + name: tool-quality-applicating-name + toolName: tool-quality-nanite-applicator-name + spawn: NaniteApplicator + icon: { sprite: _Mono/Objects/Tools/nanite_applicator.rsi, state: icon } diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml new file mode 100644 index 00000000000..610695ee4d9 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -0,0 +1,103 @@ +- type: entity + name: jerry can + parent: BaseItem + id: JerryCan + suffix: empty + description: A plastic jerry can with a spill-proof nozzle. + components: + - type: SolutionContainerManager + solutions: + tank: + maxVol: 200 + - type: Sprite + sprite: _NF/Objects/Specific/Chemistry/jerrycan.rsi + layers: + - state: jerrycan + - state: jerrycan1 + map: [ "enum.SolutionContainerLayers.Fill" ] + visible: false + - type: Item + size: Normal + sprite: _NF/Objects/Specific/Chemistry/jerrycan.rsi + - type: MixableSolution + solution: tank + - type: RefillableSolution + solution: tank + - type: DrainableSolution + solution: tank + - type: ExaminableSolution + solution: tank + - type: DrawableSolution + solution: tank + - type: InjectableSolution + solution: tank + - type: SolutionTransfer + canChangeTransferAmount: true + - type: SolutionItemStatus + solution: tank + - type: ReagentTank + tankType: Fuel + - type: UserInterface + interfaces: + enum.TransferAmountUiKey.Key: + type: TransferAmountBoundUserInterface + - type: Edible + solution: tank + delay: 1.5 + destroyOnEmpty: false + forceFeedDelay: 5 + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 5 + fillBaseName: jerrycan + inHandsMaxFillLevels: 5 + inHandsFillBaseName: -fill- + - type: StaticPrice + price: 10 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 200 + behaviors: + - !type:DoActsBehavior + acts: [ "Destruction" ] + - trigger: + !type:DamageTrigger + damage: 20 + behaviors: + - !type:PlaySoundBehavior + sound: + collection: MetalBreak + params: + volume: -4 + - !type:SpillBehavior + solution: tank + - !type:SpawnEntitiesBehavior + spawn: + SheetPlastic1: + min: 0 + max: 1 + transferForensics: true + - !type:DoActsBehavior + acts: [ "Destruction" ] + - type: Label + - type: TrashOnSolutionEmpty + solution: tank + +- type: entity + parent: JerryCan + suffix: welding fuel + id: JerryCanWeldingFuel +# categories: [ HideSpawnMenu ] # Frontier + components: + - type: Label + currentLabel: reagent-name-welding-fuel + - type: SolutionContainerManager + solutions: + tank: + reagents: + - ReagentId: WeldingFuel + Quantity: 200 \ No newline at end of file diff --git a/Resources/Textures/_Mono/Objects/Tools/naninte-injector-auto.gif b/Resources/Textures/_Mono/Objects/Tools/naninte-injector-auto.gif new file mode 100644 index 00000000000..f19fb948503 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/naninte-injector-auto.gif differ diff --git a/Resources/Textures/_Mono/Objects/Tools/naninte-injector-syndie.gif b/Resources/Textures/_Mono/Objects/Tools/naninte-injector-syndie.gif new file mode 100644 index 00000000000..dd5c950cc84 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/naninte-injector-syndie.gif differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/base.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/base.png new file mode 100644 index 00000000000..b7f5bbacac6 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/base.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/icon.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/icon.png new file mode 100644 index 00000000000..6c84c614662 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-left.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-left.png new file mode 100644 index 00000000000..eccfd87ab30 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-right.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-right.png new file mode 100644 index 00000000000..b027c8445a5 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/meta.json b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/meta.json new file mode 100644 index 00000000000..4de4dbecaef --- /dev/null +++ b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by avalon2855 on discord. Slight color modification by javadocs(Discord) so it didn't look like the experimental one.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/base.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/base.png new file mode 100644 index 00000000000..d5ad586e2af Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/base.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/icon.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/icon.png new file mode 100644 index 00000000000..ff86c4235b0 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png new file mode 100644 index 00000000000..4d013965ecb Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png new file mode 100644 index 00000000000..21c91177108 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/meta.json b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/meta.json new file mode 100644 index 00000000000..61426e5d4be --- /dev/null +++ b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_experimental.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by avalon2855 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/base.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/base.png new file mode 100644 index 00000000000..76a8f8204f7 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/base.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/icon.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/icon.png new file mode 100644 index 00000000000..7ca64bdd630 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/icon.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-left.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-left.png new file mode 100644 index 00000000000..4a8f2d67afd Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-right.png b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-right.png new file mode 100644 index 00000000000..71251a57642 Binary files /dev/null and b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/meta.json b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/meta.json new file mode 100644 index 00000000000..61426e5d4be --- /dev/null +++ b/Resources/Textures/_Mono/Objects/Tools/nanite_applicator_syndicate.rsi/meta.json @@ -0,0 +1,33 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by avalon2855 on discord", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "base" + }, + { + "name": "icon", + "delays": [ + [ + 0.1, + 0.1, + 0.1, + 0.1 + ] + ] + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-1.png new file mode 100644 index 00000000000..4ccf92b2de9 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-2.png new file mode 100644 index 00000000000..8c0c35abe8d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-3.png new file mode 100644 index 00000000000..837a5767596 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-4.png new file mode 100644 index 00000000000..e1a6cb92ecf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-5.png new file mode 100644 index 00000000000..7d2b63563b2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left-fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left.png new file mode 100644 index 00000000000..cd2be34dd92 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-left.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-1.png new file mode 100644 index 00000000000..4fa3149b7bf Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-2.png new file mode 100644 index 00000000000..c33997c1a24 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-3.png new file mode 100644 index 00000000000..5bc4c2a11c3 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-4.png new file mode 100644 index 00000000000..2dbc4eb44ea Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-5.png new file mode 100644 index 00000000000..11ab9cb6b95 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right-fill-5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right.png new file mode 100644 index 00000000000..3e47a637d7d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/inhand-right.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan.png new file mode 100644 index 00000000000..a23b56a1ae2 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan1.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan1.png new file mode 100644 index 00000000000..732f7c9d76b Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan1.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan2.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan2.png new file mode 100644 index 00000000000..6d0bbd6d370 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan2.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan3.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan3.png new file mode 100644 index 00000000000..b2ac4e26104 Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan3.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan4.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan4.png new file mode 100644 index 00000000000..23edf15373c Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan4.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan5.png b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan5.png new file mode 100644 index 00000000000..380b60cb92d Binary files /dev/null and b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/jerrycan5.png differ diff --git a/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/meta.json new file mode 100644 index 00000000000..ba12cfac829 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Specific/Chemistry/jerrycan.rsi/meta.json @@ -0,0 +1,77 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by HoofedEar, modified by Whatstone (Discord)", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "jerrycan" + }, + { + "name": "inhand-left", + "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-left-fill-5", + "directions": 4 + }, + { + "name": "inhand-right", + "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": "inhand-right-fill-5", + "directions": 4 + }, + { + "name": "jerrycan1" + }, + { + "name": "jerrycan2" + }, + { + "name": "jerrycan3" + }, + { + "name": "jerrycan4" + }, + { + "name": "jerrycan5" + } + ] +}