From d4fc57325139fa9f5de2d76a5f3bada196f65fc1 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:59:36 +0200 Subject: [PATCH 01/15] replaces HashSet with List for WelderRefinable (#455) --- .../Components/WelderRefinableComponent.cs | 12 +++++---- Content.Server/Construction/RefiningSystem.cs | 11 +++----- .../Entities/Objects/Materials/shards.yml | 18 ++++++------- .../Entities/Objects/Misc/broken_bottle.yml | 2 +- .../Entities/Objects/Power/lights.yml | 26 +++++++++---------- .../Objects/Consumable/Food/pre-warfood.yml | 2 +- .../_Nuclear14/Entities/Objects/Misc/junk.yml | 24 ++++++++++------- .../Objects/Specific/Medical/chemicals.yml | 8 +++--- 8 files changed, 52 insertions(+), 51 deletions(-) diff --git a/Content.Server/Construction/Components/WelderRefinableComponent.cs b/Content.Server/Construction/Components/WelderRefinableComponent.cs index 9d8958f7614..2fb99dd7f4e 100644 --- a/Content.Server/Construction/Components/WelderRefinableComponent.cs +++ b/Content.Server/Construction/Components/WelderRefinableComponent.cs @@ -1,5 +1,7 @@ using Content.Shared.Tools; using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype; +using Content.Shared.Storage; +using Robust.Shared.Prototypes; namespace Content.Server.Construction.Components { @@ -10,13 +12,13 @@ namespace Content.Server.Construction.Components [RegisterComponent] public sealed partial class WelderRefinableComponent : Component { - [DataField("refineResult")] - public HashSet? RefineResult = new(); + [DataField] + public List RefineResult = new(); - [DataField("refineTime")] + [DataField] public float RefineTime = 2f; - [DataField("qualityNeeded", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string QualityNeeded = "Welding"; + [DataField] + public ProtoId QualityNeeded = "Welding"; } } diff --git a/Content.Server/Construction/RefiningSystem.cs b/Content.Server/Construction/RefiningSystem.cs index b9d80c7170a..1d05a4e5c14 100644 --- a/Content.Server/Construction/RefiningSystem.cs +++ b/Content.Server/Construction/RefiningSystem.cs @@ -6,6 +6,7 @@ using Content.Shared.Stacks; using Content.Shared.Tools; using Robust.Shared.Serialization; +using Content.Shared.Storage; using SharedToolSystem = Content.Shared.Tools.Systems.SharedToolSystem; namespace Content.Server.Construction @@ -13,7 +14,6 @@ namespace Content.Server.Construction public sealed class RefiningSystem : EntitySystem { [Dependency] private readonly SharedToolSystem _toolSystem = default!; - [Dependency] private readonly StackSystem _stackSystem = default!; public override void Initialize() { base.Initialize(); @@ -39,14 +39,9 @@ private void OnDoAfter(EntityUid uid, WelderRefinableComponent component, Welder EntityManager.DeleteEntity(uid); // spawn each result after refine - foreach (var result in component.RefineResult!) + foreach (var ent in EntitySpawnCollection.GetSpawns(component.RefineResult)) { - var droppedEnt = EntityManager.SpawnEntity(result, resultPosition); - - // TODO: If something has a stack... Just use a prototype with a single thing in the stack. - // This is not a good way to do it. - if (TryComp(droppedEnt, out var stack)) - _stackSystem.SetCount(droppedEnt, 1, stack); + Spawn(ent, resultPosition); } } } diff --git a/Resources/Prototypes/Entities/Objects/Materials/shards.yml b/Resources/Prototypes/Entities/Objects/Materials/shards.yml index 5fcb006cfa5..6cdc066cf10 100644 --- a/Resources/Prototypes/Entities/Objects/Materials/shards.yml +++ b/Resources/Prototypes/Entities/Objects/Materials/shards.yml @@ -89,7 +89,7 @@ color: "#bbeeff" - type: WelderRefinable refineResult: - - SheetGlass1 + - id: SheetGlass1 - type: DamageUserOnTrigger damage: types: @@ -120,8 +120,8 @@ color: "#96cdef" - type: WelderRefinable refineResult: - - SheetGlass1 - - PartRodMetal1 + - id: SheetGlass1 + - id: PartRodMetal1 - type: DamageUserOnTrigger damage: types: @@ -152,8 +152,8 @@ color: "#FF72E7" - type: WelderRefinable refineResult: - - SheetGlass1 - - SheetPlasma1 + - id: SheetGlass1 + - id: SheetPlasma1 - type: DamageUserOnTrigger damage: types: @@ -186,8 +186,8 @@ color: "#8eff7a" - type: WelderRefinable refineResult: - - SheetGlass1 - - SheetUranium1 + - id: SheetGlass1 + - id: SheetUranium1 - type: DamageUserOnTrigger damage: types: @@ -221,8 +221,8 @@ color: "#e0aa36" - type: WelderRefinable refineResult: - - SheetGlass1 - - SheetBrass1 + - id: SheetGlass1 + - id: SheetBrass1 - type: DamageUserOnTrigger damage: types: diff --git a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml index b7c73f5e0cc..32222d0036c 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/broken_bottle.yml @@ -28,4 +28,4 @@ - type: SpaceGarbage - type: WelderRefinable refineResult: - - SheetGlass1 + - id: SheetGlass1 diff --git a/Resources/Prototypes/Entities/Objects/Power/lights.yml b/Resources/Prototypes/Entities/Objects/Power/lights.yml index c8089cd22d3..b18a0feaa52 100644 --- a/Resources/Prototypes/Entities/Objects/Power/lights.yml +++ b/Resources/Prototypes/Entities/Objects/Power/lights.yml @@ -68,7 +68,7 @@ - type: SpaceGarbage - type: WelderRefinable refineResult: - - SheetGlass1 + - id: SheetGlass1 - type: entity parent: BaseLightbulb @@ -276,8 +276,8 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalCyan + - id: SheetGlass1 + - id: ShardCrystalCyan - type: entity parent: LightTubeCrystalCyan @@ -296,8 +296,8 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalBlue + - id: SheetGlass1 + - id: ShardCrystalBlue - type: entity parent: LightTubeCrystalCyan @@ -316,8 +316,8 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalPink + - id: SheetGlass1 + - id: ShardCrystalPink - type: entity parent: LightTubeCrystalCyan @@ -336,8 +336,8 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalOrange + - id: SheetGlass1 + - id: ShardCrystalOrange - type: entity parent: LightTubeCrystalCyan @@ -356,8 +356,8 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalRed + - id: SheetGlass1 + - id: ShardCrystalRed - type: entity parent: LightTubeCrystalCyan @@ -376,5 +376,5 @@ node: icon - type: WelderRefinable refineResult: - - SheetGlass1 - - ShardCrystalGreen + - id: SheetGlass1 + - id: ShardCrystalGreen diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml index cae01daa844..f52f36e8289 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Food/pre-warfood.yml @@ -294,7 +294,7 @@ state: trash - type: WelderRefinable refineResult: - - SheetSteel1 + - id: SheetSteel1 - type: PhysicalComposition materialComposition: Steel: 100 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml index a276b3e1cf3..b8164969a4b 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/junk.yml @@ -63,7 +63,7 @@ - Trash - type: WelderRefinable refineResult: - - SheetGlass1 + - id: SheetGlass1 - type: PhysicalComposition materialComposition: Glass: 50 @@ -75,7 +75,7 @@ components: - type: WelderRefinable refineResult: - - SheetGlass1 + - id: SheetGlass1 - type: PhysicalComposition materialComposition: Glass: 50 @@ -87,7 +87,7 @@ components: - type: WelderRefinable refineResult: - - MaterialWoodPlank1 + - id: MaterialWoodPlank1 - type: PhysicalComposition materialComposition: Wood: 50 @@ -99,7 +99,7 @@ components: - type: WelderRefinable refineResult: - - SheetPlastic1 + - id: SheetPlastic1 - type: PhysicalComposition materialComposition: Plastic: 50 @@ -111,7 +111,7 @@ components: - type: WelderRefinable refineResult: - - SheetSteel1 + - id: SheetSteel1 - type: PhysicalComposition materialComposition: Steel: 50 @@ -123,7 +123,7 @@ components: - type: WelderRefinable refineResult: - - IngotAluminum1 + - id: IngotAluminum1 - type: PhysicalComposition materialComposition: Aluminum: 50 @@ -135,7 +135,7 @@ components: - type: WelderRefinable refineResult: - - IngotLead1 + - id: IngotLead1 - type: PhysicalComposition materialComposition: Lead: 50 @@ -147,7 +147,7 @@ components: - type: WelderRefinable refineResult: - - SheetPlastic1 + - id: SheetPlastic1 - type: PhysicalComposition materialComposition: Plastic: 50 @@ -170,7 +170,7 @@ Quantity: 50 - type: WelderRefinable refineResult: - - SheetPlastic1 + - id: SheetPlastic1 - type: PhysicalComposition materialComposition: Plastic: 100 @@ -250,7 +250,11 @@ state: iron - type: WelderRefinable refineResult: - - SheetSteel1 + - id: SheetSteel1 + amount: 1 + maxAmount: 3 + prob: 0.5 + orGroup: Metal - type: entity parent: [ N14JunkItemBaseAluminum , BoxCardboard ] diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index 6b1f7df570f..f36216091b1 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -31,7 +31,7 @@ emptySpriteName: stimpak0 - type: WelderRefinable refineResult: - - SheetPlastic1 + - id: SheetPlastic1 - type: Tag tags: - Syringe @@ -69,7 +69,7 @@ emptySpriteName: stimpak0 - type: WelderRefinable refineResult: - - SheetPlastic1 + - id: SheetPlastic1 - type: Tag tags: - Syringe @@ -427,7 +427,7 @@ fillBaseName: radawayphial - type: WelderRefinable refineResult: - - MaterialGlass + - id: SheetGlass1 - type: PhysicalComposition materialComposition: Glass: 50 @@ -472,7 +472,7 @@ emptySpriteName: radawayphial - type: WelderRefinable refineResult: - - MaterialGlass + - id: SheetGlass1 - type: PhysicalComposition materialComposition: Glass: 50 From 9e2d6ee09ffad2ef80f1547ece1498e5c6c50356 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:59:44 +0200 Subject: [PATCH 02/15] Wattz 2000/3000 fireRate nerf (#454) --- .../Entities/Objects/Weapons/Guns/Battery/battery_guns.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml index af59376aa10..98927255927 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml @@ -601,7 +601,7 @@ tags: - N14PowerCellFocused - type: Gun - fireRate: 3 + fireRate: 2 soundGunshot: collection: N14WattzGunshot selectedMode: SemiAuto @@ -647,7 +647,7 @@ tags: - N14PowerCellFocused - type: Gun - fireRate: 2 + fireRate: 1.5 soundGunshot: collection: N14WattzGunshot selectedMode: SemiAuto From 41a2113ae67cec13c551928f4edaade83c7f4265 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:59:56 +0200 Subject: [PATCH 03/15] Let there be light (#452) --- .../VendingMachines/Inventories/nuka.yml | 20 +++- .../Markers/Spawners/Random/vending.yml | 18 ++++ .../Structures/Machines/vending_machines.yml | 87 +++++++++++------- .../Entities/Structures/Wallmount/signs.yml | 37 ++++++-- .../VendingMachines/nukacola.rsi/meta.json | 20 ++++ .../nukacola.rsi/normal-unshaded.png | Bin 2484 -> 853 bytes .../VendingMachines/nukacola.rsi/normal.png | Bin 0 -> 2484 bytes 7 files changed, 138 insertions(+), 44 deletions(-) create mode 100644 Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Random/vending.yml create mode 100644 Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/normal.png diff --git a/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml b/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml index d4e194b6870..18a59538d87 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml @@ -2,8 +2,24 @@ id: NukaRadInventory startingInventory: N14DrinkIrradiatedNukaColaBottleFull: 8 - + - type: vendingMachineInventory - id: NukaInventory + id: NukaInventoryOld startingInventory: N14DrinkNukaColaBottleFull: 8 + +- type: vendingMachineInventory + id: NukaInventory + startingInventory: + N14DrinkNukaColaBroken: 6 + N14DrinkNukaCola: 4 + N14DrinkNukaColaCherry: 3 + N14DrinkNukaColaGrape: 1 + N14DrinkNukaColaOrange: 2 + N14DrinkNukaColaYellow: 2 + N14DrinkNukaColaQuantum: 1 + N14DrinkNukaColaQuartz: 1 + N14DrinkNukaColaVictory: 1 + N14DrinkNukaColaWild: 1 + +# higher number higher chances (also maximum amount) \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Random/vending.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Random/vending.yml new file mode 100644 index 00000000000..44af3c494a0 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/Random/vending.yml @@ -0,0 +1,18 @@ +- type: entity + id: N14RandomVending + name: random vending machine spawner + suffix: N14, Any + parent: MarkerBase + components: + - type: Sprite + layers: + - state: red + - sprite: Structures/Machines/VendingMachines/random.rsi + state: any + - type: RandomSpawner + prototypes: + - N14VendingMachineNukaColaNewFilled + - N14VendingMachineVimFilled + - N14VendingMachineCigaretteFilled + - N14VendingMachineCigaretteFilledRepublic + chance: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml index 59350071371..615b93c64d6 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Machines/vending_machines.yml @@ -1,4 +1,4 @@ -# Base +#MARK: Base - type: entity id: N14VendingMachineStorageBase # This is for vending machines that are storage and not actual vending machines. parent: BaseMachinePowered @@ -67,10 +67,9 @@ enabled: false usesApcPower: true - type: PointLight - enabled: false - castShadows: false - radius: 2 - energy: 1.5 + radius: 2.5 + energy: 1 + color: "#b34747" mask: /Textures/Effects/LightMasks/cone.png autoRot: true - type: LitOnPowered @@ -88,21 +87,25 @@ - GalacticCommon - RobotTalk -# - +#MARK: Nuka Vending - type: entity parent: VendingMachine id: N14VendingMachineNukaCola name: Nuka-Cola machine description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. + suffix: vendor, normal components: - type: VendingMachine pack: NukaInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 offState: off brokenState: broken normalState: normal-unshaded - dispenseOnHitChance: 0.25 - dispenseOnHitThreshold: 2 + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + initialStockQuality: 0.05 - type: Sprite sprite: _Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi layers: @@ -115,23 +118,45 @@ map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: WiresVisuals - type: PointLight - radius: 1.5 - energy: 1.6 + radius: 2.5 + energy: 1 color: "#b34747" + mask: /Textures/Effects/LightMasks/cone.png + autoRot: true + +#MARK: Nuka Vending+ +- type: entity + parent: N14VendingMachineNukaCola + id: N14VendingMachineNukaColaGenerous + name: Nuka-Cola machine + description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. + suffix: vendor, generous + components: + - type: VendingMachine + pack: NukaInventory + dispenseOnHitChance: 0.25 + dispenseOnHitThreshold: 2 + offState: off + brokenState: broken + normalState: normal-unshaded + ejectState: eject-unshaded + denyState: deny-unshaded + ejectDelay: 1.9 + initialStockQuality: 0.30 +#MARK: Nuka Irradiated - type: entity parent: N14VendingMachineNukaCola id: N14VendingMachineNukaColaIrradiated name: Nuka-Cola machine - suffix: irradiated + suffix: vendor, irradiated description: A Pre-War vending machine that dispenses Nuka-Cola Corporation branded beverages. components: - type: VendingMachine pack: NukaRadInventory # Needs a run down variant of the sprite - -# vendors as storage type +#MARK: Nuka Storage - type: entity parent: N14VendingMachineStorageBase id: N14VendingMachineNukaColaNew @@ -144,16 +169,12 @@ layers: - state: "off" map: ["enum.VendingMachineVisualLayers.Base"] - - state: "off" + - state: "normal-unshaded" map: ["enum.VendingMachineVisualLayers.BaseUnshaded"] shader: unshaded - state: panel map: ["enum.WiresVisualLayers.MaintenancePanel"] - type: WiresVisuals - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#b34747" - type: Storage grid: - 0,0,3,3 @@ -167,7 +188,8 @@ storagebase: !type:Container - type: Transform anchored: true - + +#MARK: Nuka Filled - type: entity parent: N14VendingMachineNukaColaNew id: N14VendingMachineNukaColaNewFilled @@ -201,7 +223,8 @@ prob: 0.05 - id: N14DrinkNukaColaWild prob: 0.05 - + +#MARK: Vim Storage - type: entity parent: N14VendingMachineStorageBase id: N14VendingMachineVim @@ -213,10 +236,6 @@ sprite: _Nuclear14/Structures/Machines/VendingMachines/vim.rsi layers: - state: vimmachine - - type: PointLight - radius: 1.5 - energy: 1.6 - color: "#b34747" - type: Storage grid: - 0,0,3,3 @@ -231,7 +250,8 @@ - type: Transform anchored: true noRot: false - + +#MARK: Vim Filled - type: entity parent: N14VendingMachineVim id: N14VendingMachineVimFilled @@ -261,8 +281,9 @@ prob: 0.05 - id: N14DrinkVimQuartz prob: 0.05 - -# Cigarette vendors + + +#MARK: Cig vendors - type: entity parent: BaseStructure id: N14VendingMachineCigarette @@ -287,11 +308,12 @@ storagebase: !type:Container - type: Transform anchored: true - + +#MARK: Cig Filled - type: entity parent: N14VendingMachineCigarette id: N14VendingMachineCigaretteFilled - suffix: random + suffix: storage, random components: - type: StorageFill contents: @@ -311,11 +333,12 @@ prob: 0.2 - id: N14CigarettePackSalem prob: 0.2 - + +#MARK: Cig Republic - type: entity parent: N14VendingMachineCigarette id: N14VendingMachineCigaretteFilledRepublic - suffix: republics + suffix: storage, republics name: Republics cig vendor description: A pre-war cigarette vendor that's been filled with Republic cigarette packs. components: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/signs.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/signs.yml index a8c98efa465..0bc2429e360 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/signs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Wallmount/signs.yml @@ -20,6 +20,10 @@ components: - type: Sprite state: clinic + - type: PointLight + radius: 3 + energy: 1 + color: '#00ff00' - type: entity parent: N14SignBar @@ -29,6 +33,10 @@ components: - type: Sprite state: open + - type: PointLight + radius: 3 + energy: 1 + color: '#ff0000' - type: entity parent: N14SignOpen1 @@ -43,23 +51,24 @@ components: - type: Sprite state: open_on - + - type: entity parent: N14SignOpen1 id: N14SignOpenOn2 components: - type: Sprite state: open_bar_on - + - type: entity - parent: N14SignBar + parent: N14SignBase id: N14SignForRent name: for rent sign description: A sign advertising a place for rent. components: - type: Sprite + sprite: _Nuclear14/Structures/Wallmounts/signs_32x32.rsi state: rent - + - type: entity parent: N14SignBase id: N14SignNotice @@ -69,7 +78,7 @@ - type: Sprite sprite: _Nuclear14/Structures/Wallmounts/walldecor.rsi state: notice_sign - + - type: entity parent: N14SignNotice id: N14SignDanger @@ -99,7 +108,11 @@ - type: Sprite sprite: _Nuclear14/Structures/Wallmounts/signs_64x32.rsi state: bazaar_on - + - type: PointLight + radius: 2 + energy: 1 + color: '#ff8000' + - type: entity parent: N14SignBazaarOn id: N14SignHotel @@ -108,7 +121,7 @@ components: - type: Sprite state: hotel - + - type: entity parent: N14SignBazaarOn id: N14SignPrivateProperty @@ -117,7 +130,7 @@ components: - type: Sprite state: private - + - type: entity parent: N14SignBazaarOn id: N14SignOpenBig @@ -126,7 +139,11 @@ components: - type: Sprite state: we_open_open - + - type: PointLight + radius: 2 + energy: 1 + color: '#ff0000' + - type: entity parent: N14SignBazaarOn id: N14SignWorkersOnly @@ -135,7 +152,7 @@ components: - type: Sprite state: workers - + # 64x64 # Scale these by 0.5, 0.5 - type: entity diff --git a/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/meta.json b/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/meta.json index 4b6aba89648..53cff0fe0a5 100644 --- a/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/meta.json @@ -8,6 +8,26 @@ }, "states": [ { + "name": "normal", + "delays": [ + [ + 5, + 0.1, + 0.2, + 0.1, + 0.5, + 5, + 0.1, + 0.1, + 0.1, + 0.1, + 0.1, + 5, + 2 + ] + ] + }, + { "name": "normal-unshaded", "delays": [ [ diff --git a/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/normal-unshaded.png b/Resources/Textures/_Nuclear14/Structures/Machines/VendingMachines/nukacola.rsi/normal-unshaded.png index daf6a48e49ff3f07e030f34ce00202c88ad2f22f..cbd9960723df9c1da24ddb115e2b2a348a847cb2 100644 GIT binary patch literal 853 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSjKx9jP7LeL$-HD>VCMI9aSW-L z^Y+d`Z;?ca;~$^jEkCyR#H}nZuFjz2cd{4Un`Wb;$Z}N5C80t)$+-7hitDn<3~vpO z6$yJwF8EzN=-h52^2F4L-?fCJi{lsbJ-%0FP4D0Bx_pl3-FN2Gzt5dB;ODnKGq0|n zgMnd%`>8Ue+jsIFX{q&TT+Di%^!n*-3B#hl&$pk_+h#E}!*pHHqN$T^@J-zEe*5 z`CCh@-o6&KxN{|~&nIS5TN~TOsQlIQy_ROh?T`Cao}=E=vB$pNv5LF@$=eSd8k!%s zTxk%T*uVMvQgw4R`Mh&t+2z*j_HeJLv;EEwj0$wnp_6@QZH(RCIm`F&fB&+k&a&>e zzxg}kb7^n04&BrL_ve$j{DK&}*y??^e^vDV?W(fdf9>yamy;LYxW3$76`ADad4H=m zFbMzM+41H1vF_^p+V>mtmwtMA59C?-nKV)?Uuf;ftpkO*Sna_zPtJ7AFm&8|3@TWlChgDxOQvC+Vaq77nS+vf6wRN z5Nv0w5qS1F`^(dZj4eyv_0-gD67Z@;_YIKmpyFC)=MeC-V)lmL{8@HRDbJZ(=JxaN z{=eb5@)ch@yH$VLP309geP(Prb^LbA-THvff=br%4k~wQYHs{(x0PqaVx~Z3=y~=R zMKP~^%P0H0?^rdDKj3qX)uB)=`TzExUvh+per60>8FEuPd=^l4jeXFvm1lQ&dHU!1 t*xlV1y=TMjBlY{k-yIK^!!$bUwf@!;y&c=?jBkP@Jzf1=);T3K0RVLzf-wL9 literal 2484 zcmcguc{J4T8vhD$9T{6cyHUB8EJK7eW{G}C48Mes(a+XmSF+EL(AWuC2PH~KqJ(j? zCZSXe!(ePNqhSWkFvcBsIp^O0@40_G@AJN&^LgI$e4h6?&v_r%+gTnFkrx2~;E1)A z#UDJ6Juu4va5POH6@>`C3~b9V1HCN}_`uzbo~3?hXfD zJe2*gfPs6B9LhKPiWI*sepEF9ms!JlgiI7WX@{ebR?x_x5Ve7(i0o@vv$HlWL zD(Abbwm<^CE_xtqJ*c#h(ZtZwc1ct8`02LdsiB`{tqUB&r^S-!ZSvmKOeuPp+!l>N zt6N>r@;RhUV4hsd?U?Zvq(I~nk3t&WR5gJ%7T0st5Q|;6UPFo!K7d^`#{BH$G$+$Z zR4jI>WjyZ%Wv9_HS^e(P6UW_vsIt-G#!u!qOT z#??3Q2W!z=n@kDOB)xJyux)yBdXHVq04Gr(xUEzc>Tfbke#fs|tTZ$zKj#@~kksL8 zt{U%Ze7;2|gMcQ&}!aUsH8Lt7r3t4<;!<=dt{vs;Epv#%!X+vor-jq2HO zrjiu%T3L4ScHu|ozj6~Ds=N7wQi%iQVMcZ4c6MUqBBu;0jF{FeW7~g+WSqL@fe&r{ z!E_o2QH>UsmPBfbb&xG4is9z!h-H$?dcl5$h;pWo+i!b^4V*esiUd>74>n`INM2$; z@4;sQii%fU`Wo*=GIK&5X~cwab#xLAw4Xk%W-CQniS6hh48EHVOuh%9nbE?Fe<(Pl zWeV?ioX^wP9~AlasZ(JQb2Z-f?$rG++Pk*PT9TM^hpx*PBMixW@(KzYwcl$k&d#AB zk1Hzpq@JTCNGp4e0beJZQ-&WMS9v_jZqe|X>b9{*qccM?ry-MJV6;f*Opqx$k0m8p z-qe(a5>zf5hO&d4u2QLmdyC3kn^efP>9dQE1J5&7ED zqy+tY*Q`uu%m^0isn8+Wodq3zf~Dj?l9*+~JCEfA{G4i)?*t}Vf2peNGDEuas%W^) zheY3H@})yA`n8Umx#=4hm!j_OjuZF3U?fcT-ObgptWdTl-Imjk5mn4l# zO_?y4s(v_Oo|Cz85%$fSMlN8*_M?h`Oeb>95oiy<=cJD^_D+W96p7DoDPzOenpvDw zhy&wmnBMXzMRp2KkoE{#xM?VEa$m+{5{I5Kl@sD#hel8a7u9XC``QhCtgednNt!Sz zD;Pv$vIR=s;LW%rA7-c=x(!JV5@<2_jYClO zk8?V7QE&`FF#;O6;eQ76$)q&$BK6znFA~2;>m^=_H!7K(aZ`}ywThIaCs)Vd_4amd zu!-sCXU)f?Lwn0~P}B|IIDqD)D!qzui?({Gq0=7lw1q)eXp5CPXbe?^rKON-=b6Kq zBtc`h5<4Nq8(qD8DvT6^kuH0UoCh4wD9MdQhLq%N(08|}u=ho$CD6Kf4xjXLE*wjV zVF=lm;77sb)jPK>#@jMhPE+Tu6l_senq;(4F3fSvJt78V+ zLO<$Zr8e~Ho7C0Soq$+E8jG!I62sE_og8jZR9vhdMXqbiucf+-8_A0L{sd*cfKAs- z*0)RVHNs|UPNn0iwa(+^tnK2E^*raVOUvlfQgUqmC(lvfiilW(VcZo>!#;=twJXtY zscL9HpTn0Dl!)R2IOYHt5dvfLYYeMnfL`_jsNCegi}pVz=};MMAUoqVS@MqqGWYUHaDIAC2LwFc7rxbpErtm(6$@3%16z0`c~Dp={a zH>-K@zg^!R$Jg!L{$u93GZ%>Kgx}g)c|y26$pttKn1Xm?BUilLs$10>XjZ=!R;KEl z&lFM_$m3PRD%9H=1LQ!jjDoSMsQgVHoco{fBpB;W(58bBr=0VD38@rn+3fOXeHy

4va5POH6@>`C3~b9V1HCN}_`uzbo~3?hXfD zJe2*gfPs6B9LhKPiWI*sepEF9ms!JlgiI7WX@{ebR?x_x5Ve7(i0o@vv$HlWL zD(Abbwm<^CE_xtqJ*c#h(ZtZwc1ct8`02LdsiB`{tqUB&r^S-!ZSvmKOeuPp+!l>N zt6N>r@;RhUV4hsd?U?Zvq(I~nk3t&WR5gJ%7T0st5Q|;6UPFo!K7d^`#{BH$G$+$Z zR4jI>WjyZ%Wv9_HS^e(P6UW_vsIt-G#!u!qOT z#??3Q2W!z=n@kDOB)xJyux)yBdXHVq04Gr(xUEzc>Tfbke#fs|tTZ$zKj#@~kksL8 zt{U%Ze7;2|gMcQ&}!aUsH8Lt7r3t4<;!<=dt{vs;Epv#%!X+vor-jq2HO zrjiu%T3L4ScHu|ozj6~Ds=N7wQi%iQVMcZ4c6MUqBBu;0jF{FeW7~g+WSqL@fe&r{ z!E_o2QH>UsmPBfbb&xG4is9z!h-H$?dcl5$h;pWo+i!b^4V*esiUd>74>n`INM2$; z@4;sQii%fU`Wo*=GIK&5X~cwab#xLAw4Xk%W-CQniS6hh48EHVOuh%9nbE?Fe<(Pl zWeV?ioX^wP9~AlasZ(JQb2Z-f?$rG++Pk*PT9TM^hpx*PBMixW@(KzYwcl$k&d#AB zk1Hzpq@JTCNGp4e0beJZQ-&WMS9v_jZqe|X>b9{*qccM?ry-MJV6;f*Opqx$k0m8p z-qe(a5>zf5hO&d4u2QLmdyC3kn^efP>9dQE1J5&7ED zqy+tY*Q`uu%m^0isn8+Wodq3zf~Dj?l9*+~JCEfA{G4i)?*t}Vf2peNGDEuas%W^) zheY3H@})yA`n8Umx#=4hm!j_OjuZF3U?fcT-ObgptWdTl-Imjk5mn4l# zO_?y4s(v_Oo|Cz85%$fSMlN8*_M?h`Oeb>95oiy<=cJD^_D+W96p7DoDPzOenpvDw zhy&wmnBMXzMRp2KkoE{#xM?VEa$m+{5{I5Kl@sD#hel8a7u9XC``QhCtgednNt!Sz zD;Pv$vIR=s;LW%rA7-c=x(!JV5@<2_jYClO zk8?V7QE&`FF#;O6;eQ76$)q&$BK6znFA~2;>m^=_H!7K(aZ`}ywThIaCs)Vd_4amd zu!-sCXU)f?Lwn0~P}B|IIDqD)D!qzui?({Gq0=7lw1q)eXp5CPXbe?^rKON-=b6Kq zBtc`h5<4Nq8(qD8DvT6^kuH0UoCh4wD9MdQhLq%N(08|}u=ho$CD6Kf4xjXLE*wjV zVF=lm;77sb)jPK>#@jMhPE+Tu6l_senq;(4F3fSvJt78V+ zLO<$Zr8e~Ho7C0Soq$+E8jG!I62sE_og8jZR9vhdMXqbiucf+-8_A0L{sd*cfKAs- z*0)RVHNs|UPNn0iwa(+^tnK2E^*raVOUvlfQgUqmC(lvfiilW(VcZo>!#;=twJXtY zscL9HpTn0Dl!)R2IOYHt5dvfLYYeMnfL`_jsNCegi}pVz=};MMAUoqVS@MqqGWYUHaDIAC2LwFc7rxbpErtm(6$@3%16z0`c~Dp={a zH>-K@zg^!R$Jg!L{$u93GZ%>Kgx}g)c|y26$pttKn1Xm?BUilLs$10>XjZ=!R;KEl z&lFM_$m3PRD%9H=1LQ!jjDoSMsQgVHoco{fBpB;W(58bBr=0VD38@rn+3fOXeHy

Date: Wed, 7 Aug 2024 01:01:44 -0800 Subject: [PATCH 04/15] Town and vault Spawn item fixed. Character creation Loadout updates. Various mechanical fixes. (#451) --- .../Fills/Backpacks/StarterGear/backpack.yml | 18 +++-- .../_Nuclear14/Catalog/Fills/Belts/belt.yml | 12 +++ .../_Nuclear14/Catalog/Fills/Items/belt.yml | 4 +- .../Entities/Clothing/Eyes/glasses.yml | 4 + .../Entities/Clothing/Head/hats.yml | 78 +++++++++---------- .../OuterClothing/coats_and_outer.yml | 24 +++++- .../Objects/Weapons/Melee/baton-club.yml | 4 +- .../Entities/Objects/Weapons/Melee/knife.yml | 16 ++++ .../Loadouts/Roles/loadouts_ranger.yml | 4 +- .../Prototypes/_Nuclear14/Loadouts/eyes.yml | 24 ++++-- .../Prototypes/_Nuclear14/Loadouts/head.yml | 21 +++++ .../Prototypes/_Nuclear14/Loadouts/items.yml | 64 ++++++++++++++- .../_Nuclear14/Loadouts/outerClothing.yml | 31 +++++++- .../Roles/Jobs/Rangers/ranger_recruit.yml | 2 +- .../Roles/Jobs/Townsfolk/Townmechanic.yml | 2 +- .../Roles/Jobs/Townsfolk/Townshopkeeper.yml | 3 +- .../Roles/Jobs/Townsfolk/towndeputy.yml | 5 +- .../Roles/Jobs/Townsfolk/townmayor.yml | 1 - .../Roles/Jobs/Townsfolk/townsheriff.yml | 3 +- .../Jobs/VaultDwellers/vaultsecurity.yml | 5 +- 20 files changed, 249 insertions(+), 76 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml index 0a0b348a7f1..148805d9be4 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Backpacks/StarterGear/backpack.yml @@ -65,6 +65,15 @@ - id: Magazine45SubMachineGun - id: N14Weapon45SMG +- type: entity + noSpawn: true + parent: N14ClothingBackpackHiking + id: N14ClothingBackpackShopkeeperFilled + components: + - type: StorageFill + contents: + - id: N14BoxPlasticFilledWastelander + # Military - type: entity noSpawn: true @@ -94,7 +103,6 @@ - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - - id: MagazineBox9mm - type: entity noSpawn: true @@ -104,9 +112,8 @@ - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander + - id: N14PoliceBaton - id: N14CombatKnife - - id: MagazineBox44 - - id: MagazineBox308 - type: entity noSpawn: true @@ -116,9 +123,8 @@ - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander + - id: N14PoliceBaton - id: N14CombatKnife - - id: MagazineBox10mm - - id: MagazineBox44 # Tribal - type: entity @@ -148,8 +154,6 @@ - type: StorageFill contents: - id: N14BoxPlasticFilledWastelander - - id: N14MagazinePistol10mm - - id: N14MagazinePistol10mm - type: entity noSpawn: true diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Belts/belt.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Belts/belt.yml index 4cb655b5e78..a5f78e5b471 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Belts/belt.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Belts/belt.yml @@ -22,6 +22,18 @@ - id: SpeedLoader9 - id: SpeedLoader9 +- type: entity + noSpawn: true + parent: ClothingBeltRevolver + id: ClothingBelt10mmfilled + components: + - type: StorageFill + contents: + - id: N14WeaponRevolver10mm + - id: SpeedLoader10 + - id: SpeedLoader10 + - id: SpeedLoader10 + - type: entity noSpawn: true parent: ClothingBeltRevolver diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml index 08b58551b72..229ef4ec68e 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml @@ -55,7 +55,7 @@ components: - type: StorageFill contents: - - id: Stunbaton # TODO: Replace with fallout friendly baton + - id: N14PoliceBaton - id: Handcuffs - id: Handcuffs @@ -66,8 +66,8 @@ components: - type: StorageFill contents: + - id: N14PoliceBaton - id: GrenadeFlashBang - - id: Stunbaton - type: entity id: N14ClothingBeltWebbingFilled diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Eyes/glasses.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Eyes/glasses.yml index fc68fbd389c..4a56617f530 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Eyes/glasses.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Eyes/glasses.yml @@ -45,6 +45,9 @@ - type: Clothing sprite: _Nuclear14/Clothing/Eyes/glasses.rsi - type: VisionCorrection + - type: Tag + tags: + - GlassesNearsight - type: entity parent: ClothingEyesBase @@ -59,3 +62,4 @@ - type: VisionCorrection - type: ClothingSpecialModifier charismaModifier: 1 + diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml index fe8e71e4a94..8289ead3d74 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml @@ -45,6 +45,45 @@ perceptionModifier: 1 charismaModifier: 1 +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCowboyGrey + name: grey cowboy hat + description: A rustic grey cowboy hat. A trusted companion for any gunslinger. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi + - type: ClothingSpecialModifier + charismaModifier: 1 + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCowboyGreyBanded + name: banded cowboy hat + description: A rugged grey cowboy hat with some brass casings banded around itself. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi + - type: ClothingSpecialModifier + charismaModifier: 1 + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCowboyBrown + name: brown cowboy hat + description: A rustic brown cowboy hat, A trusted companion for any gunslinger. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi + - type: ClothingSpecialModifier + charismaModifier: 1 + - type: entity parent: ClothingHeadBase id: N14ClothingHeadHatHeadscarf @@ -321,45 +360,6 @@ - type: ClothingSpecialModifier charismaModifier: 1 -- type: entity - parent: ClothingHeadBase - id: N14ClothingHeadHatRangerGrey - name: grey ranger hat - description: A simple grey cowboy hat. - components: - - type: Sprite - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi - - type: Clothing - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgrey.rsi - - type: ClothingSpecialModifier - charismaModifier: 1 - -- type: entity - parent: ClothingHeadBase - id: N14ClothingHeadHatRangerGreyBanded - name: banded grey ranger hat - description: A simple grey cowboy hat with some brass casings banded around itself. - components: - - type: Sprite - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi - - type: Clothing - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatgreybanded.rsi - - type: ClothingSpecialModifier - charismaModifier: 1 - -- type: entity - parent: ClothingHeadBase - id: N14ClothingHeadHatCowboyRang - name: trail ranger hat - description: A rustic, homely style cowboy hat worn by trail rangers. Yeehaw! - components: - - type: Sprite - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi - - type: Clothing - sprite: _Nuclear14/Clothing/Head/FalloutHats/rangerhatcowboy.rsi - - type: ClothingSpecialModifier - charismaModifier: 1 - # Tribal - type: entity parent: ClothingHeadBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml index 3c1c75cc77f..4042c46af47 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -96,6 +96,11 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutduster.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutduster.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Heat: 0.9 - type: entity parent: ClothingOuterStorageBase @@ -107,28 +112,43 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutleatherduster.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/falloutleatherduster.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Heat: 0.9 - type: entity parent: ClothingOuterStorageBase id: N14ClothingOuterCoatLeatherJacket name: leather jacket - description: Why, yes, I do own a brahmin farm. How did you know? + description: A slick and smooth leather jacket. Perfect for any greaser. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Coats/leather_jacket.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/leather_jacket.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Heat: 0.9 - type: entity parent: ClothingOuterStorageBase id: N14ClothingOuterCoatLeatherCoat name: leather coat - description: Why, yes, I do own a brahmin farm. How did you know? + description: A slick and smooth long black leather coat. components: - type: Sprite sprite: _Nuclear14/Clothing/OuterClothing/Coats/coat_leather.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/coat_leather.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.95 + Heat: 0.9 - type: entity parent: ClothingOuterStorageBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml index 784b5a037fa..fc2d8b21cda 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml @@ -11,14 +11,14 @@ wideAnimationRotation: -135 damage: types: - Blunt: 16 + Blunt: 8 soundSwing: collection: N14BaseballBatSwing - type: Sprite sprite: _Nuclear14/Objects/Weapons/Melee/policebaton.rsi state: icon - type: Item - size: Large + size: Normal - type: Clothing sprite: _Nuclear14/Objects/Weapons/Melee/policebaton.rsi quickEquip: false diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml index 58a4f2b3fee..ceefd607df8 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/knife.yml @@ -41,8 +41,16 @@ sprite: _Nuclear14/Objects/Weapons/Melee/kitchen_knife.rsi size: Small state: icon + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: DamageOtherOnHit + damage: + types: + Slash: 16 - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/kitchen_knife.rsi + - type: DisarmMalus + malus: 0.225 - type: entity name: butcher's cleaver @@ -62,8 +70,16 @@ damage: types: Slash: 16 + - type: EmbeddableProjectile + sound: /Audio/Weapons/star_hit.ogg + - type: DamageOtherOnHit + damage: + types: + Slash: 20 - type: Item sprite: _Nuclear14/Objects/Weapons/Melee/cleaver.rsi + - type: DisarmMalus + malus: 0.225 - type: entity name: combat knife diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml index 4a87cf0dc39..46239cb332a 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -152,7 +152,7 @@ - NCRRanger - NCRRangerVeteran items: - - N14ClothingHeadHatRangerGrey + - N14ClothingHeadHatCowboyGrey - type: loadout id: LoadoutNCRhatGreyBanded @@ -165,7 +165,7 @@ - NCRRanger - NCRRangerVeteran items: - - N14ClothingHeadHatRangerGreyBanded + - N14ClothingHeadHatCowboyGreyBanded - type: loadout id: LoadoutNCRhatBeret diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/eyes.yml b/Resources/Prototypes/_Nuclear14/Loadouts/eyes.yml index f25f990e13a..b6c368b5fe6 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/eyes.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/eyes.yml @@ -1,13 +1,27 @@ - type: loadout - id: N14LoadoutEyesEyepatch + id: N14ClothingEyesGlassesWelding category: Accessories - cost: 1 + cost: 4 items: - - ClothingEyesEyepatch + - N14ClothingEyesGlassesWelding + +- type: loadout + id: N14ClothingEyesSunGlasses + category: Accessories + cost: 2 + items: + - N14ClothingEyesSunGlasses - type: loadout - id: N14LoadoutEyesBlindfold + id: N14ClothingEyesGlasses category: Accessories cost: 2 items: - - ClothingEyesBlindfold \ No newline at end of file + - N14ClothingEyesGlasses + +- type: loadout + id: N14LoadoutEyesEyepatch + category: Accessories + cost: 1 + items: + - ClothingEyesEyepatch diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/head.yml b/Resources/Prototypes/_Nuclear14/Loadouts/head.yml index 028d4f334ca..b7c6712e6f7 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/head.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/head.yml @@ -39,3 +39,24 @@ cost: 2 items: - N14ClothingHeadHatArmyCap + +- type: loadout + id: N14ClothingHeadHatCowboyGrey + category: Head + cost: 2 + items: + - N14ClothingHeadHatCowboyGrey + +- type: loadout + id: N14ClothingHeadHatCowboyGreyBanded + category: Head + cost: 2 + items: + - N14ClothingHeadHatCowboyGreyBanded + +- type: loadout + id: N14ClothingHeadHatCowboyBrown + category: Head + cost: 2 + items: + - N14ClothingHeadHatCowboyBrown diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/items.yml b/Resources/Prototypes/_Nuclear14/Loadouts/items.yml index 9247a102c22..174db979297 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/items.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/items.yml @@ -1,9 +1,58 @@ - type: loadout - id: N14LoadoutItemCig + id: N14WeaponRevolver9mm category: Items - cost: 1 + cost: 5 + items: + - N14WeaponRevolver9mm + +- type: loadout + id: N14KitchenKnife + category: Items + cost: 5 + items: + - N14KitchenKnife + +- type: loadout + id: ClothingMaskBat + category: Items + cost: 4 + items: + - ClothingMaskBat + +- type: loadout + id: ClothingMaskBear + category: Items + cost: 4 + items: + - ClothingMaskBear + +- type: loadout + id: ClothingMaskBee + category: Items + cost: 4 items: - - N14Cigarette + - ClothingMaskFox + +- type: loadout + id: ClothingMaskJackal + category: Items + cost: 4 + items: + - ClothingMaskJackal + +- type: loadout + id: ClothingMaskRat + category: Items + cost: 4 + items: + - ClothingMaskRat + +- type: loadout + id: ClothingMaskRaven + category: Items + cost: 4 + items: + - ClothingMaskRaven - type: loadout id: N14LoadoutItemCigsSalem @@ -80,4 +129,11 @@ category: Items cost: 1 items: - - N14JunkVaultCanteen \ No newline at end of file + - N14JunkVaultCanteen + +- type: loadout + id: N14LoadoutItemCig + category: Items + cost: 1 + items: + - N14Cigarette \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml index 217de876894..132e1fab69b 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml @@ -81,7 +81,36 @@ cost: 3 items: - N14ClothingOuterCoatLeatherDuster - + +- type: loadout + id: N14ClothingOuterCoatLeatherJacket + category: Outer + cost: 3 + items: + - N14ClothingOuterCoatLeatherJacket + +- type: loadout + id: N14ClothingOuterCoatLeatherCoat + category: Outer + cost: 3 + items: + - N14ClothingOuterCoatLeatherCoat + +- type: loadout + id: N14ClothingOuterTownCoat + category: Outer + cost: 3 + items: + - N14ClothingOuterTownCoat + +- type: loadout + id: N14ClothingOuterTownMediumCoat + category: Outer + cost: 5 + items: + - N14ClothingOuterTownMediumCoat + + - type: loadout id: N14LoadoutOuterLeatherArmor category: Outer diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml index f0b8636077c..4f7751bd66a 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Rangers/ranger_recruit.yml @@ -21,7 +21,7 @@ - type: startingGear id: RangerRecruitGear equipment: - head: N14ClothingHeadHatCowboyRang + head: N14ClothingHeadHatCowboyBrown back: N14ClothingBackpackMilitaryFilled jumpsuit: N14ClothingUniformRangerV1 ears: N14ClothingHeadsetNCR diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml index 2ae95081b0d..68acc2086b0 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townmechanic.yml @@ -22,7 +22,7 @@ shoes: N14ClothingShoesBlack id: N14IDPassportTownsfolk belt: N14ClothingBeltUtilityFilled - head: ClothingHeadHatWeldingMaskFlame + eyes: N14ClothingEyesGlassesWelding innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml index a76b0aadddf..849293bf65c 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/Townshopkeeper.yml @@ -18,9 +18,10 @@ id: TownShopkeeperGear equipment: jumpsuit: N14ClothingUniformJumpsuitMerchant - back: N14ClothingBackpackWastelanderFilled # N14TODO: Trader bag + back: N14ClothingBackpackShopkeeperFilled shoes: N14ClothingShoesBlack id: N14IDPassportTownsfolk + pocket1: N14CurrencyCap50 innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack satchel: N14ClothingBackpackSatchelWastelanderFilled duffelbag: N14ClothingBackpackDuffelFilled # N14TODO: Trader bag diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml index 8737097ecb5..dd1438ddb75 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/towndeputy.yml @@ -23,14 +23,13 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitCowboyBrown head: N14ClothingHeadHatDeputy + eyes: N14ClothingEyesSunGlasses back: N14ClothingBackpackDeputyFilled shoes: N14ClothingShoesBlack id: N14IDBadgeTownDeputy outerClothing: N14ClothingOuterPoliceVest - belt: ClothingBelt9mmfilled + belt: ClothingBeltRevolverfilled pocket1: RadioHandheld - pocket2: N14WeaponRevolver10mm - suitstorage: N14WeaponLeverCarbine satchel: N14ClothingBackpackSatchelDeputyFilled duffelbag: N14ClothingBackpackDuffelDeputyFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml index 95be6727817..1b213e71d2f 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townmayor.yml @@ -22,7 +22,6 @@ jumpsuit: N14ClothingUniformJumpsuitCheckered back: N14ClothingBackpackMayorFilled shoes: N14ClothingShoesBrown - belt: N14WeaponPistolChinese id: N14IDBadgeTownMayor pocket1: RadioHandheld innerClothingSkirt: N14ClothingUniformJumpskirtFalloutBlack diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml index 98056a06e79..ff6c04d8fb6 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/Townsfolk/townsheriff.yml @@ -27,12 +27,11 @@ back: N14ClothingBackpackSheriffFilled shoes: N14ClothingBootsCowboy head: N14ClothingHeadHatSheriff + eyes: N14ClothingEyesSunGlasses id: N14IDBadgeTownSheriff outerClothing: N14ClothingOuterSheriffVest belt: ClothingBeltRevolverfilled pocket1: RadioHandheld - pocket2: N14WeaponHunterRevolver - suitstorage: N14WeaponLeverRifle satchel: N14ClothingBackpackSatchelSheriffFilled duffelbag: N14ClothingBackpackDuffelSheriffFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml index a6e35d26984..cb569a1bc41 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/VaultDwellers/vaultsecurity.yml @@ -32,10 +32,9 @@ jumpsuit: N14ClothingUniformJumpsuitVault14 back: N14ClothingBackpackVaultSecurityFilled shoes: N14ClothingBootsBlack - eyes: ClothingEyesGlassesSunglasses - head: ClothingHeadHelmetRiot + eyes: N14ClothingEyesSunGlasses + head: N14ClothingHeadHatVaultRiot outerClothing: N14ClothingOuterVaultSecVest - id: N14VaultSecurityPDA pocket1: N14WeaponPistol10mm ears: N14ClothingHeadsetVaultSecurity belt: N14ClothingBeltPoliceFilled From dedecc00599318a683ba7361321f428a82b72fc4 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:01:53 +0200 Subject: [PATCH 05/15] Minor Fix (#450) --- .../Prototypes/_Nuclear14/Recipes/Construction/hydroponics.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Construction/hydroponics.yml b/Resources/Prototypes/_Nuclear14/Recipes/Construction/hydroponics.yml index abbcb627fe5..07866eb49e2 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Construction/hydroponics.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Construction/hydroponics.yml @@ -40,7 +40,7 @@ graph: N14SeedExtractor startNode: start targetNode: seedextractor - category: construction-category-utility + category: construction-category-machines description: A jet inhaler with a RadAway phial screwed on top of it. Two puffs away from being rad free. icon: sprite: _Nuclear14/Objects/Specific/Hydroponics/equipment.rsi From c8f1ad90f962744bbb97ce48dad3a1e55a9f9a9f Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:02:27 +0200 Subject: [PATCH 06/15] Few new sprites and Enclave IDs (#449) --- Resources/Maps/N14/MercerIslandSewers.yml | 2 +- Resources/Maps/N14/sunnyvale2.yml | 2 +- .../Entities/Objects/Devices/pda.yml | 50 +++++++---- .../Entities/Objects/Misc/identification.yml | 79 ++++++++++++++---- .../Specific/Medical/healthanalyzer.yml | 25 ++++++ .../identification.rsi/enclave_noncombat.png | Bin 0 -> 620 bytes .../identification.rsi/enclave_officer.png | Bin 0 -> 649 bytes .../identification.rsi/enclave_trooper.png | Bin 0 -> 622 bytes .../Objects/Misc/identification.rsi/meta.json | 11 ++- .../Objects/Misc/pipboy.rsi/equipped-BELT.png | Bin 0 -> 1156 bytes .../Misc/pipboy.rsi/equipped-IDCARD.png | Bin 0 -> 1156 bytes .../Objects/Misc/pipboy.rsi/id_overlay.png | Bin 0 -> 90 bytes .../Objects/Misc/pipboy.rsi/inhand-left.png | Bin 0 -> 1212 bytes .../Objects/Misc/pipboy.rsi/inhand-right.png | Bin 0 -> 1205 bytes .../Misc/pipboy.rsi/insert_overlay.png | Bin 0 -> 117 bytes .../Objects/Misc/pipboy.rsi/light_overlay.png | Bin 0 -> 763 bytes .../Objects/Misc/pipboy.rsi/meta.json | 70 ++++++++++++++++ .../Objects/Misc/pipboy.rsi/pda-r-library.png | Bin 0 -> 350 bytes .../Objects/Misc/pipboy.rsi/pda-r.png | Bin 0 -> 353 bytes .../Objects/Misc/pipboy.rsi/pda.png | Bin 0 -> 2481 bytes .../Medical/healthanalyzer.rsi/analyzer.png | Bin 0 -> 1001 bytes .../Medical/healthanalyzer.rsi/icon.png | Bin 0 -> 772 bytes .../Medical/healthanalyzer.rsi/meta.json | 25 ++++++ 23 files changed, 226 insertions(+), 38 deletions(-) create mode 100644 Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/healthanalyzer.yml create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_noncombat.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_officer.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_trooper.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/equipped-BELT.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/equipped-IDCARD.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/id_overlay.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/inhand-left.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/inhand-right.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/insert_overlay.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/light_overlay.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/pda-r-library.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/pda-r.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/pda.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi/analyzer.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi/icon.png create mode 100644 Resources/Textures/_Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi/meta.json diff --git a/Resources/Maps/N14/MercerIslandSewers.yml b/Resources/Maps/N14/MercerIslandSewers.yml index 752806bbabf..eb50d5153ec 100644 --- a/Resources/Maps/N14/MercerIslandSewers.yml +++ b/Resources/Maps/N14/MercerIslandSewers.yml @@ -8329,7 +8329,7 @@ entities: linearDamping: 0 canCollide: False - type: InsideEntityStorage -- proto: HandheldHealthAnalyzerUnpowered +- proto: N14HandheldHealthAnalyzer entities: - uid: 1272 components: diff --git a/Resources/Maps/N14/sunnyvale2.yml b/Resources/Maps/N14/sunnyvale2.yml index 6bbead1a1bc..529b17a904f 100644 --- a/Resources/Maps/N14/sunnyvale2.yml +++ b/Resources/Maps/N14/sunnyvale2.yml @@ -181003,7 +181003,7 @@ entities: - type: Physics canCollide: False - type: InsideEntityStorage -- proto: HandheldHealthAnalyzerUnpowered +- proto: N14HandheldHealthAnalyzer entities: - uid: 55853 components: diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/pda.yml index 311dacc7441..a288452409f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/pda.yml @@ -4,34 +4,54 @@ id: N14BasePipboy name: Pip-boy 2000 description: a RobCo Industries PIPBoy 2000 Personal Information Processor. What a mouthful. + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/pipboy.rsi + layers: + - map: [ "enum.PdaVisualLayers.Base" ] + - state: "light_overlay" + map: [ "enum.PdaVisualLayers.Flashlight" ] + shader: "unshaded" + visible: false + - state: "id_overlay" + map: [ "enum.PdaVisualLayers.IdLight" ] + shader: "unshaded" + visible: false + scale: 0.75, 0.75 + - type: Icon + sprite: _Nuclear14/Objects/Misc/pipboy.rsi + state: pda + - type: PdaBorderColor + borderColor: "#717059" -# Vault +- type: entity + parent: N14BasePipboy + id: N14Pipboy + +#MARK: Vault - type: entity parent: N14BasePipboy id: N14VaultPDA + suffix: Vault components: - type: Pda id: N14IDCardVault - - type: PdaBorderColor - borderColor: "#717059" - type: entity parent: N14BasePipboy id: N14VaultEngineerPDA + suffix: Vault, Engineer components: - type: Pda id: N14IDCardVaultEngineer - - type: Icon - state: pda-interntech - type: entity parent: N14BasePipboy id: N14VaultDoctorPDA + suffix: Vault, Doctor components: - type: Pda id: N14IDCardVaultDoctor - - type: Icon - state: pda-internmed - type: HealthAnalyzer scanDelay: 1.4 scanningEndSound: @@ -40,41 +60,39 @@ - type: entity parent: N14BasePipboy id: N14VaultSecurityPDA + suffix: Vault, Security components: - type: Pda id: N14IDCardVaultSecurity - - type: Icon - state: pda-interncadet - type: entity parent: N14BasePipboy id: N14VaultChefPDA description: Covered in grease and flour. + suffix: Vault, Chef components: - type: Pda id: ChefIDCard - type: PdaBorderColor borderColor: "#d7d7d0" - - type: Icon - state: pda-cook - type: entity parent: N14BasePipboy id: N14VaultBotanistPDA name: botanist PDA description: Has an earthy scent. + suffix: Vault, Botanist components: - type: Pda id: BotanistIDCard - type: PdaBorderColor borderColor: "#44843c" accentVColor: "#00cc35" - - type: Icon - state: pda-hydro - + - type: entity parent: N14BasePipboy id: N14VaultOverseerPDA + suffix: Vault, Overseer components: - type: Pda id: N14IDCardVaultOverseer @@ -85,6 +103,4 @@ tags: - Write - type: PdaBorderColor - borderColor: "#7C5D00" - - type: Icon - state: pda-captain \ No newline at end of file + borderColor: "#7C5D00" \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml index a4004022ba2..305b49db05f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/identification.yml @@ -21,7 +21,7 @@ tags: - DoorBumpOpener -# Vault +#MARK: Vault - type: entity parent: N14IDCard id: N14IDCardVault @@ -66,7 +66,7 @@ - type: PresetIdCard job: Overseer -# Passports +#MARK: Passports - type: entity parent: N14IDCard id: N14IDPassportBlank @@ -126,7 +126,7 @@ sprite: _Nuclear14/Objects/Misc/identification.rsi state: doctor -# Other Factions +#MARK: Brotherhood - type: entity parent: N14IDPassportBlank id: N14IDBrotherhoodHolotag @@ -192,6 +192,47 @@ - type: PresetIdCard job: BoSMidPaladinCommander +#MARK: Enclave +- type: entity + parent: N14IDPassportBlank + id: N14IDEnclaveTrooper + name: holotag + description: An ID holotag worn by the Enclave. + suffix: Trooper + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/identification.rsi + state: enclave_trooper + # - type: PresetIdCard + # job: EnclaveTrooper + +- type: entity + parent: N14IDPassportBlank + id: N14IDEnclaveOfficer + name: holotag + description: An ID holotag worn by higher ranking memebers of the Enclave. + suffix: Officer + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/identification.rsi + state: enclave_officer + # - type: PresetIdCard + # job: EnclaveOfficer + +- type: entity + parent: N14IDPassportBlank + id: N14IDEnclaveNoncombat + name: holotag + description: An ID holotag worn by the non combative members of Enclave. + suffix: Scientist , Noncombat + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/identification.rsi + state: enclave_noncombat + # - type: PresetIdCard + # job: EnclaveScientist + +# MARK: NCR - type: entity parent: N14IDPassportBlank id: N14IDNCRDogtag @@ -257,7 +298,7 @@ - type: PresetIdCard job: NCROfficer -# Desert Rangers +#MARK: Desert Rangers - type: entity parent: N14IDPassportBlank id: N14IDBadgeNCRDesertRangerRecruit @@ -282,12 +323,6 @@ - type: PresetIdCard job: NCRRanger -- type: entity - parent: N14IDBadgeNCRDesertRanger - id: N14IDBadgeNCRRanger - description: An ID badge worn by Republic Rangers. - suffix: NCR - - type: entity parent: N14IDPassportBlank id: N14IDBadgeNCRDesertRangerElite @@ -300,12 +335,6 @@ - type: PresetIdCard job: NCRRangerVeteran -- type: entity - parent: N14IDBadgeNCRDesertRangerElite - id: N14IDBadgeNCRRangerElite - description: An ID badge worn by Elite Republic Rangers. - suffix: NCR - - type: entity parent: N14IDPassportBlank id: N14IDBadgeNCRDesertRangerChief @@ -318,7 +347,21 @@ - type: PresetIdCard job: NCRRangerVeteran -# Townsfolk +#MARK: NCR Rangers +- type: entity + parent: N14IDBadgeNCRDesertRanger + id: N14IDBadgeNCRRanger + description: An ID badge worn by Republic Rangers. + suffix: NCR + + +- type: entity + parent: N14IDBadgeNCRDesertRangerElite + id: N14IDBadgeNCRRangerElite + description: An ID badge worn by Elite Republic Rangers. + suffix: NCR + +#MARK: Townsfolk - type: entity parent: N14IDPassportPhoto id: N14IDPassportTownsfolk @@ -361,7 +404,7 @@ sprite: _Nuclear14/Objects/Misc/identification.rsi state: mayor -# Raiders / Tribes +#MARK: Raiders / Tribes - type: entity parent: N14IDPassportBlank id: N14IDTribeSawbonePendant diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/healthanalyzer.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/healthanalyzer.yml new file mode 100644 index 00000000000..2d028bd9c79 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/healthanalyzer.yml @@ -0,0 +1,25 @@ +- type: entity + id: N14HandheldHealthAnalyzerUnpowered + parent: HandheldHealthAnalyzerUnpowered + name: health analyzer + description: A hand-held body scanner capable of distinguishing vital signs of the subject. + suffix: Do not map + components: + - type: Sprite + sprite: _Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi + state: icon + layers: + - state: icon + - state: analyzer + shader: unshaded + visible: true + map: [ "enum.PowerDeviceVisualLayers.Powered" ] + +- type: entity + id: N14HandheldHealthAnalyzer + parent: [ N14HandheldHealthAnalyzerUnpowered, PowerCellSlotSmallItem] + suffix: Powered + components: + - type: PowerCellDraw + drawRate: 1.2 #Calculated for 5 minutes on a small cell + - type: ActivatableUIRequiresPowerCell \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_noncombat.png b/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_noncombat.png new file mode 100644 index 0000000000000000000000000000000000000000..89bb04c75ea451222b0e7157275f3d25ebc2d174 GIT binary patch literal 620 zcmV-y0+aoTP)TAo{+w;c73F*C>zwaBXXpLB&pF@s z&CGsT27m!z02ly&6Tso#%8KHT5BKcl?Vb0Vn_G0_gB|vQ$p*T+O+^8a{O0Cb6|9vhgwTQNstR5y7T=xg;YpL}k6dy} zOk+v~wzpOHKChRp?C&#If4>k)2$0ESc#FzhOF`ieF{TAl%4)MQ83_SUEh&{s@-0xt zwD)j~wn3CUnMlY3q(3dZJ)G}h6RYPcptDUktNdQPclsz71B`#9oz3n=gvs;8@&csd zcf1{14C*R{+6Mf(MKG5%?R4tK5lf}hk^lo@?}ipNpug4O|u_8+3kaq#F7L|@tg zh~5JvN=}a*fZ&YTT*6^-A*QVyB1fbhfapDdMSa7qY;rxU8mIHIHtt{x2bZcXf&+k1 zI)PUDMfCjim|GAnB^SY3WzIe-hgzzmua+(M5 zt7x=fGO3Rd6bo;dVqsQPuY9f|L5TfWfAjx<0bl_9D}XP17ZJ)b22AlZe(Se8eU7qj!zH`5Ob%Fj^ z{|BI4F1ru+_q3Nx5Q7|8oxuSflUpYr*<8wBB} zPyjHmR;zOSbiGf}k9WaI;~(SxY+?G7-oW!UzE7>2#VZl?pkIGlFPV4rya`kw}1;N*e&?xm@l`<$!R~ zS90#1zNTUo0OsiKMx!yBi^XD;N~LHkk)Y=D^JuHjZ2_>py)Eal*4T=? z|B*%*O$1QQA(*$l6zcUl_PZP-g`<-bd5`C<0I)gqC@S3*aWe!*j*}4L{cmbM5kM8H zyF5FS5QrN)fvfkE)uR~30Dw6s!QF0RWDJ0p<4i}aTs)t?^00000NkvXXu0mjf7Cjv$ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_trooper.png b/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/enclave_trooper.png new file mode 100644 index 0000000000000000000000000000000000000000..581ce8ca138da2efaba2fbbf4859cfd18a9e721d GIT binary patch literal 622 zcmV-!0+IcRP)dT3t$`DiUO+DYR(X`0Edk|5(+>M^?Kl%NGt$0 zuws_Lc&>>Y?E&6E0R-eI21x{9f|&6N6Y(S|h{q5mQ6F9tfauU83TPkIGm;cex`@m) zl=e6!_lqg~4nwC3V3vSQB2K$c+=NlW>5ck_Cic`w?*wN6GkQB>14g``GXPJ7*_27- z1dz|?^?mR@9*67odL0?Hg1l6KKdAx0a5|mRZnx9#o6Ux{+by-*?H~?9A`t-0N28Hm zKQ){B`L$Y6uh*k)w;Kr|IlUMF!ig7)g*FCECX)%%NTQSO0i^Kk`x@eG0H`-~Qz+15 zr=t^r7y@NFr5D5i*=#n1Xfzrj2&-DH(r`F*hHxqYAYjTM{A4v%X?)*zf)E4bayhD0 zD*EJTL>4B21)#X8NDP2lqx*UOk%q1B`CR|p1wsrko6WGPUL%G3R!hIbjLol0CB0rQ zmtqK~9>7fq@%*zn#OBbaN~)*;B@iM2Y=Dj8zQ+VWh#%%iM=Egwai`!vN^E|s8Wnnb zc@cpm{@)N_n176*ZH^vEwFiztVE(x$ibC_$02spT6X`wh3sI(pSXGp8pa1{>07*qo IM6N<$f^AR*!~g&Q literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/meta.json index f943633f5e0..173af2a86af 100644 --- a/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Objects/Misc/identification.rsi/meta.json @@ -99,6 +99,15 @@ }, { "name": "silver" + }, + { + "name": "enclave_trooper" + }, + { + "name": "enclave_officer" + }, + { + "name": "enclave_noncombat" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/equipped-BELT.png b/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/equipped-BELT.png new file mode 100644 index 0000000000000000000000000000000000000000..6901e6c33b16b6a58f4a635b276edaa70a7f9845 GIT binary patch literal 1156 zcmZ`(PiWIn7*BObEp*JAY@#8?n0g=RwSp*ETFoV)9BOcvyEE zJBWDj;MLQ>!SE_fL=biu=-H`w5p~1ME`m(oOS<$A?SuE;_rCmo-}k-WdoQbnxtVxu zG)7TWJU5#y;(3Df=m|Wo>kmHTDdHAqGStS-nICvD3`@CkK2Kf1b`*EgKHhqY$CLK# zf=f}cU!+G?*5Y?5>NwKpOQ@8;DXLbDQ#5N4a$e2$S&}DWvj&kudo{y!MK8_x2oc-F z4H(*oprtfZ$`|M<%Yk%~<2jy@V>C@mj#d_n+3PJjUZt5TLbeD%qtW0RmpIF*fJ7>l z0=xhOfyD^ceP|-ZV@-EF2yzrB3tiRGZKPW!P2wtxRvo1oh9nAGP^YGbdF;Al_*pa+ zKm*pGiCmE25}+Rs>E(8XrrVMO3j@d(Oym2~ayC*gW2L4&Tu*C%xKP#4>mm(w0D!>r zS6N6pf6mwA78;q19f`|o=9NmL|M^L%u1T^SPhnyx`7y3H>--N zv5sD;A_)Y@?g)XmJFo=$)F6?aiwi~QT1K5{FJDPWz8qc7_8|m>Qa?hcvzJh)TFAn8 z%F)%FiJ)UU_?n0g=RwSp*ETFoV)9BOcvyEE zJBWDj;MLQ>!SE_fL=biu=-H`w5p~1ME`m(oOS<$A?SuE;_rCmo-}k-WdoQbnxtVxu zG)7TWJU5#y;(3Df=m|Wo>kmHTDdHAqGStS-nICvD3`@CkK2Kf1b`*EgKHhqY$CLK# zf=f}cU!+G?*5Y?5>NwKpOQ@8;DXLbDQ#5N4a$e2$S&}DWvj&kudo{y!MK8_x2oc-F z4H(*oprtfZ$`|M<%Yk%~<2jy@V>C@mj#d_n+3PJjUZt5TLbeD%qtW0RmpIF*fJ7>l z0=xhOfyD^ceP|-ZV@-EF2yzrB3tiRGZKPW!P2wtxRvo1oh9nAGP^YGbdF;Al_*pa+ zKm*pGiCmE25}+Rs>E(8XrrVMO3j@d(Oym2~ayC*gW2L4&Tu*C%xKP#4>mm(w0D!>r zS6N6pf6mwA78;q19f`|o=9NmL|M^L%u1T^SPhnyx`7y3H>--N zv5sD;A_)Y@?g)XmJFo=$)F6?aiwi~QT1K5{FJDPWz8qc7_8|m>Qa?hcvzJh)TFAn8 z%F)%FiJ)UU_gJ7NU|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ugc^Qd$DY`|O=@}(9`Vf_?N>Ymoih$`0 zY@ZR-I@~JI%|h56nwME(2QvUo7)cjW{8%{_m6YcfWru*{0yQ9UDuWsY2~?zX3dscE z2ms~+J1!f2c#g8;3V1a!44BQ1d%8G=R4~51Wysa+Aix^%RjS#ns@7AmXikXYa*vIU zjvFo=NB3d6 zxvSrsggJ7NU|=rE42dX-@b$4u&d=3LOvz75)vL%Y z0PC`;umUo3Q%e#RDspr3imfVamB1>jfNYSkzLEl1NlCV?QiN}Sf^&XRs)CuGfu4bq z9hZWFf=y9MnpKdC8&o@xXRDM^Qc_^0uU}qXu2*iXmtT~wZ)j<0sc&GUZ)BtkRH0j3 znOBlnp_^B%3^4>|j!SBBa#3bMNoIbY0?6FNr2NtnTO}osMQ{LdXG${Mo`TY%9I!1Z z$@-}|sky0nCB^!NdWQPg^p#|$AzYYO3=Ixo!03ZyfZ7bOYV#~8Nj3q7lxqdhJy8Dv z9hwZbx40xlA4!3}k%57Qu7Q!Rk)=M|e?aHkq$FFFWR~Qlf&&ijA8-gd=9Hj{g4Bb8 zASV+PvQ{~XdFi%F6}l;@X^EvdB}#Ugc^Qd$DY`|O=@}(9`Vf_?N>Ymoih$`0 zY@ZR-I@~JI%|h56nwME(2QvUo7)cjW{8%{_m6YcfWru*{0yQ9UDuWsY2~?zX3dscE z2ms~+J1!f2c#g8;3V1a!44BOhc)B=-R4~51WzE%MAixmtRqEiW-^rWh(pMi%{t>I= zA}DCGz;1U+Qd?zk+N2}y4GfG-EF1y~4lu?BF^rET2-y(^lg$|-n5x{ zZp#kr`TX_$?&`Ytc7>=~;Ci8qJ3$HmDyj+@Urt!P)8hEY*U4x3dM+&dGskX4;rgEq z-@g3nFR%G|e7~`vTSn5;$ZP4oFuNTdEM&5s|3fD711nc7sL1ei^>bP0l+XkK=L>eG literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/insert_overlay.png b/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/insert_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..61ba781c1ff684e6f10f525413f875649f8c6cdc GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz8&4OsQXaTVE0V|J#%x>Lu2 OTn0~9KbLh*2~7Y?(Iv0| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/light_overlay.png b/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/light_overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..286a6c32558c5afda2a6acf326230dd34fdc13a2 GIT binary patch literal 763 zcmV=f+5pjwRttMKC|^U0g2r{Lek--gBTxks?Kk z6e&_bFaV%$^9M9%odYhE{_Rr%*h|hafxZ9}?d-%r>G!QwH45Rt;teOfKKANZqu4m^ zwK`60l|r+3rLJdBgk$O%jJLn$S48F;OaUB#BSWvaR@1?{YsyPpbvB!#r6ijs3pKt3 ztsy+Wqv0hI6(<=P8Kb#pSIy7w;D79AuL&2#7>e4fD_I9Mq7p7oaWO(o|(=OeHBcJUXaE`^v5-wdzae z*^Y)xu8q73kypA$9`1fXy7qlZKHa88O_k1v!)T6i@*%_Oodo+}%=4%}9roTa+BbSu z)PO8`*MTg-U=Yi1PcxOro4Dc68ncJ3Fs9dWU=u&+<uuN|8V4XPap= t6Z}MA8HRf-8P*T3-b6bJBsix$dNOQpKH6sOV(<#yM8ADx_?^!vEFyR?pOZpDhC?NO*h$_u0%qQ_G& zO6~s#NA7YV$9qY9f{2KSi2kWFP1s>rF-h-(;1a#wt7@)Y)M}3=ioU#jKcgMkXw@+s z4e-5OVln$b{w9ZuY!;RB1KQ0_I+1Q5!H3UPd@dq8pisQV^nGscukr!<-Itx`KGzPE z;DrQ#TPoN#-tXIL@X{jI?>zxRRzKIAspg&cu( z{XWHmb>|=0KM7kM0mtotV@YG>9d#9uU;Sf>uX>u)JK+BA$(B92j4{9WlegJH(jw(< zn|>|z4oIr?@<+rcnLnx4`~E%=5fKp)ofrT=I;~~P`$XDW00000NkvXXu0mjfV!WgH literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/pda.png b/Resources/Textures/_Nuclear14/Objects/Misc/pipboy.rsi/pda.png new file mode 100644 index 0000000000000000000000000000000000000000..fcc735b9d4a31e8fed77cdc32c2a35d647941a7d GIT binary patch literal 2481 zcmaJ@dpy&7AK%)t;gCf~YcyJ?k&sKd)i$FcmpMIDIJG@0oFXJCw)r)V=;D%%BV?z9 zl1sTJnX)bjb4lg6ERt*5%rLw3?EH0J=k+|V=a0|#^M1WQpV#+~_viEezP@R`K5kkX zTQoo*kd}wL>mgO9ssezksm`V0@FrDKk8%%)0fDr6e+8Irrj1f@Cp=u8{Vo=KJr)#+ zI-rNEx4W>>$!_}V!_|Zd@F4y&U!Lx4#$z4$0IoQzXVRCq_Z55A zyPvZdq)q7Q*N$@8bcFE>aBnMQ(0YC2s6L`NQQoOLPc|3;_-)ehI{d>4ltuJuEj$iHs)dqr%S`NDg2fV|X*jSkK%B5fGFZ0h-w0pA0Mus8awiAqS+lQJjpEpPfw!k%&-RGI{u`pijX5l zk8fYe`fUh9jqNZ1r)jdsa^p%kjf1By6ma)-?qii*^+i1u3kJ`M7b5vwEe zpQm9b=nA}+>_xkwE5juMzTf>&DLTT-^MQ?{7B|lMcOA)3M_BTH}34{#etM2 zM1@n)+I>6J={)h1CpC;rsn$Ce3H(>guC}I&>IXPj#*X^-Z=a=sWiL0KWI)gveKApM z2sfsqLsZ0Udm~S&Ayl?S1Wi7`TXlRFmfgMVj#9`h%j8-L(~Rxir2378yqUh z|KS16CyoXYUcAHI2`s};$+>?QgD_}zQQM*aJ)*y-_izLMZO~SPX-WNbH%LNP`h97@Id>tcst#qt)V>+reKU}Om8o(ENMDCc{^)I|OpMT) z(>?teVd7m9cpDGQmnwzkiNKnY)`2uiOXxxndfShW7Dc8fyS+sVQhi9Z)``F={1<Z9_ zTE~l_?b-YPjG$6EJb+Fp<$RTZ3)AcSU{FNF-3{=aLnO40U+oQ?QJJuKgAjw;x=vfQ zKN5vhrIB=j0Zqv$vgsUd!Q-c=REq^XSeYU_+{w1WB~m(KXpGEWmK>~CM1CZNTZ*L4 zq!=;Gt8`0zVq#{muM+4|HKvbt%4A8`UoFDC43i$L%J1LhyDLG3pMLrZyi&~-R3(Kl zue-fLSN}|-O{lJL37S?B^?VomL@M(?#R0os literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi/analyzer.png b/Resources/Textures/_Nuclear14/Objects/Specific/Medical/healthanalyzer.rsi/analyzer.png new file mode 100644 index 0000000000000000000000000000000000000000..4d6f2e6640ee89c590de238e32a339d9415a8633 GIT binary patch literal 1001 zcmVPx&qe(Cq<=-3+$TInFi7xcS77UHoL69I2Rj_m~JT2_)D{Y z!(WX41@aI0o5?n(KhT&gbjA{rjs4OI0hYmtlv}fG0V$;*Ic%Bh`9srlU;Kej=@)B0 zucS$Py}lpsYp$QW`&>arMn*>DS&D8Ugw=Kdb2s#!%Q+6vYmnIYscyDHKJq zjiInTJ2Ow8<`*d`6zSLAe??^F)pUkF%}>aPFxWrfEFbJ2z}>3?FgLd#)PVGx>mPUr z&~@GR2YLt@5eg4Yz90XIZtvRwY;UX)i;fU7B9$iW&1|kss1xZo#XrzWx~|)wer(|G zRVh3)8NVLqjZP0w-pK>->TgHcvvNd-M{)P6q>>5d<`$^cmmvN6`9g<)R5HQijU9^n zE;`@0c>Ogu08dX_6sKGyrc?O5%hhb7^qb@h?EnCOZg25s2(At{fl1@I`(0F;dy}Kei0~t@s-Dm`Rt2f(Xv(h z%MP+`Rr)HDz1Mueg;yTGbcY z0YXNEQmI6Hhl?Y}I@wr!#8#&8%pO=?=lt;RB4u0Bueg;yTGbaG0WN($%FeA4*?W1m zG6l^07TJ4wc5ao3MMnVmGI*AgCwfIox0Js$oo9F5Vt3u*_T{yf^@Yv>;#aS6G87~h z9pT2*O_uoQIy4qN&!hdnxO?>)06y+e@J5d@HXkmmUDcb(^rj`VBeS2Ym?ILDpY znRz^cm#2g49qHG`uX@N*RnPx%zDYzuR9J=WmQPO;Q5400Gi?dc1$9aahCte(4MdEPKd~{2FeI zYd87@+_}L&3mOw58cR%!Zc1nX6O0L^5CXxL)_@W06gtmE?F14RGhkV9HuL7qd*_}x z_r5y=r#Qtaj){klpNQk^m+fv)RaK~}Y6eZGCjU9#5U8puv`E+tq9}?`6ve#PB4OJi zY&p;!@UfI#L5qZiq9|f;Xn?_?0Te|MS|ltoGjntYe0C^t+F87mU7CT9oo?j_2dAaeL1LuvOR~5swklqID6XxLJ~{@LF0F z3`az|tBReHzrv!5CTB+)66*hoctu#!4 zUeN(?IAtUmWVtpzh&%U3Ec4k)K^+njdwLcArohmvNC(R4?bFYexokTCAgJ{kSCfpx zd3X-s<3w9y1cbCGhGEp+R+2Cb17QG?WI7PiqFf!xH%0)!y}P5h98HL7Ex1t?h^m3h z(L^F11K`2nFqbZN{eJ<;u@|gW_DRHJw6(TV-7^q|pslr?L_Ee?WuN5O3m#>rak$P| z;oC)%UM$IKUm_n?7-sUqBNbF zB6>N*Qg#K8KR}1K1)skYk3T?WW{$+@C{xLCTYbRRG0f$1Qu56^v)t=}JpKS~x0`1# zUs2pFNyW{QWlq~gn9Jo%Ys>mBWqsFtX7vMf5Jzf60Hx(DeSH_q@lkQ4Mg*97&& z@du79z_w*|sH!T4wd(*(r=||2=EQI!Kcc5-H2whkHv+b0tR3h80000 Date: Wed, 7 Aug 2024 11:03:21 +0200 Subject: [PATCH 07/15] Adds clotting to stimpaks and medicine (#448) --- .../Prototypes/_Nuclear14/Reagents/chems.yml | 22 +++++++++++-------- .../_Nuclear14/Reagents/medicine.yml | 14 ++++++++++++ 2 files changed, 27 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml index 41e4cba2bf1..f83ea383472 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/chems.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/chems.yml @@ -10,20 +10,20 @@ Medicine: effects: # - !type:StrengthModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # strengthModifier: 1 - # # statusLifetime: 5 # may be useful if we want to make it last longer after reagent is gone from blood? + # strengthModifier: 1 + # # statusLifetime: 5 # may be useful if we want to make it last longer after reagent is gone from blood? # - !type:PerceptionModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # perceptionModifier: 1 + # perceptionModifier: 1 # - !type:EnduranceModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # enduranceModifier: 1 + # enduranceModifier: 1 # - !type:CharismaModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # charismaModifier: 1 + # charismaModifier: 1 # - !type:IntelligenceModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # intelligenceModifier: 1 + # intelligenceModifier: 1 # - !type:AgilityModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # agilityModifier: 1 + # agilityModifier: 1 # - !type:LuckModifierReagent # Nuclear 14 Example of adding modifier to Chemicals - # luckModifier: 1 + # luckModifier: 1 - !type:MovespeedModifier walkSpeedModifier: 1.15 sprintSpeedModifier: 1.15 @@ -296,7 +296,7 @@ color: "#990099" metabolisms: Medicine: - metabolismRate: 0.25 + metabolismRate: 0.2 effects: - !type:GenericStatusEffect key: SeeingRainbows @@ -318,6 +318,8 @@ groups: Brute: -1 Burn: -1 + - !type:ModifyBleedAmount + amount: -0.5 #MARK: Tribal Chems - type: reagent @@ -337,6 +339,8 @@ Toxin: 0.5 types: Radiation: 0.5 + - !type:ModifyBleedAmount + amount: 0.1 - !type:GenericStatusEffect key: SeeingRainbows component: SeeingRainbows diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index e7431d36f08..5d255575c63 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -15,6 +15,8 @@ Burn: -2.0 Brute: -2.0 Airloss: -2.0 + - !type:ModifyBleedAmount + amount: -0.5 - !type:HealthChange # Bonus for poison conditions: - !type:ReagentThreshold @@ -52,6 +54,8 @@ Airloss: -1.5 types: Radiation: 0.1 + - !type:ModifyBleedAmount + amount: -0.5 - !type:HealthChange # to prevent doping conditions: - !type:ReagentThreshold @@ -87,6 +91,8 @@ groups: Burn: -0.5 Brute: -0.5 + - !type:ModifyBleedAmount + amount: -0.1 - !type:ChemVomit probability: 0.05 @@ -110,6 +116,8 @@ Airloss: -2 types: Poison: -1 + - !type:ModifyBleedAmount + amount: -0.5 # Poison - type: reagent @@ -162,6 +170,8 @@ Burn: -5 Brute: -5 Airloss: -5 + - !type:ModifyBleedAmount + amount: -1 - !type:HealthChange # Taking 2 is more or less a guaranteed death conditions: - !type:ReagentThreshold @@ -297,6 +307,8 @@ Brute: -0.5 Burn: -0.5 Toxin: -0.5 + - !type:ModifyBleedAmount + amount: -0.5 - !type:ChemVomit probability: 0.05 - !type:Drunk @@ -342,6 +354,8 @@ Brute: -10 Airloss: -10 Toxin: 0.5 + - !type:ModifyBleedAmount + amount: -2 - !type:HealthChange conditions: - !type:ReagentThreshold From 2ae5b6a34ed3922cdc28235d8bcab1619275979e Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:03:59 +0200 Subject: [PATCH 08/15] Water generation and Mob Fixes (#447) --- .../Locale/en-US/_Nuclear14/reagents.ftl | 9 +- .../_Nuclear14/Entities/Mobs/NPCs/animals.yml | 142 +++++++++++++++--- .../_Nuclear14/Entities/Mobs/NPCs/basemob.yml | 12 +- .../_Nuclear14/Entities/Mobs/NPCs/insects.yml | 80 ++++++++-- .../Objects/Specific/Medical/chemicals.yml | 6 +- .../Structures/Furniture/other_furniture.yml | 76 +++++++--- .../_Nuclear14/Reagents/medicine.yml | 39 ++++- .../Prototypes/_Nuclear14/Reagents/toxins.yml | 58 ++++++- 8 files changed, 354 insertions(+), 68 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/reagents.ftl b/Resources/Locale/en-US/_Nuclear14/reagents.ftl index fc3e11b68e2..0834a936e43 100644 --- a/Resources/Locale/en-US/_Nuclear14/reagents.ftl +++ b/Resources/Locale/en-US/_Nuclear14/reagents.ftl @@ -163,10 +163,17 @@ reagent-name-tea-fireantnectar = fire ant nectar reagent-desc-tea-fireantnectar = Crystalised nectar from a fire ant. Sugary. -# Chems +# Venoms reagent-name-firetoxin = fire toxin reagent-desc-firetoxin = The hot stuff from firey creatures. +reagent-name-nightstalker-venom = nightstalker venom +reagent-desc-nightstalker-venom = The venom of a nightstalker. While not nearly as potent as cazador venom, it can still knock you down to your knees. + +reagent-name-cazador-venom = cazador venom +reagent-desc-cazador-venom = The venom of a cazador. Quick death is near guaranteed. + +# Chems reagent-name-healing-powder = healing powder reagent-desc-healing-powder = A powder made from crushed plants. diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml index 32123b3a947..f490cc9c723 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/animals.yml @@ -1,5 +1,5 @@ # See basemob.yml for parent entities - +#MARK: Molerat - type: entity name: molerat id: N14MobMolerat @@ -39,11 +39,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 3 @@ -62,6 +64,7 @@ tags: - Molerat +#MARK: Feral Dog - type: entity name: feral dog id: N14MobDogFeral @@ -101,11 +104,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 5 @@ -124,6 +129,7 @@ tags: - DogFeral +#MARK: Gecko - type: entity name: gecko id: N14MobGecko @@ -163,11 +169,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: types: Slash: 5 @@ -193,6 +201,7 @@ tags: - Gecko +#MARK: Nightstalker Cub - type: entity name: nightstalker cub id: N14MobNightstalkerCub @@ -241,11 +250,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 1 @@ -254,10 +265,28 @@ - type: SolutionContainerManager solutions: melee: + maxVol: 2.5 reagents: - - ReagentId: Toxin + - ReagentId: NightstalkerVenom Quantity: 2.5 + udder: + maxVol: 5 + reagents: + - ReagentId: NightstalkerVenom + Quantity: 5 + - type: Udder + reagentId: NightstalkerVenom + quantityPerUpdate: 1 + growthDelay: 30 + hungerUsage: 2 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: NightstalkerVenom + Quantity: 0.1 +#MARK: Nightstalker - type: entity name: nightstalker id: N14MobNightstalker @@ -310,11 +339,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 3 @@ -323,9 +354,29 @@ - type: SolutionContainerManager solutions: melee: + maxVol: 10 reagents: - - ReagentId: Toxin - Quantity: 5 + - ReagentId: NightstalkerVenom + Quantity: 10 + udder: + maxVol: 10 + reagents: + - ReagentId: NightstalkerVenom + Quantity: 10 + - type: Udder + reagentId: NightstalkerVenom + quantityPerUpdate: 1 + growthDelay: 30 + hungerUsage: 2 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: NightstalkerVenom + Quantity: 0.25 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 1.5 - type: Reproductive breedChance: 0.05 birthPopup: reproductive-laid-egg-popup @@ -344,6 +395,7 @@ tags: - Nightstalker +#MARK: Yao Guai - type: entity name: yao guai id: N14MobYaoguai @@ -386,11 +438,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: types: Slash: 15 @@ -415,7 +469,8 @@ tags: - Yaoguai -# Scaley Animals +#MARK:Scaley Animals +#MARK: Deathclaw - type: entity name: deathclaw id: N14MobDeathclaw @@ -462,11 +517,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: collection: AlienClaw - angle: 0 + angle: 60 animation: WeaponArcClaw + wideAnimation: WeaponArcClaw damage: types: Slash: 15 @@ -514,6 +571,7 @@ tags: - Deathclaw +#MARK: Albino Deathclaw - type: entity name: albino deathclaw id: N14MobDeathclawAlbino @@ -527,11 +585,13 @@ state: deathclawalbino sprite: _Nuclear14/Mobs/Animals/deathclawalbino.rsi - type: MeleeWeapon + altDisarm: false hidden: true soundHit: collection: AlienClaw - angle: 0 + angle: 60 animation: WeaponArcClaw + wideAnimation: WeaponArcClaw damage: types: Slash: 22 @@ -573,6 +633,7 @@ Dead: Base: dead +#MARK: Metal Deathclaw - type: entity name: metal deathclaw id: N14MobDeathclawMetal @@ -586,17 +647,20 @@ state: deathclawmetal sprite: _Nuclear14/Mobs/Animals/deathclawmetal.rsi - type: MeleeWeapon + altDisarm: false hidden: true soundHit: collection: AlienClaw - angle: 0 + angle: 60 animation: WeaponArcClaw + wideAnimation: WeaponArcClaw damage: types: Slash: 20 Structural: 10 -# Passive Animals +#MARK: Passive Animals +#MARK: Brahmin - type: entity name: brahmin parent: MobCow @@ -635,9 +699,9 @@ Quantity: 30 - type: Udder reagentId: N14MilkBrahmin - targetSolution: udder - quantity: 25 - updateRate: 30 + quantityperUpdate: 25 + growthDelay: 60 + hungerUsage: 10 - type: Damageable damageContainer: Biological damageModifierSet: WastelandAnimal @@ -661,6 +725,7 @@ maxAmount: 1 - type: ReproductivePartner +#MARK: Bighorner - type: entity name: bighorner parent: N14MobBrahmin @@ -686,6 +751,19 @@ spawned: - id: N14FoodMeatBighorner amount: 4 + - type: MeleeWeapon + altDisarm: false + hidden: true + soundHit: + collection: MetalThud + angle: 60 + animation: WeaponArcClaw + wideAnimation: WeaponArcClaw + damage: + types: + Blunt: 8 + Slash: 2 + Structural: 8 - type: SolutionContainerManager solutions: udder: @@ -695,9 +773,9 @@ Quantity: 30 - type: Udder reagentId: N14MilkBighorner - targetSolution: udder - quantity: 25 - updateRate: 30 + quantityperUpdate: 25 + growthDelay: 90 + hungerUsage: 7.5 - type: Reproductive breedChance: 0.05 birthPopup: reproductive-birth-popup @@ -710,6 +788,7 @@ maxAmount: 1 - type: ReproductivePartner +#MARK: Radstag - type: entity name: radstag parent: N14MobBrahmin @@ -735,6 +814,19 @@ spawned: - id: N14FoodMeatRadstag amount: 4 + - type: MeleeWeapon + altDisarm: false + hidden: true + soundHit: + collection: MetalThud + angle: 60 + animation: WeaponArcClaw + wideAnimation: WeaponArcClaw + damage: + types: + Blunt: 6 + Slash: 2 + Structural: 8 - type: SolutionContainerManager solutions: udder: @@ -744,9 +836,9 @@ Quantity: 30 - type: Udder reagentId: N14MilkRadstag - targetSolution: udder - quantity: 25 - updateRate: 30 + quantityperUpdate: 10 + growthDelay: 40 + hungerUsage: 5 - type: Reproductive breedChance: 0.05 birthPopup: reproductive-birth-popup @@ -759,6 +851,7 @@ maxAmount: 1 - type: ReproductivePartner +#MARK: Chicken - type: entity parent: MobChicken id: N14MobChicken @@ -800,6 +893,7 @@ eggSpawn: - id: N14FoodEggChicken +#MARK: Iguana - type: entity parent: N14MobBaseSimple id: N14MobIguana diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml index 28555e9257c..e40b76f83c5 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml @@ -1,4 +1,5 @@ # Consider making our own base mob in future so we're resilient to upstream changes. +#MARK: Base Simple - type: entity name: wasteland animal abstract: true @@ -67,7 +68,7 @@ - type: Speech speechSounds: Squeak -# Base Hostile +#MARK: Base Hostile - type: entity abstract: true id: N14MobBaseHostile @@ -116,8 +117,9 @@ range: 1 soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 2 @@ -132,7 +134,7 @@ - type: ReplacementAccent accent: genericAggressive - +#MARK: Base Scaley - type: entity name: scaley wasteland animal abstract: true @@ -143,6 +145,7 @@ damageContainer: Biological damageModifierSet: N14Scale +#MARK: Base Insect - type: entity name: wasteland insect abstract: true @@ -158,6 +161,7 @@ - WastelandInsect # Wave Defence Base Hostile +#MARK: WAVE - type: entity name: wave attacker abstract: true @@ -205,7 +209,7 @@ - type: WaveMob group: Insects -# Base Tameable +#MARK: Base Tameable - type: entity abstract: true id: N14TameableMobBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml index a4b2e7e5895..171bb903423 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/insects.yml @@ -1,5 +1,6 @@ # See basemob.yml for parent entities +#MARK: Bloatfly - type: entity name: bloatfly parent: N14MobBaseHostileInsect @@ -41,6 +42,8 @@ - type: BallisticAmmoProvider proto: N14BulletAcid capacity: 100 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 1 - type: Gun fireRate: 0.5 selectedMode: FullAuto @@ -56,7 +59,7 @@ amount: 1 prob: 0.75 - +#MARK: Giant Ant - type: entity name: giant ant parent: N14MobBaseHostileInsect @@ -106,15 +109,18 @@ heatDamageThreshold: 500 coldDamageThreshold: 0 - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 + angle: 60 animation: WeaponArcClaw + wideAnimation: WeaponArcClaw damage: groups: Brute: 5 +#MARK: Giant Fire Ant - type: entity name: giant fire ant parent: N14MobGiantAnt @@ -141,6 +147,12 @@ reagents: - ReagentId: FireToxin Quantity: 10 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: FireToxin + Quantity: 0.1 - type: Butcherable spawned: - id: N14MaterialAntChitin @@ -151,6 +163,7 @@ amount: 1 prob: 0.75 +#MARK: Radroach - type: entity name: radroach id: N14MobRadroach @@ -191,11 +204,13 @@ Dead: Base: dead - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 + angle: 60 animation: WeaponArcBite + wideAnimation: WeaponArcBite damage: groups: Brute: 2 @@ -204,6 +219,7 @@ - id: N14FoodMeatRadroachFillet amount: 1 +#MARK: Radscorpion - type: entity name: radscorpion parent: N14MobBaseHostileInsect @@ -259,21 +275,36 @@ heatDamageThreshold: 500 coldDamageThreshold: 0 - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Weapons/Xeno/alien_claw_flesh3.ogg - angle: 0 + angle: 60 animation: WeaponArcClaw + wideAnimation: WeaponArcClaw damage: types: - Piercing: 5 + Slash: 2 + Piercing: 8 - type: SolutionContainerManager solutions: melee: + maxVol: 10 reagents: - ReagentId: Toxin - Quantity: 3 + Quantity: 5 + - ReagentId: Radium + Quantity: 5 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: Toxin + Quantity: 0.1 + - ReagentId: Radium + Quantity: 0.1 +#MARK: Barkscorpion - type: entity name: barkscorpion parent: N14MobRadscorpion @@ -286,7 +317,22 @@ - map: [ "enum.DamageStateVisualLayers.Base" ] state: radscorpion sprite: _Nuclear14/Mobs/Insects/radscorpionbark.rsi + - type: SolutionContainerManager + solutions: + melee: + maxVol: 10 + reagents: + - ReagentId: Toxin + Quantity: 10 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: Toxin + Quantity: 0.2 +#MARK: Cazador +#SCARY FUCKERS, RUUUN!! - type: entity name: cazador parent: N14MobBaseHostileInsect @@ -324,20 +370,32 @@ - type: Bloodstream bloodMaxVolume: 50 - type: MeleeWeapon + altDisarm: false hidden: true soundHit: path: /Audio/Effects/bite.ogg - angle: 0 - animation: WeaponArcBite + angle: 30 + animation: WeaponArcThrust + wideAnimation: WeaponArcThrust damage: types: - Piercing: 5 + Piercing: 3 - type: SolutionContainerManager solutions: melee: + maxVol: 10 reagents: - - ReagentId: Toxin - Quantity: 5 + - ReagentId: CazadorVenom + Quantity: 10 + - type: SolutionRegeneration + solution: melee + generated: + reagents: + - ReagentId: CazadorVenom + Quantity: 0.25 + - type: MeleeChemicalInjector + solution: melee + transferAmount: 1.5 - type: Butcherable spawned: - id: N14FoodMeatRadRaw diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index f36216091b1..0427c3e29bc 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -574,16 +574,14 @@ emptySpriteName: smellingsalts0 - type: Hypospray solutionName: pen - transferAmount: 10 + transferAmount: 15 - type: SolutionContainerManager solutions: pen: maxVol: 15 reagents: - ReagentId: SmellingSalts - Quantity: 10 - - ReagentId: Epinephrine - Quantity: 5 + Quantity: 15 - type: entity parent: N14HealingPowder diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/other_furniture.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/other_furniture.yml index 632f7d0531e..14332626cd0 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/other_furniture.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Furniture/other_furniture.yml @@ -5,7 +5,7 @@ - type: Sprite sprite: _Nuclear14/Structures/Furniture/np13_misc.rsi state: dresser - + - type: entity parent: BaseStructure id: N14GrandfatherClock @@ -15,7 +15,7 @@ - type: Sprite sprite: _Nuclear14/Structures/Furniture/np13_misc.rsi state: grand_clock - + # Televisions - type: entity parent: BaseStructure @@ -41,7 +41,7 @@ components: - type: Sprite state: radking_tv - + - type: entity parent: N14Television id: N14TelevisionRedwood @@ -57,7 +57,7 @@ components: - type: Sprite state: tube_tv - + - type: entity parent: N14Television id: N14TelevisionSmall @@ -75,7 +75,7 @@ density: 100 mask: - TabletopMachineMask - + - type: entity parent: N14TelevisionSmall id: N14TelevisionTiny @@ -83,7 +83,7 @@ components: - type: Sprite state: tiny_tv - + # Washroom - type: entity parent: N14DecorFloorBase @@ -130,7 +130,7 @@ range: 8 sound: path: /Audio/Ambience/Objects/drain.ogg - + - type: entity parent: SeatBase id: N14Toilet @@ -188,7 +188,7 @@ autoDrain: false - type: DumpableSolution solution: drainBuffer - + - type: entity parent: N14Toilet id: N14ToiletWater @@ -200,7 +200,13 @@ reagents: - ReagentId: Water Quantity: 200 - + - type: SolutionRegeneration + solution: toilet + generated: + reagents: + - ReagentId: Water + Quantity: 2 + - type: entity parent: N14Toilet id: N14ToiletDirty @@ -214,7 +220,15 @@ Quantity: 180 - ReagentId: GastroToxin Quantity: 20 - + - type: SolutionRegeneration + solution: toilet + generated: + reagents: + - ReagentId: WaterDirty + Quantity: 3 + - ReagentId: GastroToxin + Quantity: 1 + - type: entity parent: N14Toilet id: N14ToiletIrradiated @@ -228,7 +242,15 @@ Quantity: 180 - ReagentId: GastroToxin Quantity: 20 - + - type: SolutionRegeneration + solution: toilet + generated: + reagents: + - ReagentId: WaterIrradiated + Quantity: 3 + - ReagentId: GastroToxin + Quantity: 1 + - type: entity parent: N14Shower id: N14Sink @@ -242,7 +264,7 @@ drainBuffer: maxVol: 100 tank: - maxVol: 500 + maxVol: 200 - type: DrainableSolution solution: tank - type: ReagentTank @@ -250,7 +272,7 @@ autoDrain: false - type: DumpableSolution solution: drainBuffer - + - type: entity parent: N14Sink id: N14SinkFilledWater @@ -263,8 +285,14 @@ tank: reagents: - ReagentId: Water - Quantity: 500 - + Quantity: 200 + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: Water + Quantity: 1 + - type: entity parent: N14Sink id: N14SinkFilledWaterDirty @@ -277,8 +305,14 @@ tank: reagents: - ReagentId: WaterDirty - Quantity: 500 - + Quantity: 200 + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: WaterDirty + Quantity: 1 + - type: entity parent: N14Sink id: N14SinkFilledWaterIrradiated @@ -291,4 +325,10 @@ tank: reagents: - ReagentId: WaterIrradiated - Quantity: 500 \ No newline at end of file + Quantity: 200 + - type: SolutionRegeneration + solution: tank + generated: + reagents: + - ReagentId: WaterIrradiated + Quantity: 1 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index 5d255575c63..055482862ed 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -280,15 +280,46 @@ color: "#e1f5f4" metabolisms: Medicine: - metabolismRate: 5 # Effectively 5 ticks per second + metabolismRate: 0.2 # Slow Acting effects: - - !type:HealthChange + - !type:HealthChange # Base Airloss fixing damage: + types: + Asphyxiation: -5 + Cold: -2 + - !type:HealthChange # Conditional Epinephrine-like bonus on unconscious + conditions: + - !type:MobStateCondition + mobstate: Critical + - !type:ReagentThreshold + min: 0 + max: 20 + damage: + types: + Asphyxiation: -3 + Poison: -0.5 groups: - Airloss: -10 #TODO add detail to wake up a guy if found + Brute: -0.5 + Burn: -0.5 + - !type:HealthChange # 20u threshold + conditions: + - !type:ReagentThreshold + min: 20 + damage: + types: + Asphyxiation: 3 + Poison: 1 + - !type:GenericStatusEffect + key: Stun + time: 0.75 + type: Remove + - !type:GenericStatusEffect + key: KnockedDown + time: 0.75 + type: Remove - !type:Jitter - !type:ChemVomit - probability: 0.1 + probability: 0.05 - type: reagent id: HealingPoultice diff --git a/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml b/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml index 49b1f95549f..e0c8eee49c1 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/toxins.yml @@ -1,11 +1,13 @@ -- type: reagent +#MARK: Firetoxin +#Liquid found inside of fire ant stingers, it burns quite a lot. +- type: reagent id: FireToxin name: reagent-name-firetoxin group: Toxins desc: reagent-desc-firetoxin flavor: tingly color: "#cf3600" - physicalDesc: reagent-physical-desc-opaque + physicalDesc: reagent-physical-desc-burning plantMetabolism: - !type:PlantAdjustToxins amount: 10 @@ -19,3 +21,55 @@ types: Heat: 3 Poison: 2 + +#MARK: Nightstalker Venom +#While not nearly as potent as cazador venom and is a lot slower acting, it will still kill in multiple bites +- type: reagent + id: NightstalkerVenom + name: reagent-name-nightstalker-venom + group: Toxins + desc: reagent-desc-nightstalker-venom + flavor: terrible + color: "#cf3600" + physicalDesc: reagent-physical-desc-viscous + plantMetabolism: + - !type:PlantAdjustToxins + amount: 10 + - !type:PlantAdjustHealth + amount: -5 + metabolisms: + Poison: + metabolismRate: 0.1 #Very Slow acting, default 0.5 + effects: + - !type:HealthChange + damage: + types: + Poison: 1 + groups: + Airloss: 2 + +#MARK: Cazador Venom +#Insanely potent venom which while acts at half speed, can knock down just about anyone in just a few injections +- type: reagent + id: CazadorVenom + name: reagent-name-cazador-venom + group: Toxins + desc: reagent-desc-cazador-venom + flavor: terrible + color: "#cf3600" + physicalDesc: reagent-physical-desc-bubbling + plantMetabolism: + - !type:PlantAdjustToxins + amount: 10 + - !type:PlantAdjustHealth + amount: -5 + metabolisms: + Poison: + metabolismRate: 0.2 #Slow acting, default 0.5 + effects: + - !type:HealthChange + damage: + types: + Poison: 3 + groups: + Airloss: 3.5 \ No newline at end of file From eaad9267124c5d2b0b427e59709bce48af2fff71 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:04:37 +0200 Subject: [PATCH 09/15] Modifies Brotherhood loadouts (#446) --- .../en-US/_Nuclear14/undecidedloadout.ftl | 56 +++++++---- .../_Nuclear14/Catalog/Fills/Items/belt.yml | 6 +- .../Catalog/Fills/Items/firstaidkits.yml | 3 +- .../OuterClothing/coats_and_outer.yml | 11 ++- .../Specific/Kits/UndecidedLoadout.yml | 97 ++++++++++++++----- .../Entities/Objects/Specific/Kits/kits.yml | 97 ++++++++++++++----- .../Weapons/Guns/Projectiles/energy.yml | 2 +- .../BrotherhoodMidwest/paladin-commander.yml | 4 +- .../Roles/Jobs/BrotherhoodMidwest/paladin.yml | 4 +- .../Roles/Jobs/BrotherhoodMidwest/scribe.yml | 7 +- 10 files changed, 206 insertions(+), 81 deletions(-) diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl index 2d4dc0c0af8..ded4a983b63 100644 --- a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl +++ b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl @@ -138,41 +138,55 @@ undecided-loadout-category-veteran-ranger-marksman-description = undecided-loadout-category-bos-default-name = Brotherhood Basic Issue Kit undecided-loadout-category-bos-default-description = A crate containing everything a member of Brotherhood might need. - For soldiers and laser lovers alike. + For soldiers and laser lovers alike. Includes 1 laser rifle, 1 laser pistol, 3 MF cells, 2 MFC cells, 1 stimpak, 1 MRE -undecided-loadout-category-bos-ranged-name = Brotherhood Ranged Issue Kit -undecided-loadout-category-bos-ranged-description = - A crate containing everything a member of Brotherhood might need. - For open range fights. - Includes 1 wattz 2000 rifle, 1 laser pistol, 3 Focused-MF cells, 2 MFC cells, - 1 stimpak, 1 MRE - undecided-loadout-category-bos-carbine-name = Brotherhood Carbine Issue Kit undecided-loadout-category-bos-carbine-description = A crate containing everything a member of Brotherhood might need. - For your ballistics. + For your ballistics. Includes 1 pre-war carbine rifle, 1 laser pistol, 3 carbine 556 magazines, 2 MFC cells, 1 stimpak, 1 MRE -undecided-loadout-category-bos-scribe-name = Brotherhood Scribe Utility Kit -undecided-loadout-category-bos-scribe-description = - A crate containing everything a member of Brotherhood scribes might need. - For upkeeping the base and defense. - Includes 1 10mm revolver, 3 10mm speedloaders, flashlight, - basic engineering and ammo kit, first aid kit, 1 stimpak, 1 MRE +undecided-loadout-category-bos-scribe-medic-name = Brotherhood Scribe Medical Kit +undecided-loadout-category-bos-scribe-medic-description = + A crate containing everything a member of Brotherhood scribes. + For keeping the fighting forces alive. + Includes 1 10mm revolver, 2 10mm speedloaders, 1 medical belt, + 1 bullet wound kit, 1 medical scribe clothing, 1 knife, 1 stimpak, 1 MRE + +undecided-loadout-category-bos-scribe-field-name = Brotherhood Scribe Field Kit +undecided-loadout-category-bos-scribe-field-description = + A crate containing everything a member of Brotherhood scribes. + For supporting your unit from the back. + Includes 1 varmint rifle, 1 5.56 ammo box, 1 medical belt, + 1 field scribe clothing, 1 knife, 1 stimpak, 1 MRE + +undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit +undecided-loadout-category-bos-scribe-engineer-description = + A crate containing everything a member of Brotherhood scribes. + For upkeeping the base and tinkering alike. + Includes 1 AEP-7 laser pistol, 2 MFC cells, 1 utility belt, + 1 engineer scribe clothing, 1 fire-axe, 1 stimpak, 1 MRE + +undecided-loadout-category-bos-ranged-name = Brotherhood Ranged Paladin Kit +undecided-loadout-category-bos-ranged-description = + A crate containing everything a paladin of Brotherhood might need. + For open range fights. + Includes 1 wattz 2000 rifle, 1 laser pistol, 3 Focused-MF cells, 2 MFC cells, + 1 stimpak, 1 MRE -undecided-loadout-category-bos-plasma-name = Brotherhood CO Plasma Kit +undecided-loadout-category-bos-plasma-name = Brotherhood Plasma Paladin Kit undecided-loadout-category-bos-plasma-description = - A crate containing everything a leader of Brotherhood might need. - For his plasma induced rage. + A crate containing everything a paladin of Brotherhood might need. + For his plasma induced rage. Includes 1 plasma rifle, 1 plasma pistol, 4 plasma cartridges, 1 stimpak, 1 MRE -undecided-loadout-category-bos-ballistics-name = Brotherhood CO Assault Kit +undecided-loadout-category-bos-ballistics-name = Brotherhood Assault Paladin Kit undecided-loadout-category-bos-ballistics-description = - A crate containing everything a leader of Brotherhood might need. - For his insane need of bullets downrange. + A crate containing everything a paladin of Brotherhood might need. + For his insane need of bullets downrange. Includes 1 assault rifle, 3 5.56 magazines, 1 12.7mm pistol, 2 12.7mm pistol magazines, 5.56 ammo box, 1 stimpak, 1 MRE diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml index 229ef4ec68e..8b86dcebd72 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/belt.yml @@ -30,10 +30,12 @@ components: - type: StorageFill contents: + - id: N14Bandage + amount: 2 - id: Brutepack - amount: 3 + amount: 2 - id: Ointment - amount: 3 + amount: 2 - id: N14Stimpak - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/firstaidkits.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/firstaidkits.yml index 5e4c2ecf8a5..e1ea80b1fe1 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/firstaidkits.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/Items/firstaidkits.yml @@ -54,7 +54,8 @@ - type: StorageFill contents: - id: N14RadAwayBloodbag - amount: 4 + amount: 2 + - id: N14RadXCanisterFilled - type: entity id: N14MedkitStimkitFilled diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml index 4042c46af47..59fcf2fae7e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/coats_and_outer.yml @@ -213,7 +213,7 @@ Blunt: 0.85 Slash: 0.85 Piercing: 0.9 - Heat: 0.75 + Heat: 0.8 - type: entity parent: N14ClothingOuterOverseerCoat @@ -279,6 +279,13 @@ sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodfieldscribe.rsi - type: Clothing sprite: _Nuclear14/Clothing/OuterClothing/Coats/brotherhoodfieldscribe.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.7 + Slash: 0.8 + Piercing: 0.75 + Heat: 0.8 #MARK: Enclave - type: entity @@ -380,7 +387,7 @@ Blunt: 0.75 Slash: 0.75 Piercing: 0.85 - Heat: 0.70 + Heat: 0.85 #MARK: Washington BoS - type: entity diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml index f19d2ec9bae..026c19a98b4 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml @@ -106,6 +106,7 @@ - key: enum.UndecidedLoadoutBackpackUIKey.Key type: UndecidedLoadoutBackpackBoundUserInterface +#MARK: Knights - type: entity id: NCRBoSMidwestkits name: Undecided BoS Midwest Kit @@ -119,9 +120,7 @@ transformAfterSelect: AlwaysPoweredWallLight possibleSets: - BoSDefaultSet - - BoSRangedSet - BoSCarbineSet - - BoSScribeSet - type: ActivatableUI key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UserInterface @@ -129,9 +128,33 @@ - key: enum.UndecidedLoadoutBackpackUIKey.Key type: UndecidedLoadoutBackpackBoundUserInterface +#MARK: Scribes +- type: entity + id: NCRBoSMidwestScribekits + name: Undecided BoS Scribe Midwest Kit + description: please only take one + parent: BaseItem + components: + - type: Sprite + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + - type: UndecidedLoadoutBackpack + transformAfterSelect: AlwaysPoweredWallLight + possibleSets: + - BoSScribeMedicalSet + - BoSScribeFieldSet + - BoSScribeEngineerSet + - type: ActivatableUI + key: enum.UndecidedLoadoutBackpackUIKey.Key + - type: UserInterface + interfaces: + - key: enum.UndecidedLoadoutBackpackUIKey.Key + type: UndecidedLoadoutBackpackBoundUserInterface + +#MARK: Paladins - type: entity - id: NCRBoSMidwestCOkits - name: Undecided BoS CO Midwest Kit + id: NCRBoSMidwestPaladinkits + name: Undecided BoS Paladin Midwest Kit description: please only take one parent: BaseItem components: @@ -143,8 +166,8 @@ possibleSets: - BoSDefaultSet - BoSRangedSet - - BoSCOPlasmaSet - - BoSCOAssaultSet + # - BoSPlasmaSet + - BoSAssaultSet - type: ActivatableUI key: enum.UndecidedLoadoutBackpackUIKey.Key - type: UserInterface @@ -370,6 +393,7 @@ state: rifleman content: - KitDefaultBoSMidwest + #carbine - type: UndecidedLoadoutBackpackSet id: BoSCarbineSet @@ -380,16 +404,7 @@ state: marksman content: - KitCarbineBoSMidwest -#scribe/utility -- type: UndecidedLoadoutBackpackSet - id: BoSScribeSet - name: undecided-loadout-category-bos-scribe-name - description: undecided-loadout-category-bos-scribe-description - sprite: - sprite: _Nuclear14/Objects/Misc/kits.rsi - state: medic - content: - - KitScribeBoSMidwest + #ranged-wattz - type: UndecidedLoadoutBackpackSet id: BoSRangedSet @@ -401,24 +416,60 @@ content: - KitRangedBoSMidwest -#MARK: BoS Commander Special +#MARK: Scribes +#medic +- type: UndecidedLoadoutBackpackSet + id: BoSScribeMedicalSet + name: undecided-loadout-category-bos-scribe-medic-name + description: undecided-loadout-category-bos-scribe-medic-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: medic + content: + - KitScribeMedicBoSMidwest +#field scribe - type: UndecidedLoadoutBackpackSet - id: BoSCOPlasmaSet - name: undecided-loadout-category-bos-plasma-name - description: undecided-loadout-category-bos-plasma-description + id: BoSScribeFieldSet + name: undecided-loadout-category-bos-scribe-field-name + description: undecided-loadout-category-bos-scribe-field-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman content: - - KitCOPlasmaBoSMidwest + - KitScribeFieldBoSMidwest + +#engineer +- type: UndecidedLoadoutBackpackSet + id: BoSScribeEngineerSet + name: undecided-loadout-category-bos-scribe-engineer-name + description: undecided-loadout-category-bos-scribe-engineer-description + sprite: + sprite: _Nuclear14/Objects/Misc/kits.rsi + state: rifleman + content: + - KitScribeEngineerBoSMidwest + +#MARK: BoS Commander Special +#PlasmaRifle +# - type: UndecidedLoadoutBackpackSet +# id: BoSPlasmaSet +# name: undecided-loadout-category-bos-plasma-name +# description: undecided-loadout-category-bos-plasma-description +# sprite: +# sprite: _Nuclear14/Objects/Misc/kits.rsi +# state: rifleman +# content: +# - KitPlasmaBoSMidwest + +#AssaultRifle - type: UndecidedLoadoutBackpackSet - id: BoSCOAssaultSet + id: BoSAssaultSet name: undecided-loadout-category-bos-ballistics-name description: undecided-loadout-category-bos-ballistics-description sprite: sprite: _Nuclear14/Objects/Misc/kits.rsi state: rifleman content: - - KitCOAssaultBoSMidwest \ No newline at end of file + - KitAssaultBoSMidwest \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml index e9913e324f1..d1edde27e50 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml @@ -562,35 +562,39 @@ - id: N14Stimpak - id: BoxMRE +#MARK: BoS Scribe Kits +#medic - type: entity - name: Brotherhood scribe utility kit + name: Brotherhood scribe medical kit parent: KitBase - id: KitScribeBoSMidwest - description: A crate containing everything a member of Brotherhood scribes might need for upkeeping the base and defense. + id: KitScribeMedicBoSMidwest + description: A crate containing everything a member of Brotherhood scribes might need for keeping the fighting forces alive. components: - type: Sprite - state: rifleman + state: medic - type: Item size: Huge - type: SpawnItemsOnUse items: - - id: N14WeaponRevolver10mm # sacrifice your main gun for basic crafting / medical supplies + - id: N14WeaponRevolver10mm - id: SpeedLoader10 - amount: 3 - - id: FlashlightSeclite - - id: SheetSteel10 - - id: LeadOre - - id: SulfurOre - - id: N14MedkitFilled + amount: 2 + - id: N14ClothingBeltMedicalFilled + - id: N14MedkitBruteFilled + - id: ClothingHandsGlovesChemist + - id: ClothingHeadBrotherhoodScribeHeadset + - id: N14ClothingBootsBlack + - id: N14ClothingOuterBosScribe + - id: N14CombatKnife - id: N14Stimpak - id: BoxMRE -#MARK: BoS Midwest CO Kits +#field scribe - type: entity - name: Brotherhood commander plasma kit + name: Brotherhood scribe field kit parent: KitBase - id: KitCOPlasmaBoSMidwest - description: A crate containing everything a leader of Brotherhood might need for his plasma induced rage. + id: KitScribeFieldBoSMidwest + description: A crate containing everything a member of Brotherhood scribes might need for supporting your unit in the field. components: - type: Sprite state: rifleman @@ -598,18 +602,67 @@ size: Huge - type: SpawnItemsOnUse items: - - id: N14WeaponPlasmaRifle - - id: N14WeaponPlasmaPistol - - id: N14PlasmaCartridge - amount: 4 + - id: N14WeaponSniperVarmint + - id: MagazineBox556 + - id: N14ClothingBeltMedicalFilled + - id: ClothingHandsGlovesFingerless + - id: N14ClothingHeadHatBrotherhoodFieldCap + - id: N14ClothingOuterBrotherhoodFieldScribeCoat + - id: N14CombatKnife + - id: N14Stimpak + - id: BoxMRE + +#engineer scribe +- type: entity + name: Brotherhood scribe engineer kit + parent: KitBase + id: KitScribeEngineerBoSMidwest + description: A crate containing everything a member of Brotherhood scribes might need for their general engineering needs. + components: + - type: Sprite + state: rifleman + - type: Item + size: Huge + - type: SpawnItemsOnUse + items: + - id: N14WeaponLaserPistol + - id: N14PowerCellSmall + amount: 2 + - id: ClothingHeadBrotherhoodScribeHeadset + - id: N14ClothingOuterMidwestBoSCoat + - id: ClothingHandsGlovesColorYellow + - id: N14ClothingBeltUtilityFilled + - id: SheetSteel10 + - id: SheetPlastic10 + - id: N14FireAxe - id: N14Stimpak - id: BoxMRE +#MARK: BoS Midwest CO Kits +# - type: entity +# name: Brotherhood commander plasma kit +# parent: KitBase +# id: KitPlasmaBoSMidwest +# description: A crate containing everything a leader of Brotherhood might need for his plasma induced rage. +# components: +# - type: Sprite +# state: rifleman +# - type: Item +# size: Huge +# - type: SpawnItemsOnUse +# items: +# - id: N14WeaponPlasmaRifle +# - id: N14WeaponPlasmaPistol +# - id: N14PlasmaCartridge +# amount: 4 +# - id: N14Stimpak +# - id: BoxMRE + - type: entity - name: Brotherhood commander ballistics kit + name: Brotherhood paladin ballistics kit parent: KitBase - id: KitCOAssaultBoSMidwest - description: A crate containing everything a leader of Brotherhood might need for his insane need of bullets downrange. + id: KitAssaultBoSMidwest + description: A crate containing everything a paladin of Brotherhood might need for his insane need of bullets downrange. components: - type: Sprite state: rifleman diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Projectiles/energy.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Projectiles/energy.yml index 73ee7d4c179..4f3a4a2b013 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Projectiles/energy.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Projectiles/energy.yml @@ -38,7 +38,7 @@ damage: types: Heat: 22 - Radiation: 8 + Caustic: 4 soundHit: path: "/Audio/Weapons/Guns/Hits/energy_meat1.ogg" diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml index 8b3a99f1317..db823dc60ba 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin-commander.yml @@ -34,10 +34,10 @@ head: N14ClothingHeadHatBrotherhoodFieldCap outerClothing: N14ClothingOuterMidwestArmorMK2 hands: N14ClothingHandsGlovesCombat - pocket1: NCRBoSMidwestCOkits + pocket1: NCRBoSMidwestPaladinkits id: N14IDBrotherhoodHolotagCommander ears: N14ClothingHeadsetBOSMidwest - belt: ClothingBeltBoSWebbing + belt: ClothingBeltMilitary - type: playTimeTracker id: BoSMidPaladinCommander diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml index ea2e6a81a90..c786756bdd2 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/paladin.yml @@ -34,11 +34,11 @@ shoes: N14ClothingBootsCombatFilled head: N14ClothingHeadHatBrotherhoodFieldCap outerClothing: N14ClothingOuterMidwestArmorMK2 - pocket1: NCRBoSMidwestkits + pocket1: NCRBoSMidwestPaladinkits hands: N14ClothingHandsGlovesCombat id: N14IDBrotherhoodHolotagPaladin ears: N14ClothingHeadsetBOSMidwest #placeholder - belt: ClothingBeltBoSWebbing + belt: ClothingBeltMilitary - type: playTimeTracker id: BoSMidPaladin diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml index 3d3d075ca1d..d203cdff2da 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodMidwest/scribe.yml @@ -28,15 +28,12 @@ - type: startingGear id: BoSMidScribeGear equipment: - head: ClothingHeadBrotherhoodScribeHeadset jumpsuit: N14ClothingUniformJumpsuitBOSGreen back: N14ClothingBackpackSatchelMilitary - shoes: N14ClothingBootsCombatFilled - outerClothing: N14ClothingOuterMidwestBoSCoat - pocket1: NCRBoSMidwestkits + shoes: N14ClothingBootsLeather + pocket1: NCRBoSMidwestScribekits id: N14IDBrotherhoodHolotag ears: N14ClothingHeadsetBOSMidwest - belt: N14ClothingBeltUtilityFilled - type: playTimeTracker id: BoSMidScribe From da862bee57ad62b5d9f2116a1110550396365b08 Mon Sep 17 00:00:00 2001 From: BlueHNT <79374236+BlueHNT@users.noreply.github.com> Date: Wed, 7 Aug 2024 11:28:04 +0200 Subject: [PATCH 10/15] Ranger mask modifications / Removal of experimental loadouts (#445) --- .../Entities/Clothing/Head/helmets.yml | 16 +- .../Entities/Clothing/Mask/gasmasks.yml | 53 ++++--- .../Clothing/OuterClothing/falloutarmor.yml | 4 +- .../Loadouts/Roles/loadouts_ranger.yml | 150 +++++------------- .../rangerhelmetdesert.rsi/icon.png | Bin 227 -> 262 bytes .../rangerhelmetfox.rsi/equipped-HELMET.png | Bin 696 -> 683 bytes .../rangerhelmetfox.rsi/icon.png | Bin 230 -> 267 bytes .../rangerhelmetmodif.rsi/equipped-HELMET.png | Bin 2114 -> 600 bytes .../rangerhelmetmodif.rsi/icon.png | Bin 665 -> 258 bytes .../rangerhelmetmodif.rsi/meta.json | 67 +------- .../rangerhelmetold.rsi/icon.png | Bin 223 -> 251 bytes .../rangerhelmetprice.rsi/icon.png | Bin 217 -> 243 bytes .../combatgasmask.rsi/equipped-MASK.png | Bin 615 -> 841 bytes .../rangerbrokengasmask.rsi/equipped-MASK.png | Bin 563 -> 641 bytes .../rangerdesertgasmask.rsi/equipped-MASK.png | Bin 555 -> 652 bytes .../rangermodifgasmask.rsi/equipped-MASK.png | Bin 0 -> 1711 bytes .../Gasmask/rangermodifgasmask.rsi/icon.png | Bin 0 -> 644 bytes .../rangermodifgasmask.rsi/icon_on.png | Bin 0 -> 644 bytes .../Gasmask/rangermodifgasmask.rsi/meta.json | 93 +++++++++++ .../rangeroldgasmask.rsi/equipped-MASK.png | Bin 570 -> 639 bytes .../rangerpricegasmask.rsi/equipped-MASK.png | Bin 624 -> 702 bytes .../equipped-MASK.png | Bin 604 -> 690 bytes .../Mask/Gasmask/riotgasmask.rsi/icon_on.png | Bin 0 -> 357 bytes .../Mask/Gasmask/riotgasmask.rsi/meta.json | 3 + 24 files changed, 181 insertions(+), 205 deletions(-) create mode 100644 Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/equipped-MASK.png create mode 100644 Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/icon.png create mode 100644 Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/icon_on.png create mode 100644 Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/meta.json create mode 100644 Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/icon_on.png diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index 0416531fcfa..d00580b4cc7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -239,7 +239,7 @@ - type: Clothing sprite: _Nuclear14/Clothing/Head/FalloutHelmets/enclavehelmetmarine.rsi -# NCR +#MARK: NCR - type: entity parent: N14ClothingHeadHatBaseHelmetMetal id: N14ClothingHeadHatNCRHelmetMetal @@ -269,7 +269,7 @@ sprite: _Nuclear14/Clothing/Head/FalloutHelmets/ncrhelmetmedic.rsi - type: entity - parent: N14ClothingHeadHatBaseHelmetmarine + parent: N14ClothingHeadHatBaseHelmetMK2 id: N14ClothingHeadHatRangerHelmet name: ranger combat helmet description: A helmet offering advanced protection, this one is commonly used by rangers. @@ -382,9 +382,9 @@ - type: entity parent: N14ClothingHeadHatBaseHelmetmarine - id: N14ClothingHeadHatRangerHelmetEliteModif + id: N14ClothingHeadHatRangerHelmetModif name: modified ranger combat helmet - description: A thicker than average helmet worn by rangers out in the field. This one appears have its mask welded to helmet with some unique modifications. + description: A thicker than average helmet worn by rangers out in the field. components: - type: Sprite sprite: _Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi @@ -393,10 +393,10 @@ - type: Armor modifiers: coefficients: - Blunt: 0.7 - Slash: 0.6 - Piercing: 0.7 - Heat: 0.6 + Blunt: 0.65 + Slash: 0.65 + Piercing: 0.75 + Heat: 0.65 - type: Tag tags: - HidesHair diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml index 819cacd5c16..3f89cf94ebf 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Mask/gasmasks.yml @@ -66,6 +66,10 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 + - type: Tag + tags: + - WhitelistChameleon + - HidesHair - type: entity parent: ClothingMaskGasCombat @@ -81,15 +85,12 @@ sprite: _Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi - type: Clothing sprite: _Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi - - type: GenericVisualizer - visuals: - enum.NightVisionItemVisuals.Active: - nightVisionItemLayer: - True: { state: icon } - False: { state: icon } + - type: Tag + tags: + - WhitelistChameleon - type: entity - parent: ClothingMaskGas + parent: ClothingMaskGasCombat id: ClothingMaskGasRanger name: ranger gas mask description: The last in pre-war military gas masks technology, with extra protection. @@ -117,9 +118,6 @@ sprite: _Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi - type: Clothing sprite: _Nuclear14/Clothing/Mask/Gasmask/rangeroldgasmask.rsi - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingMaskGasCombat @@ -142,9 +140,6 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingMaskGas @@ -166,9 +161,6 @@ Slash: 0.95 Piercing: 0.95 Heat: 0.95 - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingMaskGasCombat @@ -191,9 +183,6 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: Tag - tags: - - WhitelistChameleon - type: entity parent: ClothingMaskGas @@ -216,6 +205,7 @@ - type: Tag tags: - WhitelistChameleon + - HidesHair - type: entity parent: ClothingMaskGasCombat @@ -238,6 +228,25 @@ Slash: 0.9 Piercing: 0.9 Heat: 0.9 - - type: Tag - tags: - - WhitelistChameleon + +- type: entity + parent: ClothingMaskGasCombat + id: ClothingMaskGasRangerModif + name: modified ranger gas mask + description: A thicker than average mask worn by rangers out in the field. + components: + - type: Item + size: Tiny + - type: FlashImmunity + - type: EyeProtection + - type: Sprite + sprite: _Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.9 + Slash: 0.9 + Piercing: 0.9 + Heat: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 7764988b092..a9221c425af 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -578,7 +578,7 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.6 + Piercing: 0.55 Heat: 0.6 - type: entity @@ -596,7 +596,7 @@ coefficients: Blunt: 0.6 Slash: 0.6 - Piercing: 0.6 + Piercing: 0.5 Heat: 0.6 #MARK: Veteran diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml index 46239cb332a..7aec236b3a1 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_ranger.yml @@ -2,7 +2,7 @@ - type: loadout id: LoadoutNCRRangerVest category: Roles - cost: 4 + cost: 1 exclusive: true requirements: - !type:CharacterJobRequirement @@ -14,7 +14,7 @@ - type: loadout id: LoadoutNCRRangerArmorB category: Roles - cost: 4 + cost: 6 exclusive: true requirements: - !type:CharacterJobRequirement @@ -26,7 +26,7 @@ - type: loadout id: LoadoutNCRRangerDuster category: Roles - cost: 4 + cost: 8 exclusive: true requirements: - !type:CharacterJobRequirement @@ -38,7 +38,7 @@ - type: loadout id: LoadoutNCRhelmet category: Roles - cost: 2 + cost: 4 exclusive: true requirements: - !type:CharacterJobRequirement @@ -47,20 +47,31 @@ items: - N14ClothingHeadHatRangerHelmet -# MARK: Ranger + Vet +- type: loadout + id: LoadoutNCRmaskBroken + category: Roles + cost: 1 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - NCRRanger + items: + - ClothingMaskGasRangerBroken - type: loadout - id: LoadoutNCR50 + id: LoadoutNCRmaskCombat category: Roles - cost: 2 + cost: 8 exclusive: true requirements: - !type:CharacterJobRequirement jobs: - NCRRanger - - NCRRangerVeteran items: - - MagazineBox50 + - ClothingMaskGasCombat + +# MARK: Ranger + Vet - type: loadout id: LoadoutNCR308 @@ -104,30 +115,6 @@ - MagazineBox44 - MagazineBox44 -- type: loadout - id: LoadoutNCRmaskBroken - category: Roles - cost: 1 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRanger - items: - - ClothingMaskGasRangerBroken - -- type: loadout - id: LoadoutNCRmaskCombat - category: Roles - cost: 1 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRangerVeteran - items: - - ClothingMaskGasCombat - - type: loadout id: LoadoutNCRhatB category: Roles @@ -232,32 +219,6 @@ items: - N14ClothingUniformRangerV3 -- type: loadout - id: LoadoutNCRuniformModif - category: Roles - cost: 1 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRanger - - NCRRangerVeteran - items: - - N14ClothingUniformRangerModif - -- type: loadout - id: LoadoutNCRuniformBlue - category: Roles - cost: 1 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRanger - - NCRRangerVeteran - items: - - N14ClothingUniformRangerBlue - - type: loadout id: LoadoutNCRuniformPants category: Roles @@ -299,9 +260,9 @@ - N14MedkitCombatFilled - type: loadout - id: LoadoutNCRRangerMRE + id: LoadoutNCR556 category: Roles - cost: 1 + cost: 2 exclusive: true requirements: - !type:CharacterJobRequirement @@ -309,7 +270,9 @@ - NCRRanger - NCRRangerVeteran items: - - N14BoxCardboardMREBoxKFilled + - Magazine762Rifle + - Magazine762Rifle + - MagazineBox556 - type: loadout id: LoadoutNCR762 @@ -358,19 +321,20 @@ # MARK: Ranger Vet - type: loadout - id: LoadoutNCRuniformBlack + id: LoadoutNCR50 category: Roles - cost: 1 + cost: 2 exclusive: true requirements: - !type:CharacterJobRequirement jobs: - NCRRangerVeteran items: - - N14ClothingUniformRangerVeteranBlack + - MagazineBox50 + - MagazineBox50 - type: loadout - id: LoadoutNCRuniformRed + id: LoadoutNCRuniformModif category: Roles cost: 1 exclusive: true @@ -379,74 +343,40 @@ jobs: - NCRRangerVeteran items: - - N14ClothingUniformRangerVeteranRed - -# Unique items until crafting comes in -#TODO: MAKE THESE CRAFTABLE - -- type: loadout - id: LoadoutNCRarmorFox - category: Roles - cost: 6 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRangerVeteran - items: - - N14ClothingOuterRangerFox - - N14ClothingHeadHatRangerHelmetFox - -- type: loadout - id: LoadoutNCRarmorBleached - category: Roles - cost: 6 - exclusive: true - requirements: - - !type:CharacterJobRequirement - jobs: - - NCRRangerVeteran - items: - - N14ClothingOuterRangerCoat - - N14ClothingHeadHatRangerHelmet - - ClothingMaskGasRiot + - N14ClothingUniformRangerModif - type: loadout - id: LoadoutNCRarmorSand + id: LoadoutNCRuniformBlue category: Roles - cost: 6 + cost: 1 exclusive: true requirements: - !type:CharacterJobRequirement jobs: - NCRRangerVeteran items: - - N14ClothingOuterRangerCombatDesert - - N14ClothingHeadHatRangerHelmetDesert - - ClothingMaskGasRangerDesert + - N14ClothingUniformRangerBlue - type: loadout - id: LoadoutNCRarmorPrice + id: LoadoutNCRuniformBlack category: Roles - cost: 6 + cost: 1 exclusive: true requirements: - !type:CharacterJobRequirement jobs: - NCRRangerVeteran items: - - N14ClothingOuterRangerPrice - - N14ClothingHeadHatRangerHelmetPrice - - ClothingMaskGasRangerPrice + - N14ClothingUniformRangerVeteranBlack - type: loadout - id: LoadoutNCRHelmetModif + id: LoadoutNCRuniformRed category: Roles - cost: 2 + cost: 1 exclusive: true requirements: - !type:CharacterJobRequirement jobs: - NCRRangerVeteran items: - - N14ClothingHeadHatRangerHelmetEliteModif + - N14ClothingUniformRangerVeteranRed diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetdesert.rsi/icon.png index d6de36d6944a223e48d5c787f5d68e9fb63e0a73..79f243c8f6c0747d7ad552584df23007f27b0610 100644 GIT binary patch delta 221 zcmV<303!e60fqvQF@L~GL_t(oh3(Wm3&JoE2H>|MA~aT9EQm`wba2Viy}v!XB06aY z3nKMnDW&dl6Ezjn!$I&K$da!+E=K^y7-Rp=qZ~?9WM1dys~zdCuIt7$O^w#tOH^bM zHA7j|_qEY*004%PM5oQ>ScWDL{!?%OD61NQ@Da<~10f~s(k{7 z;)3E>l7cmHeu8|v0D!l_sYy8}us>Z%UH)~k42|gbtU+l&fcOtI1*55Fo~A&9ON`2vvwXfx{kOP#?#_ySoy`#)p&9x4 z|NlQY*xaM`%j>`Im#q@_>i_Ue7k=_QH6bD4hku{)43EGy%QXJY?{AkrTExc2*7jZA z-uT1E0^=2$UCAvxiVh_l3eBIV=OuKU^yr+JEb@}C;?o<^!)uLy>u+Q=J-JVv^MvPz kKk6b!p12&;fIEeYVZEqY48y)ln;3w=)78&qol`;+0BS~3l>h($ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetfox.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetfox.rsi/equipped-HELMET.png index 434f94bdd87fb2a1f8f825b922872e6983df03cf..f47319b50037e989201fa8b3b4ea8c6dacbdfa02 100644 GIT binary patch delta 645 zcmV;00($+p1*-*+F@I%AL_t(|obB4rYtvvD2k>u)+KjG2i!O>*LJJXx87RFBgx);t z>~5ZV@wD66wI}}wFFkqN&OLY*b{XyvVOW^dUo8ExmZmFBMSVR;vTSzPH#RB5?*{_O z`zCqb_sRQ`!}|jCe@ldUs9@&A*|J^hL#TJnI{w_GHx`RU;eQ2R-zX!mXZ>S+qdc}z zQSjmymY4kFU*b=k001y_O{fd0v32S~3Wlylngm1FL|)I1t;_4#Q1LH?X~>K6=BevF zYZG^FErxlO6g7R4{I1i-H8qW{(;r(uDd_}!Ic%aYro}W(G3qz}C{LyrVOiFN>kknT5fKp)5fKp)5yfX}`vZXZ z_6STfzVzZ~!OV%gp2h0Z5-ODnN~IEZUT=BTBI+a*%zvCHEH427R-UZ+<<;#^a`PsiM{H;K!8=zBz|*T^EDl z$)aUci=@E~5UKej6h*Zowq;0YvZJ(w#ayf?g$U=-NwFU#n$<=YV}6qsN2KP9r~)ZKg}oD-R6;z@LV)A4B>tP^&i*hOUX=oS&tmZqGlT#YiL~A|fIp fA|fIpqKo7gWqJm6udqpp00000NkvXXu0mjfPt8Cw delta 659 zcmV;E0&M-O1-J!}F@JJNL_t(|obB4ZZ__{+2Jk0UOI*@eAp!?ff~-UeqQV_e79^x> z44vu5l!d8V)io1;1WP8icJ9E8#8SavBm`1W`KW4~kPoM65(FFrvg?2=`P@3C;`vFI z;ydTwyEk{va0k%;EfM8QWuqYeEZZ^PM{4V=p)RBX>(qr5N_sBVB$V`=DC+sZx}u(s6n{2KM;_NUChlLE z8@PT=i_(-7HGP!)j?>2_HI0tb53CPMIsu>eZM@t4613i?vILr~w)fdTcz?N!&=$P`>S60_EtSoe5r^1gWuk&!*YPDD!h9DXzYH9Z6>(!fytQud)fHX30Qsj2rr*+ zquFZX$Av7uIr|umMi>l_HZ70YK0h)40f^Lm5{jZ=UP%G~u3XOI&b<|EK7AsU0I4P5 z^nY(bH-B4gyneffTSgX*4=rTWx!4Bn=Z{g+b3#!Rug={rcl#KY)Daoia5Tp4n~UC= zf!;7mD<{(%0$)2l3`b+HPfQ=gT^4|## z83YG$5I=6HPOfoMP@*=c;BpUSNG`d1;BtT<2!iluJkF!(WMrPt=6cP_)oFV%&vSDt zUX(S)YIt8oSzD!kDgXePicJ{!)>s($$W-hs(RF*55Fo~A&90}T^peARY&{l9qhT+BZAX^}ohw6<*D z{-1xd&Gsep93vgY`ii|@ZM5oI#g_mC0l@ kA8u`(@J9pg7OoA94ED(?8{TgF;luz0p00i_>zopr0BlQEJOBUy diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/equipped-HELMET.png index 5d892b8cd37f134ac8af9fa1bcdb2fecf1013206..93b085cdf47f9901a46dbf4b539e6893f00afa80 100644 GIT binary patch literal 600 zcmV-e0;m0nP)Px%5=lfsRCt{2+RwL6XjDJ5Lj?X(E5<0qA- zDdIRjYLDX>X`147{G=V4-+2$n&-UrM z2zj34{`36QQ_u7KGtcI>mCO4hlx^GH<|2ep^&;G2 z@`w4;GIB}g^VVneBJVzG*DjjbT4P;*hBJc=TSmdD{y^n_9ZSmY6ba-nCD zvQ&^FAPPh%pd62~fDkZ1Fre6$5S~H^A%sUlg^+|tNKA6?Ub;QI|J(gzW`4h!-}AZlmC?ksM0q*r+5@P42A7yh2+3=1r&+Vq8QCb?}Vm0Vp6Z=OtE90BjG z4xT4w7KOwe`1+ZtRlW(3V9b)=qCmK5Lh%>|o<-dsnP9K)wuth6=S z=INT+Bm~^{>wwdp>)7K=RoI$PA0vJ`LO+8A;RlAhgs{}qHir`@gtFO%g@xv;^1d5A zCB9|3`&KXCC+sE_Nvne-vz2<2GyVlXGpmh}TN`%6KQ zKpt(EWcMvnzn-P&o{!N_%RzH>(v96sQt4M5raFAcuqHZ^k-+8#`F3;)DdbQT-5=Ep8J?0p)fM@^fLzs2S#)>|BmapVH+RsJ_M_7Xd^ro zi5fOs)93b}UgD`KUIW)*h@tw$K^p_h#cq4#>HJ<|bpnnv(s znt3U4>HuoMw{*^%r|MDTM>HltbH9gW1#-8T{KcdEZ({o!bU-d$u_KQH`N61!y#j$~ ze*Qs1LW1!1>(}S=o*O^<cr(CLh@u+ErN-zO!5+(bC}xr|Bxf3ndu;aT(k;G?sCaR_DJsJ-@Uz=43#j6| zew&iu5#jAbv$T9}qRK-TWle#i%8+vyZ79^F5Oa=c35LEmgoP!0k@3o8?&=*#eOIis zY_L_7pP}xg5<+C$INJckZ;1?(K0_)%-0&w>Q_`Q#6jCI+Q383P-Rajz7FxC2@3HfD z!`MHJE5t_9A-Z>-koW71t5@-%SCmX?52X+(gv=K&XBk|NUz@<^QlMejJ;W@(J7cDY zlF1syW*prF3~mS9oq;{uFzIjQ^x``|QAE(3-gzUopAt+rZ|M=FrVr~EygROr&b+#g z@>RRWQ9O$Z`bVs&nR-PY*BVBRY4kTpvl%p}L4B9?N!C5fG`9J2W|zYL756z!oA4>K z!&Wr@5T>SAt!H^B(@ssmUi;5eCpdD)f5NU|8AGiRN(u2WHfdQr zK5g{~eksF!)DET&u56jsBpvP@x0KlWSS|;bmo2qhFy0ASnv~X6>uc=-w^ogyd6Jen z1H<%mH0WsFImy|?N_JCM3=kj5`QOfx|cU-0V zS8zw_i5=WG>fieC4-|s5IXaCA)*7YjbB_aQr~d4hu*AWe?x#@ejZ(ZJXOG8!x^IV} z%Y9tAf~gU*$PgE0Hxgwxwio~D2Ert;ZZq~TAS?qX@|~aZ#=WM{PXXZJde-If>9Ftr E4fCP|ApigX diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/icon.png index 5f2d95097fd72280e12ee0ae11d5842a5ac2feea..7f45aa5df00a5006617567fb021c83c870399fcc 100644 GIT binary patch literal 258 zcmV+d0sa1oP)Px#yh%hsR9J=WlQ9dzFc5`bMF^*gui~Kez^53rsv;fC5GMsqsZGcr zcpqeWxx4ouIe=jphWU4jl%}rh{HLb1PMWotTd0)sPjlxSs;YV&=iF$htN{Rkh`hBH zQpz`7N(pN%h$uS5GPVH#j4>%~c>)L_FkJgUFV}TafZ0!Ac3S`#HJ{S61vngU#j3bZ z)_l7kBYJh(ruOH{5a_fiu|M_E^OAPAZR+5+rU<&qhaSW-L z^Y-rk>_-U<$37k}QecTa!e;eCA!WsDQJJT04Tp7G>~~yVQEOOduh5oIb5Erur9xhb5oi~~25+uNvn;dOo9|!$ z`unfX|E;foR(Jo~a5wM#yu*`K0(Zvz`{+68$@=D~<$Ip#*D$G^-1at7#C27O*8Vl? zL$taUd2Gwg|Dy23@W1c0MxOS=IfA6z7AMO1wsQlgb(6dphFTJC#|K9tc|NXngSESRcH{H7W zXDNI1`s?YxFFQ=SqUCw__|ISYVX=+^Ie!8T@_%~YXa2Ulk#EhMdeVVra z3+Id8(25!VVx}!=f0?FV`w1K0{5HTlXnnFYWy*9Cr7=&)W+>Y_! zi;V%^$y>dGB-*StCYA1vog1-nUE9hi)!Z)%f3)p+4u_xJFSRWDcKt8Lw$CrwCC)9E z-;nwf;tB|PyRoj}VGTk$!J__Y-GOcA&!3-U|H7xF(!}ihzXqGLKyJNt-KCelQ@^u6 kQJjy^lM`tNF=*TMa*Y>~*VDBAwSfdYUHx3vIVCg!0H?M-ivR!s diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/meta.json index 800c048fe37..a4e7528d4ff 100644 --- a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetmodif.rsi/meta.json @@ -1,77 +1,18 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "taken from BigIron github", + "copyright": "made by BluHNT for N14", "size": { "x": 32, "y": 32 }, "states": [ { - "name": "icon", - "delays": [ - [ - 10, - 0.2, - 0.4, - 0.4, - 0.5, - 0.1, - 0.3, - 1.5, - 1.5 - ] - ] + "name": "icon" }, { "name": "equipped-HELMET", - "directions": 4, - "delays": [ - [ - 10, - 0.2, - 0.4, - 0.4, - 0.5, - 0.1, - 0.3, - 1.5, - 3 - ], - [ - 10, - 0.2, - 0.4, - 0.4, - 0.5, - 0.1, - 0.3, - 1.5, - 3 - ], - [ - 10, - 0.2, - 0.4, - 0.4, - 0.5, - 0.1, - 0.3, - 1.5, - 3 - ], - [ - 10, - 0.2, - 0.4, - 0.4, - 0.5, - 0.1, - 0.3, - 1.5, - 3 - ] - ] + "directions": 4 } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetold.rsi/icon.png index d5b0c39ced5f728feee40f642459d2ee84b123c0..5f1019c5db42cf8d9a70b90898610b1e41eef55d 100644 GIT binary patch delta 210 zcmV;@04@LD0s8@vF@Lp5L_t(oh3(X_3c@fD#__)*BD7XqQV^Foba3g?_kRLGbP@+$ zq+*s*`T%hgv=y7fLGXT%8Ml_?0)p@z=n6ZYZ@)1irIb>k?# M07*qoM6N<$g5P#wPXGV_ delta 182 zcmV;n07?J*0p9_TF@Kp!L_t(oh3(NX3c^4Th2dYZON^x1fY`($g-x2={{#WiN-VSy z!89S{0Ba{`47$^3@xJo0J2N{AA|mo*6U(KlT>ICo-knUfW|rnvxuNa)N0u(;0Nygh zG~{rRXFiFer{(}{*OSB%MV<{d^GWaq0Ji(XAX_b+rPTKWI4|csz~$O-Jm21}I{5Vv k_yxdN^U+*HL`44H9R_kF>M5qAtN;K207*qoM6N<$f)fW>0ssI2 diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/rangerhelmetprice.rsi/icon.png index f927a27005a128bce39707aaad87d387e20f716c..9a7ec30948daa6641e37547792adbb9cf6045cbb 100644 GIT binary patch delta 202 zcmV;*05$*F0rLTnF@LQ|L_t(oh3%3{3j#3=gh!Fx`U(n_A}IR*f0d{QMPa4xqqlkx z1l^UkISJ-FhBPyi1`q^65dNJW=h1e(@SnBa;li3V;D~QlOVo{f)kZ@F0G?x_pVDkJ zd6j2x;s8)L4l2)JG_^JpB6$M^pJVp@!00001KIrN1jz=FFnmL&?QFkL7!NxNtst@p-rZ5HB$&_EO zuDG2{mX-jmuYXHkSD^k&)Y1RUDu5_rb0cG14vCT`08!FpTn^dX$OxmzW;$!M{_)8f zv&j^I*<{M`$ysfEs|2h#ia|M|yVV8Y<;(8?=x%ixlp|Ig^;g61OuyfEj!(|;JP&w( z4tSo&@yQwee&4$KtOs=3Ev0w;`sS9#T4<`^b#HJluYbcdO_fdpKvh+>7JsJz(lk|n zz83^R5ClOG1VIo4K@bE%5Cq{LO>Hxw({3riSY-FzBcS^O#^n&8wkcy}jcGdVmRfav zV~WluQ=U9NxHog;$>Rg1b)%%os_UB#vBf$8d7dl1>pJ_oM<5J>r6(Z_0yQW{xPkwN z7^0*}o`2`o`qm8+07)Z;M$Cg17?dO4JauVzG8)f@gi)lH<#@}1gfzX0`IMHT@kG$=JeGm>uJW((a}du!v6lgy6P9ki3W_eu7c~E z+vWBL06f~;W3C+L$}ytja!4zQjdkAZ^=zm8TYq}Jo>_b=iH$oAn0OxT?OD%TYnKiV z76)EYEE=WW&Zb=7-10^KCF63)Tsa@zuGZxrB~32RFKDcVth$SHAj>iU4i68lHEX>E zilU$>3bHJtswxx6<@v=@77vT&h`Dl1Gt{cpG z{7FPXRCr$Pn%hc3Q4og5ASCU8rF1q5qMjhA+g_vRE$9h~Ai>Ubu#-kt#<$rc-UO~y zODO*jWLyi}|IDn}-u%mi7;Or93}$nCtDAqdvy;>4=fv_``hUScM7UO&vCFI5e8+5M zdBN^mFGFcWzdpJiWA(@KI55}Ei%hIon#k5f*6a@h*KanPS+T^Q=m#}`?$1@L_Pk%T z;=x*0Jdri~{bQK|*Y}gAa9|y)A2c%MQYlM-!rxm@w!X1$jq`?0R%Y$9^I?w<57zE< zlD!75?<0>UxqtX85u+b80X!UWil=BGvSvSJ@!Yg?mlS~ew*NAy$KZi`qsATsd8@${#x-u2qA-F-xt6qObr@-Cjo78fY?_s_(z<8 z7fRPT0V3cMb6+5pNy?a0FcSc-?URUEoAiDFAV7g$B%&nX7P+5D3cPr<&_o+NpVapg zzJ-%vGCTNZj{P$l1fGosS}Ap+ASpiiG8x0t5kd$dgb+dqA%qY@h<}LL7au?`LX=gZ Qw*UYD07*qoM6N<$g2|Hz%K!iX diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/equipped-MASK.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerbrokengasmask.rsi/equipped-MASK.png index ed308530a16a856007aefe0feb3cbbc15693cc7d..d54ffdd9c0b85e76e72e4c94416577b0fb15143c 100644 GIT binary patch delta 604 zcmdnY(#Sf&pq|Ov)5S5QV$R!H8@nDG2(;D9i+5<3ZhGhtw!7eHs9OHS^s~_|A>lGR zws>%Oyt^XN$Q>)_Hv8@)hg(Og@0?|4yshwe@x?PsW-v-T+rLaJcEyygFEw`ayTAX; z`K!P5ks`~5_xEO)zW8nT@1<>f&iRWEx8KhF<@P??#p(X{ixSPt>N78yKbP5Z&0?+@mw)~7^L2;({ql@`oHG6H74PT2V(Bs|+9AMnuli2B$GW;QE{o?6 z*2z6iWnk!;&iL-t!#St#uHsN+*>a76;k_+`LpHCX%f-4#J`P2P?B0(?D(9=~i`%YA zDYhsn7kzoXtId#&;nKoh!xixb>zTW?bTa>&iws%UK-n@&6gZCMKk3d7Fejft*$OQS;p`|>X%DsXnq>o zlpy|crn~QaAG3yj-SrnJdBTrz7W0BV=EoMiwgQIDXB+#i-ZD-HY|cyQGw)jGZSMCi zK;_AY4N5mmc;^&{W~M#3$QtM+nVEm7%0*DeXwspHTmlW|=Kt5!H~&_uuCLhi(D>L_ ohC4Ewo~^iZs|wY}f2{wo73sy4Ejd^AjsXZfUHx3vIVCg!0IG}~2LJ#7 delta 526 zcmV+p0`dKU1+xT@FnwoW=6g922mr^3nb5y4W z-+yfJ?Q4!tpCz{2Et;lz=t;PTk5fBTRfX!*V1L{J!0+!bsHzG=hm%}Qm3RCHOE z(YRJ%?Yv+R5;37JVZ5HHV=Y>6$kHZB0&6XR^@9*LpJf@s+)IihCg%pnthK}Di=sgO z@`^PJCA8K)e|bew6mRBUVo?BsD2m?H46G4^Fy{WaLw|K@5JmSnXo~}2twoxq*dKT3 zx^C4hv2zYx*I|F$Ax+c8cORG;0Aq|d#`wCfBO%1FkhX0R$MGsb2=xeU+XDC%cp(Jp zx{ktn=8Sunmta_6u-1!koQ4lY84s-xyCqbMJ?nf#L_|bHL_|bH^gMn7?P2)v)^_Oh Q00000Ne4wvM6N<$g8k$7Q2+n{ diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/equipped-MASK.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerdesertgasmask.rsi/equipped-MASK.png index 7ef0d6da36fa6bcc59c470a07ee95e0719eb255e..e9333e20e214c4329ff3ce9f5a4ed5c52f1e80ec 100644 GIT binary patch delta 615 zcmV-t0+{`)1dIicFne*egnc2r6I5vgPS@Crz8bhK#Zjp?R|hDiGcLq9m(_X6BOmYW|8}%bFP#7^ZA_p zojstZfz@i2rGKB@1E8w5Cp7uvR6 zh}Kt=&&FEYS!=tW?-fN+6h%=KMNt$*Q4~c{6h--~`O^7-q9}mgn4J5Jz`gXdUJ^fE zoLX^e=5lAmh!KlS3Ng7o4t?cA2*el%VR38caEL@hG=GbtAjU`tVIF&29AXhJilX-j zPc65XcG4nPYrES^3#XP4!lxK=-RZ0&GBHMCjDz4}vEX)q_1;p~HDy`ey$EGlc6D8| z-dk>mUK9EWk$7?#T>z=HBp*Uxx7)GaTfFyNE|*CTOEgWx<#NG$&w6j!?RJAZE%C^< z7{lF~;9$pw6hgRrL$ua*-uqu_!c0vN-nT$e6hk0YRRK(rJoNuCGUHWMv0N@mDGhxf zcMIGF=Ug}EQMtMG6h%=KMNt$*Q4~c{6h--W_yJ{bSHUMF%lQBR002ovPDHLkV1m%2 BCkp@o delta 517 zcmV+g0{Z=o1*-&*FndRS{p)AYW^skf(A`+BR{VSGl(SM%jpMUmq?fIgVQo$G#R!zAJbX6UYtR2>bcNvosI`W34#4dX!lis0TcPVZ zSZe{GpS-me!+(E;yC)(+M8f;eL_|bHL_|bHL_|bHU)iK6D@M^}Sti4%Z0%eyia|__ z zn0$&^3lM+$Ns^#F0GqwQS_@;$;)`I63D#O{_Ja0s>3(xKhN)&P0B}i&i=x10FVI?} zX&QL%=QjI+_a05tKx>W7UQiT8zwPE&>=2B%L)N+|F}$1sT)z1)aR@r+kfteiyB&_l zBf73z?I0A9@V+mt_3dtmT@!DM-D`hDL_|bHL_|bHbU*$8$uI%Sud%wM00000NkvXX Hu0mjfm)!bK diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/equipped-MASK.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/equipped-MASK.png new file mode 100644 index 0000000000000000000000000000000000000000..1bbf0e30ac83eec82f98a8461779bddf22b9c104 GIT binary patch literal 1711 zcmZ{jeKga19LIlBR@7bHo+Mh2oNGx5bHjEsc}SY1BoE7DO^d6Wr`ZGD+eJkhay(AQ zicG|cn?jCiSBfcJy00=c zF$4f$m8XZRFKnMJ?&SvX={rnDz((&kUw0Rvw%Zg000WYz>p{Py64^-4`L)TW>Hj7& zc5Z&TeG9Wb^fh^P%FJpf*Qs`|jXz~1tqF2o2eD=vd6Bvm)*;Z=nkMHBOWX0+T*|NB zYH-+@cZLI7wHkV}6V{{eF>D=Gz;4SEop!EQN-F>Rh?1Jcr<|e6v zGS0hAz;)8uiw>tADUH=7Hc;Wq32j6T-;rh}=N;r%viulMuS>mqS333dP6{t*?8d6c zpHQgv_kzOSCk6)QjydSdP*m*=iuU%NRHi&S;joGuD!uzp zG>PPiS>>NdEPXqb7uL4CSz{sp;;PPa8#|?7J)K)C!$uB` zHbow_nM!Lxu)h+BO*51=Uv-ltU_xvUh!AO54SgO@1gwiqMCTZftvol&teeK%Sac>0 z{?Tu*j7?H~J|Ui^(EIZNV_;p(yLixjHN|E)bZ!u_&!m{nYq!urU~hU%rEbn87^rYS zVGlDDlZ{)5Wb+1Ws$4xwBj)DjQgqrDa|;XMh#T&cLeDJ@OU+vhdeUL<;7%0F-HR%4wGfyyT+)%r7i zpE`O8i42>`w4HVv%f9k$S<)v})Q^OTXY?&khUv}&G?ixBU5oZ9k}SrezRh{j`+Uqp zs(*w)@M79yFbM39#eC2X*(FeL=UJSo_~OsWW$#4TDliDH&OuQSqDK9%Dzkg(o!=EH zo0_T;Mk}Vdt*u+68Dtft79#CT-!;^PP{sJO*p&Mxk8^|q4!U+r$N(RzRP04=dZkn; z>k2MOgUsu-!^0)7#5S63DO!9TGN&`*VdOw{$*{1yJKONe<$0y@#CdvuOC&KX?s)#; zU5!E)ZC%^vgyTISj+qKG-pwXei8jYscbizfyUTEXex5Q~K=tPy7YN)*T@T`EPiybo z5OhUB$N>mMR-?eJR$Y_9p~SXv@}@>Z8HJ1k;C2U*nhhRIb8~asefzd`HBdyba!3Cn zz!cc((W+1D{pL*mwoHRSR1@~Q452mu%QdzrDt5V_()g9Q;Z{KbnEqS^;QMe6Yv-P4 zu00SxnPzSnX=H+H#%Y>4lsV;_=$Xm4Ssv?v4)LlykAqav(S-j0;CU`z5hy&=`}V z?2NFfZ_$_tu~Pk&o^3_`eA?9S_KXFa?M~f2*ovXWfdJdc(KYJv#6V_5z)5-1$GmxM z;x1>F^99YrQhA(I|9g~vxqb?jO0QPmOfb2#Fa!0DARplcbAw>7JQ3GN=7R)jbNrqP z^*gWVN2jZW(UuFfC$SMHW`mQRUO?^^0KuwBOJT~Qd*0AR12r_uA51`8E&Fb9H>ESG|(j?5#dI>yW(Ab0y3M^+! qxV@DOazDa@f_0>+YLMUVoZZ2Q%K?*((@f-x0iK7By4Jd!x%?jztw`Je literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangermodifgasmask.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..7a79497c0770e7ffbf6e3334148ce5f902ea6169 GIT binary patch literal 644 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-HD>V6yXcaSW-L z^Y*Tx_u~Ya;~(eysg|r^Jea1DQee06GjAi`b`Ci{zI_vBzc010+#r2CJWzw-)tf_d3|QiE}MESMxa#;8$7ply?bGCE@P8y zTjImVIaT{F^z}XN=`pmg&ohylx{u@amGgTq&;Mxjufz9U{_~%yx3{?;li;m#t}RR6 zx;a9ey_0S4!XCp-xz%6ZFBUPk{JHsXpWnB&Gyi?bO`KVK{_~Svd76J?#2qHxid>_A zzwX84{MDcTE$&+%y~{W5>bXaI+E1O8SX?Id`qjh8=iguY)ZeRrX7tNZ;KcX8LBDq1 zGkPB-RXY39^)naS-xfUE_+RO+%2E3p<{RT*7$>Ons(RjCcBNj@{{P(~t=;VFgYCcT zW~lRS&F7-BGz!U%6npo7U97QcOa0Fo zQ_KFHVZU-G-EP4%yU&c;*VtjM0MY-LKQo$spUJ;s=lL3kvwvHkGl$jI)=m7k!2HTl z$DqI8+1EV&^+)ON?I)qfudfZ-XTM;|&xX*r`SDBYtG0iS{{JPfAIN_T^@-?fW{BAu ZFL*-=bcFrH+HZjbJYD@<);T3K0RX9V6yXcaSW-L z^Y*Tx_u~Ya;~(eysg|r^Jea1DQee06GjAi`b`Ci{zI_vBzc010+#r2CJWzw-)tf_d3|QiE}MESMxa#;8$7ply?bGCE@P8y zTjImVIaT{F^z}XN=`pmg&ohylx{u@amGgTq&;Mxjufz9U{_~%yx3{?;li;m#t}RR6 zx;a9ey_0S4!XCp-xz%6ZFBUPk{JHsXpWnB&Gyi?bO`KVK{_~Svd76J?#2qHxid>_A zzwX84{MDcTE$&+%y~{W5>bXaI+E1O8SX?Id`qjh8=iguY)ZeRrX7tNZ;KcX8LBDq1 zGkPB-RXY39^)naS-xfUE_+RO+%2E3p<{RT*7$>Ons(RjCcBNj@{{P(~t=;VFgYCcT zW~lRS&F7-BGz!U%6npo7U97QcOa0Fo zQ_KFHVZU-G-EP4%yU&c;*VtjM0MY-LKQo$spUJ;s=lL3kvwvHkGl$jI)=m7k!2HTl z$DqI8+1EV&^+)ON?I)qfudfZ-XTM;|&xX*r`SDBYtG0iS{{JPfAIN_T^@-?fW{BAu ZFL*-=bcFrH+HZjbJYD@<);T3K0RX9WiYH7@=Dg#6d+a$hvYOmg40ZT38$ zt^XxgJf#HrJqEJ{P18(&dS1ff%*o;phr>K3&s&^?rfDYcJ%7rwoX5JZgS8fy%Vn|t zq7z_@nUqpE#)#Lp1pvIZEsillDYg1ZFvd(F1OPza_wTMDge?8VpFr1jcmr^D4!B?6 z?&Djal!CPuz^}zyYoV0Nnr~48QcAGa;_MvyzDG(4ec$8k9IUlSDP;w*M87Bsc<%vV zUbOcfMNwqwXMfcI31+|FV;sl19&AwqwAPd8DW&F9kWxa7aorjqLX!D$9OppR-hCm) zxD&09EU|q zD^AT;?u-~QVv$KAR=3B2Tjss@2qDbE;?{2A5Q&CpR)1B65CXjSS@!tXr7ws>3}8-z z_a4U>aRuNl=9ydZ<<0WLZ$b=9OLYR;KZnwh~!0FyIutuYV z%z1JS*SjWg+YpH-hs6nyJ^)#~_a1d!}Yzag+iC;N8xz^>6T4WFHqVF?>e59)MdywrrK# oT8|Jy2qA<2tMi}wH``ky6pE)tR8y&sO1 zQmE^C)>v~`Yr}rOAC9vuLs^!$nO{VLF(!z}@QKH_nBQ9a;(t8X&c9~TQxlP(wZ^CC zXB+{17s1E6#s>i3iULj3+%yy3!n>[aH@0sJTm;PQREoWB)o?Qa=4_w54{Gr$-V z@;pb^b!eIf-g_veptZ(kvq4o=aL%oo0oK~^(t5vk{xy>?h-=+@k2Fou_dS$S0PxSH zKQLnnc<-UL27dtbeGdT8T4VgLaQBQc!59<%{7pneL_|bHL_|bHMD#bCRmzIR$g(Vx zaj(GIb-^eWVq#yyIG(9vEebd`Dr8xPs;U62{}AHM=Xs7e_mbv__e+8q-~4Cia02jE zB&<~=6_M~**LVQ%1-~A`5|fLgV=?uUB*6*5)1_x%jel;DIObDP;B=XD9K&3T-qbi9 zyRO6ed`8>0tMm-Ty=J%DVY}T9{RqIaWj8AWthK>f8=P~AQfdgKZCj*ix=N`$_9L`y z3jnC93Q8$B=aLxDoN?b|6N~{yYi)$%GJI^xxM_#jHL+LcUgsksA|fIpA|fK9`|%Tu Xnf2Wgg$|?G00000NkvXXu0mjfg$MvK diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/equipped-MASK.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/rangerpricegasmask.rsi/equipped-MASK.png index b34ac2b562188b63ea2593693e9d6d027000b296..d12b8f27abea7e511f36e2fd2a09eea70c951d48 100644 GIT binary patch delta 665 zcmV;K0%ra21il53F@JbTL_t(|obB2%Yui8+!0~?y0cnWObdZ%rXtN*)3N0Qxb_;aL z_w3xUqe7uj0v#`z&Kip380SC%b+FIGEri^~R!aMRU~CI?@9z0@9^L~X{%c2}H)dJZ zyU#Z_H^Jk)bo^JL!L7Bp*TcySVK$rfkA3&yojJGoD2le%+<*5WcEW5n>$TQQCX?;8 z`Fu{E=TueY9skKUj7Fn=JRYNz;{EqAcfhCDSA6_=Mhtu@8``!#XcF8`a|u^U(Y7rQ ze-PjJ-jBfb^)+|EW!b>y{cdx82udmPJO`j{TLAJrM=2FF-jfrsSS*g3rlBYbE;qmS zyZd|Ew&k*1Uw?0!CTJ2*WvwNSW3<))+eK@wiQ^b+t@oHgX8=IaG+dpWaCUpkkMS57 z=HDPmlHP51_Xxl`Idxro$M=2&thFemIPE&RuH&@pP)Y@5KSW*EM=sWL7auH1l0He2 z{`b#92qAKl*heGV_BB{aF?!D z`JA_1$JgWIy&s54lJstD7i%AfV9+Gpc60|2tdsC&vnxI?76gb+dqA%qY@2qA{00000NkvXXu0mjfgQq=_ delta 586 zcmV-Q0=50V1@HurF@GvaL_t(|obB4NtJ6Rn2k>tt!==z9bO?FN+0DYEAUwR$O&1pz z|4J7Z7u_7wMUV$|OFNYeC262J$b)k*SE95$leR(Y_XDL(;O_Tp^1EcXA3#L^vq6_Z zQc9z>-X9Aguv)D;&DDic%BX!=adiQ~r&j8Q!%yc?MS(eE29MderqOJAiEn?@4XBl)I^H45roph&~RZx~CcDo&lqQHxX2YlRY&RPX;#$z*g9E?UI z42MIwu6vec*Qo-OQbs9d(li|iA@+$BMS;7j!rXDX=5y5Cad1~vD2f6AkR%C&5J=N> zVDsrR??YK0g22y`d|sF3rwet7y!Jc;0AGcG5CTBY9b(7WUY%==M?^$KL_|bHL`2u) Y2La#)Zfl+Lg8%>k07*qoM6N<$f{G0&sIV*9|$CY_MaK;PV*0-DE~EC z>W5`n2D#tw_sQ%0Y5jMp;@*46^)i?-SS%Ldch50IS5A`8^M8DJC(mQ-gvDYJm>IL# zYVvW@gE0p9`T^6%V7K1lq-g^)c zcIzzwpss5Gz<+MN1rfn}pA8vvfbqf z0H@+~T^Fq%eFVJssHzG8hUBZNy7=E0x~|Ja>#fNrW33I=+VJ{bQ4~c{6h%=KMNt$* zQ4~c{l)suc%?A`k0RV8$jXooAF8!pB#E*B*0l?r2jeq6Nh!G4v}bxW>FMy&ViYe1~rnrK_VK2i=qHCV|IIu=ezErMX=U}=erKG+iNiM zFEOOL(@7&T&N(>e2Ei=LFl`L3ZY-**!hAkIdlBaId8n!iS2q^Z#vsd1yWM*~#FIjF z0i@EBJbyD|wOXOMe*_WXcsyQYSfXuP9FIp35t{o)tX8YRotAjySj2F)CYa~>&=Z*X z>6LXF@F|GL_t(|obB4bYTPgY2Jp|N1(C&Y6vaa@DxE^{DsR>U^f~$j zS@Q~cf<8mWKEOei^L{u>skq5DCD=$wA@JoLRz-*(-@fC+=Z|=}Y=N)8(6;SScfujO9b2KQDqI$y@NoANX`15x z?j9?=M^SAdgjiyX&m8g<7*$D1>6B6^%MxK2qHWv$JBlJ$Yf;zrqB}rq?OvMfzUQwQ zU14|tDy3kp1%Gh-gYZz^jIGdh9gHym&`;hNgWrh=_=Yh=_=Y z=wCJ|%JNZkp69_ZDqA`i^n4KGl&BKXPskaq6nh|$^L&~WnS z*B5xasj*~CCZ%+bH#N?$FJP@j6h#=uZTs#yyF{7HzjEJJa-g;EMl)1a!Vxy?RPRTY}1fl>;^?G{;<^{?F= zlNLa0?X=deuIoSuf%SUb-wtWpcJ`q5@of+Ltm``P_gC63n2v3G{t7KLDzMQ z9fVR!_b;?BrPT3mi0$KVi=AqJL_|bHL_|bHM07fS1M?*Pj{r;wZ~y=R07*qoM6N<$ Ef=$O4UH||9 diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/icon_on.png b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/icon_on.png new file mode 100644 index 0000000000000000000000000000000000000000..772250d948cd6ebbdf79a3fbde82c509a33f1517 GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;4e=X$B+p3WC_;A2_ijBfd*V`QU*?$ix|ws zuh(k`GuQn6)~m8Pp&`S!sHjL|+Wy+lZH^HxET@_q-23GwzTsG8(on;<>CJ+vW``$A z3zVnau{vVle3tLbwu=cV8|=$O-)ICmH)$N5^k~ul$eWguukQV4`TYFl3FAF=|0gLC0So#+T+z6WS^u(9x-``8v)&BD;;xKT`Y+?{$Qt;lu zIAO=4NlMJ}`sN`m6%JdN6CAlez1{5Ie=tem*T22L6HYrmdcrWNiJQeCkdZ5ELcXI3 xhsVj2P0kO0p1!U!+nmeopa#gN4UEjp3@iS`-S2nY0SqDr22WQ%mvv4FO#plPhr|E? literal 0 HcmV?d00001 diff --git a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/meta.json index 066b906bab8..81c4fdbc773 100644 --- a/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/meta.json +++ b/Resources/Textures/_Nuclear14/Clothing/Mask/Gasmask/riotgasmask.rsi/meta.json @@ -10,6 +10,9 @@ { "name": "icon" }, + { + "name": "icon_on" + }, { "name": "equipped-MASK", "directions": 4 From 78c84ce1665edccc76d7c7cc1194368aedf9765e Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Wed, 7 Aug 2024 12:05:58 +0100 Subject: [PATCH 11/15] washington access tall doors --- .../Entities/Structures/Doors/access_tall.yml | 108 +++++++++++++++++- 1 file changed, 107 insertions(+), 1 deletion(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml index 211191bc697..ed75034049d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml @@ -69,7 +69,7 @@ - type: Wires layoutId: HighSec -#MARK: BoS +#MARK: BoS Midwest - type: entity parent: N14DoorAirlockTall id: N14DoorBunkerLockedBoSMidwest @@ -132,6 +132,112 @@ access: [["PaladinCommander"]] - type: Wires layoutId: HighSec + +#MARK: BoS Washington +- type: entity + parent: N14DoorAirlockTall + id: N14DoorBunkerLockedBoSWashington + suffix: BoSWashington, Locked + components: + - type: AccessReader + access: [["BOSWashington"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorBunkerGlass # needs replaced + id: N14DoorBunkerGlassLockedBoSWashington + suffix: BoSWashington, Locked + noSpawn: true + components: + - type: AccessReader + access: [["BOSWashington"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorAirlockTall + id: N14DoorBunkerLockedBoSWashingtonScribe + suffix: BoSWashington, Locked, Scribe + components: + - type: AccessReader + access: [["WashingtonScribe"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorBunkerGlass # needs replaced + id: N14DoorBunkerGlassLockedBoSWashingtonScribe + suffix: BoSWashington, Locked, Scribe + noSpawn: true + components: + - type: AccessReader + access: [["WashingtonScribe"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorAirlockTall + id: N14DoorBunkerLockedBoSWashingtonKnight + suffix: BoSWashington, Locked, Knight + components: + - type: AccessReader + access: [["WashingtonKnight"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorBunkerGlass # needs replaced + id: N14DoorBunkerGlassLockedBoSWashingtonKnight + suffix: BoSWashington, Locked, Knight + noSpawn: true + components: + - type: AccessReader + access: [["WashingtonKnight"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorAirlockTall + id: N14DoorBunkerLockedBoSWashingtonPaladin + suffix: BoSWashington, Locked, Paladin + components: + - type: AccessReader + access: [["WashingtonPaladin"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorBunkerGlass # needs replaced + id: N14DoorBunkerGlassLockedBoSWashingtonPaladin + suffix: BoSWashington, Locked, Paladin + noSpawn: true + components: + - type: AccessReader + access: [["WashingtonPaladin"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorAirlockTall + id: N14DoorBunkerLockedBoSWashingtonElder + suffix: BOSWashington, Locked, Elder + components: + - type: AccessReader + access: [["WashingtonElder"]] + - type: Wires + layoutId: HighSec + +- type: entity + parent: N14DoorBunkerGlass # needs replaced + id: N14DoorBunkerGlassLockedBoSWashingtonElder + suffix: BOSWashington, Locked, Elder + noSpawn: true + components: + - type: AccessReader + access: [["WashingtonElder"]] + - type: Wires + layoutId: HighSec #MARK: Oasis From 55301ca9a0b9d5407256bd583b37a2f82f01a616 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Wed, 7 Aug 2024 12:30:14 +0100 Subject: [PATCH 12/15] map ID fixes --- Resources/Maps/N14/MercerIslandSurface.yml | 7 ------- Resources/Maps/N14/sunnyvale2.yml | 24 ---------------------- 2 files changed, 31 deletions(-) diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml index cbaed53f784..1c6f1db0de2 100644 --- a/Resources/Maps/N14/MercerIslandSurface.yml +++ b/Resources/Maps/N14/MercerIslandSurface.yml @@ -22293,13 +22293,6 @@ entities: - type: Transform pos: 75.74445,104.84219 parent: 2 -- proto: N14ClothingHeadHatCowboyRang - entities: - - uid: 4878 - components: - - type: Transform - pos: 39.411575,108.78152 - parent: 2 - proto: N14ClothingHeadHatDeputy entities: - uid: 152 diff --git a/Resources/Maps/N14/sunnyvale2.yml b/Resources/Maps/N14/sunnyvale2.yml index 529b17a904f..689a436aead 100644 --- a/Resources/Maps/N14/sunnyvale2.yml +++ b/Resources/Maps/N14/sunnyvale2.yml @@ -192308,16 +192308,6 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 -- proto: N14ClothingHeadHatCowboyRang - entities: - - uid: 236 - components: - - type: Transform - pos: 201.46167,-28.726448 - parent: 1 - - type: Physics - angularDamping: 0 - linearDamping: 0 - uid: 65250 components: - type: Transform @@ -192448,20 +192438,6 @@ entities: - type: Physics angularDamping: 0 linearDamping: 0 -- proto: N14ClothingHeadHatRangerGrey - entities: - - uid: 46585 - components: - - type: Transform - pos: 201.66013,-25.606407 - parent: 1 -- proto: N14ClothingHeadHatRangerGreyBanded - entities: - - uid: 6832 - components: - - type: Transform - pos: 212.69199,-29.400425 - parent: 1 - uid: 65209 components: - type: Transform From c8fa19355567f2fc041a1a9d9c4fac2c393cf3e4 Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Wed, 7 Aug 2024 12:40:38 +0100 Subject: [PATCH 13/15] door access bandaid --- .../_Nuclear14/Entities/Objects/Misc/door_access.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml index 42bcaf31339..7b18b4f1b2b 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml @@ -83,9 +83,9 @@ - type: entity parent: DoorElectronics - id: DoorElectronicsBOSWashingtonInitiate - suffix: BOSW Initiate, Locked + id: DoorElectronicsBOSWashington + suffix: BOSW General, Locked noSpawn: true components: - type: AccessReader - access: [["WashingtonInitiate"]] \ No newline at end of file + access: [["BOSWashington"]] \ No newline at end of file From 854e94a45d52e18eeaa6d9ae67e07077b703365b Mon Sep 17 00:00:00 2001 From: Peptide90 Date: Wed, 7 Aug 2024 13:26:14 +0100 Subject: [PATCH 14/15] more access fixes --- .../_Nuclear14/Access/boswashington.yml | 4 + .../Objects/{Misc => Devices}/door_access.yml | 0 .../Entities/Structures/Doors/access_tall.yml | 80 +++++++++++-------- 3 files changed, 52 insertions(+), 32 deletions(-) rename Resources/Prototypes/_Nuclear14/Entities/Objects/{Misc => Devices}/door_access.yml (100%) diff --git a/Resources/Prototypes/_Nuclear14/Access/boswashington.yml b/Resources/Prototypes/_Nuclear14/Access/boswashington.yml index 6eeabe92811..c02d2e82287 100644 --- a/Resources/Prototypes/_Nuclear14/Access/boswashington.yml +++ b/Resources/Prototypes/_Nuclear14/Access/boswashington.yml @@ -17,6 +17,10 @@ - type: accessLevel id: WashingtonInitiate name: id-card-access-level-washington-initiate + +- type: accessLevel + id: BOSWashington + name: id-card-access-level-washington - type: accessGroup id: BOSWashington diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/door_access.yml similarity index 100% rename from Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/door_access.yml rename to Resources/Prototypes/_Nuclear14/Entities/Objects/Devices/door_access.yml diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml index ed75034049d..fbe82386235 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Doors/access_tall.yml @@ -75,8 +75,9 @@ id: N14DoorBunkerLockedBoSMidwest suffix: BoSMidwest, Locked components: - - type: AccessReader - access: [["BoSMidwest"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestGeneral ] - type: Wires layoutId: HighSec @@ -86,8 +87,9 @@ suffix: BoSMidwest, Locked noSpawn: true components: - - type: AccessReader - access: [["BoSMidwest"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestGeneral ] - type: Wires layoutId: HighSec @@ -96,8 +98,9 @@ id: N14DoorBunkerLockedBoSPaladin suffix: BoSMidwest, Locked, Paladin components: - - type: AccessReader - access: [["Paladin"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestPaladin ] - type: Wires layoutId: HighSec @@ -107,8 +110,9 @@ suffix: BoSMidwest, Locked, Paladin noSpawn: true components: - - type: AccessReader - access: [["Paladin"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestPaladin ] - type: Wires layoutId: HighSec @@ -117,8 +121,9 @@ id: N14DoorBunkerLockedBoSCommander suffix: BOSMidwest, Locked, Commander components: - - type: AccessReader - access: [["PaladinCommander"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestPaladinCommander ] - type: Wires layoutId: HighSec @@ -128,8 +133,9 @@ suffix: BOSMidwest, Locked, Commander noSpawn: true components: - - type: AccessReader - access: [["PaladinCommander"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSMidwestPaladinCommander ] - type: Wires layoutId: HighSec @@ -139,8 +145,9 @@ id: N14DoorBunkerLockedBoSWashington suffix: BoSWashington, Locked components: - - type: AccessReader - access: [["BOSWashington"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashington ] - type: Wires layoutId: HighSec @@ -150,8 +157,9 @@ suffix: BoSWashington, Locked noSpawn: true components: - - type: AccessReader - access: [["BOSWashington"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashington ] - type: Wires layoutId: HighSec @@ -160,8 +168,9 @@ id: N14DoorBunkerLockedBoSWashingtonScribe suffix: BoSWashington, Locked, Scribe components: - - type: AccessReader - access: [["WashingtonScribe"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonScribe ] - type: Wires layoutId: HighSec @@ -171,8 +180,9 @@ suffix: BoSWashington, Locked, Scribe noSpawn: true components: - - type: AccessReader - access: [["WashingtonScribe"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonScribe ] - type: Wires layoutId: HighSec @@ -181,8 +191,9 @@ id: N14DoorBunkerLockedBoSWashingtonKnight suffix: BoSWashington, Locked, Knight components: - - type: AccessReader - access: [["WashingtonKnight"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonKnight ] - type: Wires layoutId: HighSec @@ -192,8 +203,9 @@ suffix: BoSWashington, Locked, Knight noSpawn: true components: - - type: AccessReader - access: [["WashingtonKnight"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonKnight ] - type: Wires layoutId: HighSec @@ -202,8 +214,9 @@ id: N14DoorBunkerLockedBoSWashingtonPaladin suffix: BoSWashington, Locked, Paladin components: - - type: AccessReader - access: [["WashingtonPaladin"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonPaladin ] - type: Wires layoutId: HighSec @@ -213,8 +226,9 @@ suffix: BoSWashington, Locked, Paladin noSpawn: true components: - - type: AccessReader - access: [["WashingtonPaladin"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonPaladin ] - type: Wires layoutId: HighSec @@ -223,8 +237,9 @@ id: N14DoorBunkerLockedBoSWashingtonElder suffix: BOSWashington, Locked, Elder components: - - type: AccessReader - access: [["WashingtonElder"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonElder ] - type: Wires layoutId: HighSec @@ -234,8 +249,9 @@ suffix: BOSWashington, Locked, Elder noSpawn: true components: - - type: AccessReader - access: [["WashingtonElder"]] + - type: ContainerFill + containers: + board: [ DoorElectronicsBOSWashingtonElder ] - type: Wires layoutId: HighSec From f5e93cb8d6b24d922125bdfa1cdd522bb86baafa Mon Sep 17 00:00:00 2001 From: Vonsant Date: Wed, 7 Aug 2024 19:08:53 +0300 Subject: [PATCH 15/15] Localisation --- .../Locale/ru-RU/_Nuclear14/reagents.ftl | 10 ++++-- .../ru-RU/_Nuclear14/undecidedloadout.ftl | 18 +++++++++++ .../entities/clothing/head/hats.ftl | 6 ++++ .../entities/clothing/head/helmets.ftl | 2 +- .../entities/clothing/mask/gasmasks.ftl | 2 ++ .../markers/spawners/random/vending.ftl | 2 ++ .../entities/objects/devices/door_access.ftl | 30 +++++++++++++++++ .../entities/objects/devices/pda.ftl | 7 ++++ .../entities/objects/misc/identification.ftl | 9 ++++++ .../specific/kits/UndecidedLoadout.ftl | 8 +++++ .../entities/objects/specific/kits/kits.ftl | 8 +++-- .../specific/medical/healthanalyzer.ftl | 6 ++++ .../entities/structures/doors/access_tall.ftl | 32 ++++++++++++++++++- .../structures/machines/vending_machines.ftl | 3 ++ 14 files changed, 136 insertions(+), 7 deletions(-) create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/markers/spawners/random/vending.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/door_access.ftl create mode 100644 Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/medical/healthanalyzer.ftl diff --git a/Resources/Locale/ru-RU/_Nuclear14/reagents.ftl b/Resources/Locale/ru-RU/_Nuclear14/reagents.ftl index 96ef596ab47..715a59bf3a7 100644 --- a/Resources/Locale/ru-RU/_Nuclear14/reagents.ftl +++ b/Resources/Locale/ru-RU/_Nuclear14/reagents.ftl @@ -163,9 +163,15 @@ reagent-name-tea-xander = зандерный чай reagent-desc-tea-xander = Целебный корешковый чай reagent-name-tea-fireantnectar = нектар огненного муравья reagent-desc-tea-fireantnectar = Кристаллизованный нектар огненного муравья. Сладкий. -# Chems +# Venoms reagent-name-firetoxin = огненный токсин -reagent-desc-firetoxin = Горячий подарок от огненных созданий. +reagent-desc-firetoxin = Жаркий привет от пламенных созданий пустоши, способный разжечь ад в ваших жилах. Будьте готовы к перегреву! +reagent-name-nightstalker-venom = яд ночного охотника +reagent-desc-nightstalker-venom = Яд ночного охотника из тёмных уголков пустоши. Не столь смертелен, как яд казадора, но всё равно заставит вас пасть на колени и молить о пощаде. +reagent-name-cazador-venom = яд казадора +reagent-desc-cazador-venom = Яд казадора — самый страшный кошмар всех, кто блуждает по пустошам. Быстрая смерть практически неизбежна. Бегите, если можете! + +#Chems reagent-name-healing-powder = целебный порошок reagent-desc-healing-powder = Порошок, приготовленный из измельченных растений. reagent-name-antidote-mixture = антидот diff --git a/Resources/Locale/ru-RU/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/ru-RU/_Nuclear14/undecidedloadout.ftl index 6bd22c5e408..39541699463 100644 --- a/Resources/Locale/ru-RU/_Nuclear14/undecidedloadout.ftl +++ b/Resources/Locale/ru-RU/_Nuclear14/undecidedloadout.ftl @@ -176,3 +176,21 @@ undecided-loadout-category-bos-ballistics-description =набор Содержит: штурмовую винтовку, 3 магазина калибра 5,56 мм, пистолет калибра 12,7 мм, 2 магазина для пистолета калибра 12,7 мм, коробку с патронами 5,56 мм, стимулятор и сухпаёк. +undecided-loadout-category-bos-scribe-medic-name = Медицинский набор Скриптера Братства Стали +undecided-loadout-category-bos-scribe-medic-description = + Ящик со снаряжением, необходимым для выживания бойцов Братства. + Включает: револьвер калибра 10 мм, 2 спидлоадера, медицинский пояс, + набор для лечения огнестрельных ранений, медицинскую форму скриптера, нож, стимулятор и сухпаёк. + +undecided-loadout-category-bos-scribe-field-name = Полевой набор Скриптера Братства Стали +undecided-loadout-category-bos-scribe-field-description = + Ящик со снаряжением, необходимым для поддержки вашего подразделения из тыла. + Включает: винтовку "Варминт", коробку патронов калибра 5,56 мм, медицинский пояс, + полевую форму скриптера, нож, стимулятор и сухпаёк. + +undecided-loadout-category-bos-scribe-engineer-name = Инженерный набор Скриптера Братства Стали +undecided-loadout-category-bos-scribe-engineer-description = + Ящик со снаряжением, необходимым для поддержания базы и технических работ. + Включает: лазерный пистолет AEP-7, 2 микроядерных батареи, утилитарный пояс, + инженерную форму скриптера, пожарный топор, стимулятор и сухпаёк. + diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/hats.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/hats.ftl index 27fbdded087..53542ccfe4c 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/hats.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/hats.ftl @@ -6,6 +6,12 @@ ent-N14ClothingHeadHatDeputy = шапка помощника шерифа .desc = Надежда на закон и порядок, даже если шериф уже не в строю. ent-N14ClothingHeadHatSheriff = шапка шерифа .desc = Эта шапка – символ власти и справедливости... или того, что от них осталось. +ent-N14ClothingHeadHatCowboyGrey = серая ковбойская шляпа + .desc = Простая серая ковбойская шляпа, скромная и надежная. +ent-N14ClothingHeadHatCowboyGreyBanded = серая шляпа патронтаж + .desc = Простая серая ковбойская шляпа с нашивкой из латунных гильз – дань стилю и практичности. +ent-N14ClothingHeadHatCowboyBrown = шляпа следопыта + .desc = Деревенская ковбойская шляпа, любимая следопытами. Йиха! ent-N14ClothingHeadHatHeadscarf = тканевая повязка .desc = Простая повязка из ткани, защищающая голову от солнца и пыли. ent-N14ClothingHeadHatArmyBeret = армейский берет diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/helmets.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/helmets.ftl index 73167ac69da..b44e436ef49 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/helmets.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/head/helmets.ftl @@ -48,7 +48,7 @@ ent-N14ClothingHeadHatRangerHelmetEliteOld = боевой шлем элитно .desc = Старый боевой шлем, найденный в Разломе и переделанный для нужд рейнджеров высокого ранга. Сразу видно, что этот шлем побывал в переделках и защищал голову не одного героя НКР. ent-N14ClothingHeadHatRangerHelmetFox = боевой шлем рейнджера "Лис" .desc = Закаленный в боях шлем, собранный из частей штурмового снаряжения, кожаной брони и трофеев с поверженных Центурионов. Снайперская вуаль, обмотанная вокруг шеи, намекает на то, что владелец этого шлема предпочитал действовать скрытно и точно. -ent-N14ClothingHeadHatRangerHelmetEliteModif = модифицированный боевой шлем рейнджера +ent-N14ClothingHeadHatRangerHelmetModif = модифицированный боевой шлем рейнджера .desc = Усиленный шлем, который носят рейнджеры в самых опасных уголках Пустоши. Маска намертво приварена к корпусу, а сам шлем явно подвергался кустарным модификациям. ent-N14ClothingHeadHatBrotherhoodMidwestHelmet = шлем среднезападного БС .desc = Модифицированный боевой шлем, который служит верой и правдой бойцам среднезападного Братства Стали. diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/mask/gasmasks.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/mask/gasmasks.ftl index cb803ab133c..58f309996df 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/mask/gasmasks.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/clothing/mask/gasmasks.ftl @@ -20,3 +20,5 @@ ent-ClothingMaskGasRangerBroken = сломанный штурмовой прот .desc = Старый штурмовой противогаз, вышедший из употребления ко времени войны. Похоже, его не раз пытались починить, но безуспешно. ent-ClothingMaskGasRangerElite = элитный штурмовой противогаз .desc = Старый противогаз, найденный в Разломе, переделанный для рейнджеров высокого ранга. Видно, что он побывал в переделках, но все еще может защитить от опасностей Пустоши. +ent-ClothingMaskGasRangerModif = модифицированный противогаз рейнджера + .desc = Эта утолщённая маска — верный спутник рейнджеров, которые не боятся идти в самую гущу опасностей Пустоши. Усилена для защиты от токсичных ветров и радиоактивной пыли, она — символ стойкости и выживания. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/markers/spawners/random/vending.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/markers/spawners/random/vending.ftl new file mode 100644 index 00000000000..7193d020abd --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/markers/spawners/random/vending.ftl @@ -0,0 +1,2 @@ +ent-N14RandomVending = спавнер торгового аппарата + .suffix = Fallout, Случайный \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/door_access.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/door_access.ftl new file mode 100644 index 00000000000..f42c2f81023 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/door_access.ftl @@ -0,0 +1,30 @@ +ent-DoorElectronicsBOSMidwestPaladinCommander = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Командный СБС, Закрыт +ent-DoorElectronicsBOSMidwestPaladin = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Паладин СБС, Закрыт +ent-DoorElectronicsBOSMidwestKnight = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Рыцарь СБС, Закрыт +ent-DoorElectronicsBOSMidwestScribe = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Скриптер СБС, Закрыт +ent-DoorElectronicsBOSMidwestGeneral = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Общий СБС, Закрыт +ent-DoorElectronicsBOSWashingtonElder = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Командный ВБС, Закрыт +ent-DoorElectronicsBOSWashingtonPaladin = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Паладин ВБС, Закрыт +ent-DoorElectronicsBOSWashingtonKnight = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Рыцарь ВБС, Закрыт +ent-DoorElectronicsBOSWashingtonScribe = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Скриптер ВБС, Закрыт +ent-DoorElectronicsBOSWashington = { ent-DoorElectronics } + .desc = { ent-DoorElectronics.desc } + .suffix = Общий ВБС, Закрыт \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/pda.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/pda.ftl index 2fefe577f08..3b5b43a0e46 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/pda.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/devices/pda.ftl @@ -2,15 +2,22 @@ ent-N14BasePipboy = Пип-Бой 2000 .desc = Этот чудо-компьютер от 'РобКо', прикреплённый к руке, стал верным спутником любого выжившего в Пустоши. ent-N14VaultPDA = Пип-Бой 2000 Убежища .desc = Затертая модель, выданная жителям Убежища. Видел немало секретных записей и программ. + .suffix = Убежище ent-N14VaultEngineerPDA = инженерный Пип-Бой 2000 .desc = Этот Пип-Бой прошел через огонь и воду - именно с его помощью инженеры поддерживали жизнь в Убежище. + .suffix = Убежище, Инженерный ent-N14VaultDoctorPDA = медицинский Пип-Бой 2000 .desc = На этом Пип-Бое хранятся записи о всех болезнях и лекарствах, что знают врачи Убежища. + .suffix = Убежище, Медицинский ent-N14VaultSecurityPDA = охранный Пип-Бой 2000 .desc = Этот Пип-Бой видел все - и радость жизни в Убежище, и ужасы реальности за его стенами. + .suffix = Убежище, СБ ent-N14VaultChefPDA = сервисный Пип-Бой 2000 .desc = Покрыт жиром и мукой - вероятно, принадлежал повару. + .suffix = Убежище, Повар ent-N14VaultBotanistPDA = КПК ботаника .desc = Пахнет землёй - настоящий инструмент для того, кто изучает мир растений в Пустоши. + .suffix = Убежище, Ботаника ent-N14VaultOverseerPDA = Пип-Бой смотрителя .desc = Это лишь одна из множества загадок Убежища. + .suffix = Убежище, Смотритель \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/identification.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/identification.ftl index 259d74901d8..2610245d72a 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/identification.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/misc/identification.ftl @@ -37,6 +37,15 @@ ent-N14IDBrotherhoodHolotagPaladin = голо-жетон паладина ent-N14IDBrotherhoodHolotagCommander = голо-жетон командира .desc = Голографический жетон, который носит Командир Паладинов Братства Стали. Отдает приказы и ведет Братство к победе. .suffix = Командир +ent-N14IDEnclaveTrooper = голо-жетон анклава + .desc = Голографический жетон, который носят представители Анклава. + .suffix = Солдат +ent-N14IDEnclaveOfficer = голо-жетон анклава + .desc = Голографический жетон, который носят высокопоставленные представители Анклава. + .suffix = Офицер +ent-N14IDEnclaveNoncombat = голо-жетон анклава + .desc = Голографический жетон, который носят гражданские представители Анклава. + .suffix = Ученый, Гражданский ent-N14IDNCRDogtag = жетон кадета .desc = Жетон, который показывает, что ты солдат Новой Калифорнийской Республики. .suffix = Солдат, Кадет diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/UndecidedLoadout.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/UndecidedLoadout.ftl index 13fae1c6ab8..2ccfb2b370d 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/UndecidedLoadout.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/UndecidedLoadout.ftl @@ -9,4 +9,12 @@ ent-NCRtrooperloadoutkits = неразобранный набор солдата ent-NCRveteranrangerloadoutkits = неразобранный набор рейнджера ветерана НКР .desc = Пожалуйста, выберите только 1. ent-NCRBoSMidwestCOkits = неразобранный набор среднезападного братства + .desc = Пожалуйста, выберите только 1. +ent-NCRBoSMidwestScribekits = неразобранный набор среднезападного братства + .desc = Пожалуйста, выберите только 1. +ent-NCRBoSMidwestPaladinkits = неразобранный набор среднезападного братства + .desc = Пожалуйста, выберите только 1. +ent-BoSScribeMedicalSet = неразобранный набор среднезападного братства + .desc = Пожалуйста, выберите только 1. +ent-BoSScribeEngineerSet = неразобранный набор среднезападного братства .desc = Пожалуйста, выберите только 1. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/kits.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/kits.ftl index ea184db8f74..1e9620875ce 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/kits.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/kits/kits.ftl @@ -46,9 +46,11 @@ ent-KitRangedBoSMidwest = набор дальнобойного вооружен .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. ent-KitCarbineBoSMidwest = набор стрелкового вооружения Братства Стали .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. -ent-KitScribeBoSMidwest = набор снаряжения скриптера Братства Стали +ent-KitScribeMedicBoSMidwest = набор снаряжения скриптера Братства Стали .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. -ent-KitCOPlasmaBoSMidwest = набор плазменного вооружения Братства Стали +ent-KitScribeFieldBoSMidwest = набор плазменного вооружения Братства Стали .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. -ent-KitCOAssaultBoSMidwest = набор штурмового вооружения Братства Стали +ent-KitAssaultBoSMidwest = набор штурмового вооружения Братства Стали + .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. +ent-KitScribeEngineerBoSMidwest = набор инженерного снаряжения Братства Стали .desc = Универсальный набор, содержащий всё необходимое для членов Братства Стали. \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/medical/healthanalyzer.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/medical/healthanalyzer.ftl new file mode 100644 index 00000000000..36994577ea7 --- /dev/null +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/objects/specific/medical/healthanalyzer.ftl @@ -0,0 +1,6 @@ +ent-N14HandheldHealthAnalyzerUnpowered = анализатор здоровья + .desc = Ручной сканер тела, способный определять жизненные показатели пациента. + .suffix = Не маппить +ent-N14HandheldHealthAnalyzer = анализатор здоровья + .desc = Ручной сканер тела, способный определять жизненные показатели пациента. + .suffix = Заряженный \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/doors/access_tall.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/doors/access_tall.ftl index 7693a680bb0..a15910e61c7 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/doors/access_tall.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/doors/access_tall.ftl @@ -99,4 +99,34 @@ ent-N14DoorMetalSecureLockedSilver = { ent-N14DoorMetalBlueAltTall } .desc = { ent-N14DoorMetalBlueAltTall.desc } ent-N14DoorCellMetalLockedSilver = { ent-N14DoorMetalBarTall } .suffix = Закрытый, Серебрянный ключ - .desc = { ent-N14DoorMetalBarTall.desc } \ No newline at end of file + .desc = { ent-N14DoorMetalBarTall.desc } +ent-N14DoorBunkerLockedBoSWashington = { ent-N14DoorAirlockTall } + .suffix = ВБС, Закрытый + .desc = { ent-N14DoorAirlockTall.desc } +ent-N14DoorBunkerGlassLockedBoSWashington = { ent-N14DoorBunkerGlass } + .suffix = ВБС, Закрытый, Стеклянный + .desc = { ent-N14DoorBunkerGlass.desc } +ent-N14DoorBunkerLockedBoSWashingtonScribe = { ent-N14DoorAirlockTall } + .suffix = ВБС, Закрытый, Скриптер + .desc = { ent-N14DoorAirlockTall .desc } +ent-N14DoorBunkerGlassLockedBoSWashingtonScribe = { ent-N14DoorBunkerGlass } + .suffix = ВБС, Закрытый, Скриптер, Стеклянный + .desc = { ent-N14DoorBunkerGlass.desc } +ent-N14DoorBunkerLockedBoSWashingtonKnight = { ent-N14DoorAirlockTall } + .suffix = ВБС, Закрытый, Рыцарь + .desc = { ent-N14DoorAirlockTall.desc } +ent-N14DoorBunkerGlassLockedBoSWashingtonKnight = { ent-N14DoorBunkerGlass } + .suffix = ВБС, Закрытый, Рыцарь, Стеклянный + .desc = { ent-N14DoorBunkerGlass.desc } +ent-N14DoorBunkerLockedBoSWashingtonPaladin = { ent-N14DoorAirlockTall } + .suffix = ВБС, Закрытый, Паладин + .desc = { ent-N14DoorAirlockTall.desc } +ent-N14DoorBunkerGlassLockedBoSWashingtonPaladin = { ent-N14DoorBunkerGlass } + .suffix = ВБС, Закрытый, Паладин, Стеклянный + .desc = { ent-N14DoorBunkerGlass.desc } +ent-N14DoorBunkerLockedBoSWashingtonElder = { ent-N14DoorAirlockTall } + .suffix = ВБС, Закрытый, Командный + .desc = { ent-N14DoorAirlockTall.desc } +ent-N14DoorBunkerGlassLockedBoSWashingtonElder = { ent-N14DoorBunkerGlass } + .suffix = ВБС, Закрытый, Командный, Стеклянный + .desc = { ent-N14DoorBunkerGlass.desc } \ No newline at end of file diff --git a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/machines/vending_machines.ftl b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/machines/vending_machines.ftl index bd3988c0b4a..ad3fa59beeb 100644 --- a/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/machines/vending_machines.ftl +++ b/Resources/Locale/ru-RU/ss14-ru/prototypes/_nuclear14/entities/structures/machines/vending_machines.ftl @@ -26,3 +26,6 @@ ent-N14VendingMachineCigaretteFilled = { ent-N14VendingMachineCigarette } ent-N14VendingMachineCigaretteFilledRepublic = автомат с сигаретами 'Республика' .desc = Довоенный автомат с сигаретами, заполненный пачками сигарет 'Республика'. Неужели кто-то еще помнит вкус свободы? .suffix = республика +ent-N14VendingMachineNukaColaGenerous = автомат с Ядер-Колой + .desc = Довоенный торговый автомат, который когда-то продавал легендарную Ядер-Колу. Теперь он пуст — как и мечты о беззаботной жизни. + .suffix = Обычный \ No newline at end of file