diff --git a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs index 6092ea0c3ed..5eee23d0604 100644 --- a/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs +++ b/Content.Server/Cargo/Components/CargoPalletConsoleComponent.cs @@ -8,6 +8,6 @@ namespace Content.Server.Cargo.Components; [Access(typeof(CargoSystem))] public sealed partial class CargoPalletConsoleComponent : Component { - [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer:typeof(PrototypeIdSerializer))] - public string CashType = "Credit"; + [ViewVariables(VVAccess.ReadWrite), DataField("cashType", customTypeSerializer: typeof(PrototypeIdSerializer))] + public string CashType = "Caps"; } diff --git a/Content.Server/Cargo/Components/StationBankAccountComponent.cs b/Content.Server/Cargo/Components/StationBankAccountComponent.cs index fe9be19b19a..4060885afec 100644 --- a/Content.Server/Cargo/Components/StationBankAccountComponent.cs +++ b/Content.Server/Cargo/Components/StationBankAccountComponent.cs @@ -9,11 +9,11 @@ namespace Content.Server.Cargo.Components; public sealed partial class StationBankAccountComponent : Component { [ViewVariables(VVAccess.ReadWrite), DataField("balance")] - public int Balance = 2000; + public int Balance = 500; /// /// How much the bank balance goes up per second, every Delay period. Rounded down when multiplied. /// [ViewVariables(VVAccess.ReadWrite), DataField("increasePerSecond")] - public int IncreasePerSecond = 1; + public float IncreasePerSecond = 0.05f; } diff --git a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs index d8b55a7237f..0280e628ece 100644 --- a/Content.Server/Cargo/Systems/CargoSystem.Orders.cs +++ b/Content.Server/Cargo/Systems/CargoSystem.Orders.cs @@ -23,7 +23,7 @@ public sealed partial class CargoSystem /// /// How much time to wait (in seconds) before increasing bank accounts balance. /// - private const int Delay = 10; + private const int Delay = 200; /// /// Keeps track of how much time has elapsed since last balance increase. @@ -84,7 +84,7 @@ private void UpdateConsole(float frameTime) foreach (var account in EntityQuery()) { - account.Balance += account.IncreasePerSecond * Delay; + account.Balance += (int) (account.IncreasePerSecond * Delay); } var query = EntityQueryEnumerator(); diff --git a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs index e18e375c09c..d3f91607ac2 100644 --- a/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs +++ b/Content.Shared/Weapons/Ranged/Systems/SharedGunSystem.cs @@ -427,6 +427,13 @@ protected void SetCartridgeSpent(EntityUid uid, CartridgeAmmoComponent cartridge cartridge.Spent = spent; Appearance.SetData(uid, AmmoVisuals.Spent, spent); + + // Reduce entity spam from cartridges for N14. + if (spent) + { + var despawn = EnsureComp(uid); + despawn.Lifetime = 15f * 60; // 15 minutes + } } /// @@ -458,10 +465,6 @@ protected void EjectCartridge( { Audio.PlayPvs(cartridge.EjectSound, entity, AudioParams.Default.WithVariation(SharedContentAudioSystem.DefaultVariation).WithVolume(-1f)); } - - // Reduce entity spam from cartridges for N14. - var despawn = EnsureComp(entity); - despawn.Lifetime = 15f * 60; // 15 minutes } protected IShootable EnsureShootable(EntityUid uid) diff --git a/Resources/Locale/en-US/_Nuclear14/job-names.ftl b/Resources/Locale/en-US/_Nuclear14/job-names.ftl index 6cdbce57b7b..db7ccfd949b 100644 --- a/Resources/Locale/en-US/_Nuclear14/job-names.ftl +++ b/Resources/Locale/en-US/_Nuclear14/job-names.ftl @@ -1,25 +1,25 @@ # Midwest Brotherhood -job-name-bos-mid-paladin-comm = Midwest Brotherhood Paladin Commander +job-name-bos-mid-paladin-comm = Midwest BoS Paladin Commander job-description-bos-mid-paladin-comm = Lead the Midwest Brotherhood of Steel on their mission. -job-name-bos-mid-paladin = Midwest Brotherhood Paladin +job-name-bos-mid-paladin = Midwest BoS Paladin job-description-bos-mid-paladin = Follow the Paladin Commander on their mission. -job-name-bos-mid-knight = Midwest Brotherhood Knight +job-name-bos-mid-knight = Midwest BoS Knight job-description-bos-mid-knight = Follow the Paladin Commander on their mission. -job-name-bos-mid-scribe = Midwest Brotherhood Scribe +job-name-bos-mid-scribe = Midwest BoS Scribe job-description-bos-mid-scribe = Conduct scientific missions and research for your brotherhood chapter. -job-name-bos-mid-squire = Midwest Brotherhood Squire +job-name-bos-mid-squire = Midwest BoS Squire job-description-bos-mid-squire = Follow your Knight into battle and do their bidding. # Washington Brotherhood -job-name-bos-washington-commander = Washington Brotherhood Commander +job-name-bos-washington-commander = Washington BoS Paladin Commander job-description-bos-washington-commander = Lead the Washington Brotherhood of Steel to glory in their mission. -job-name-bos-washington-initiate = Washington Brotherhood Initiate +job-name-bos-washington-initiate = Washington BoS Initiate job-description-bos-washington-initiate = Prove yourself to your chapter to progress through the ranks. -job-name-bos-washington-knight = Washington Brotherhood Knight +job-name-bos-washington-knight = Washington BoS Knight job-description-bos-washington-knight = The military arm of the Brotherhood. Defend your chapter in their objectives and manufacture equipment. -job-name-bos-washington-paladin = Washington Brotherhood Captain +job-name-bos-washington-paladin = Washington BoS Paladin job-description-bos-washington-paladin = Protect the Brotherhood at all costs. Take the Commanders will out into the wasteland. -job-name-bos-washington-scribe = Washington Brotherhood Scribe +job-name-bos-washington-scribe = Washington BoS Scribe job-description-bos-washington-scribe = Conduct scientific missions and research for your brotherhood chapter. # Caravan diff --git a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl index 9303b26cae2..aac4eb6f184 100644 --- a/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl +++ b/Resources/Locale/en-US/_Nuclear14/undecidedloadout.ftl @@ -44,9 +44,9 @@ undecided-loadout-category-morale-description = 1 NCR spear flag, 1 9mm pistol, 2 9mm magazines, 1 combat knife, and a C ration MRE. -undecided-loadout-category-medic-name = Medic Kit +undecided-loadout-category-medic-name = Combat Lifesaver Kit undecided-loadout-category-medic-description = - A crate containing all a NCR medic needs to patrol on the wasteland. + A crate containing all an NCR CLS needs to patrol the wasteland. Includes 1 NCR leather vest, 1 medical belt, 1 9mm SMG, 4 9mm SMG magazines, 1 combat knife, and a C ration MRE. @@ -172,8 +172,8 @@ 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 AEP-7 pistol, 2 energy cells, 1 medical belt, - 1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE + Includes 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing, + 1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE undecided-loadout-category-bos-scribe-engineer-name = Brotherhood Scribe Engineer Kit undecided-loadout-category-bos-scribe-engineer-description = @@ -234,8 +234,8 @@ undecided-loadout-category-bos-washington-scribe-field-name = Brotherhood Scribe undecided-loadout-category-bos-washington-scribe-field-description = A crate containing everything a member of Brotherhood scribes. For supporting your unit from the back. - Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 medical belt, - 1 field scribe clothing, 1 knife, 1 stimpak, 1 C ration MRE + Includes 1 AEP-7 pistol, 1 AEP-7 pistol, 2 energy cells, 1 scribe webbing, + 1 field scribe clothing, 1 knife, 2 stimpak, 1 gauze, 1 bruise pack, 1 ointment, 1 C ration MRE undecided-loadout-category-bos-washington-scribe-engineer-name = Brotherhood Scribe Engineer Kit undecided-loadout-category-bos-washington-scribe-engineer-description = diff --git a/Resources/Locale/en-US/cargo/cargo-console-component.ftl b/Resources/Locale/en-US/cargo/cargo-console-component.ftl index 3c032488b52..40a3ac9504c 100644 --- a/Resources/Locale/en-US/cargo/cargo-console-component.ftl +++ b/Resources/Locale/en-US/cargo/cargo-console-component.ftl @@ -4,7 +4,7 @@ cargo-console-menu-account-name-label = Account name:{" "} cargo-console-menu-account-name-none-text = None cargo-console-menu-shuttle-name-label = Shuttle name:{" "} cargo-console-menu-shuttle-name-none-text = None -cargo-console-menu-points-label = Spesos:{" "} +cargo-console-menu-points-label = Caps:{" "} cargo-console-menu-points-amount = ${$amount} cargo-console-menu-shuttle-status-label = Shuttle status:{" "} cargo-console-menu-shuttle-status-away-text = Away diff --git a/Resources/Locale/en-US/cargo/price-gun-component.ftl b/Resources/Locale/en-US/cargo/price-gun-component.ftl index 29a1482d19c..6b26ef7a751 100644 --- a/Resources/Locale/en-US/cargo/price-gun-component.ftl +++ b/Resources/Locale/en-US/cargo/price-gun-component.ftl @@ -1,4 +1,4 @@ -price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} spesos. +price-gun-pricing-result = The device deems {THE($object)} to be worth {$price} caps. price-gun-verb-text = Appraisal price-gun-verb-message = Appraise {THE($object)}. price-gun-bounty-complete = The device confirms that the bounty contained within is completed. diff --git a/Resources/Locale/en-US/deltav/accessories/hair.ftl b/Resources/Locale/en-US/deltav/accessories/hair.ftl index 7fbfc786290..d9ca04cbd17 100644 --- a/Resources/Locale/en-US/deltav/accessories/hair.ftl +++ b/Resources/Locale/en-US/deltav/accessories/hair.ftl @@ -10,3 +10,13 @@ marking-HumanHairClassicCrewcut = Crewcut Classic marking-HumanHairClassicLong = Long 1 (Classic) marking-HumanHairClassicLong2 = Long 2 (Classic) marking-HumanHairClassicLong3 = Long 3 (Classic) +marking-ZetaHairLongSpikehair = Long Spikehair +marking-ZetaHairNerfish = Nerfish +marking-ZetaHairPlantpoofs = Plantish Poofs +marking-ZetaHairQuadspike = Quadspike +marking-ZetaHairRattyRoyalty = Ratty Royalty +marking-ZetaHairShortMessy = Short and Messy +marking-ZetaHairShortSpikehair = Short Spikehair +marking-ZetaHairSpikehawk = Spikehawk +marking-ZetaHairPolitical = The Political +marking-ZetaHairZetaBasicBraids = Basic Braids (Zeta) \ No newline at end of file diff --git a/Resources/Maps/N14/MercerIslandSewers.yml b/Resources/Maps/N14/MercerIslandSewers.yml index 6f9cbc50f11..121c2aceb83 100644 --- a/Resources/Maps/N14/MercerIslandSewers.yml +++ b/Resources/Maps/N14/MercerIslandSewers.yml @@ -112,6 +112,7 @@ entities: - 0 - uid: 2 components: + - type: TradeStation - type: MetaData name: grid - type: Transform diff --git a/Resources/Maps/N14/MercerIslandSurface.yml b/Resources/Maps/N14/MercerIslandSurface.yml index c1d9870ed72..dc01ed0774b 100644 --- a/Resources/Maps/N14/MercerIslandSurface.yml +++ b/Resources/Maps/N14/MercerIslandSurface.yml @@ -159,6 +159,7 @@ entities: - type: RadiationGridResistance - uid: 2 components: + - type: TradeStation - type: MetaData name: grid - type: Transform diff --git a/Resources/Maps/N14/SunnyvaleSurface.yml b/Resources/Maps/N14/SunnyvaleSurface.yml index d5365eddec0..69dbaa30141 100644 --- a/Resources/Maps/N14/SunnyvaleSurface.yml +++ b/Resources/Maps/N14/SunnyvaleSurface.yml @@ -180,6 +180,7 @@ entities: entities: - uid: 1 components: + - type: TradeStation - type: MetaData name: Sunnyvale - type: Transform diff --git a/Resources/Maps/N14/SunnyvaleUnderground.yml b/Resources/Maps/N14/SunnyvaleUnderground.yml index 62b4f301b5c..2db6de97d05 100644 --- a/Resources/Maps/N14/SunnyvaleUnderground.yml +++ b/Resources/Maps/N14/SunnyvaleUnderground.yml @@ -107,6 +107,7 @@ entities: - 0 - uid: 2 components: + - type: TradeStation - type: MetaData name: SunnyvaleUnderground - type: Transform diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml deleted file mode 100644 index 1dae88730c1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_armory.yml +++ /dev/null @@ -1,49 +0,0 @@ -- type: cargoProduct - id: ArmoryGrand - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Snipers/grand_rifle.rsi - state: base - product: CrateArmoryGrand - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryUniversal - icon: - sprite: Nyanotrasen/Objects/Weapons/Guns/Pistols/universal.rsi - state: icon - product: CrateArmoryUniversal - cost: 6500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryShotgunAdjutant - icon: - sprite: DeltaV/Objects/Weapons/Guns/Shotguns/Adjutant.rsi - state: icon - product: CrateArmoryAdjutant - cost: 10000 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGun - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/energygun.rsi - state: icon - product: CrateArmoryEnergyGun - cost: 5500 - category: Armory - group: market - -- type: cargoProduct - id: ArmoryEnergyGunMini - icon: - sprite: DeltaV/Objects/Weapons/Guns/Battery/mini_energygun.rsi - state: icon - product: CrateArmoryEnergyGunMini - cost: 3500 - category: Armory - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml deleted file mode 100644 index 42b4d57e910..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_food.yml +++ /dev/null @@ -1,29 +0,0 @@ -- type: cargoProduct - id: FoodCrateKvassTank - icon: - sprite: DeltaV/Structures/Storage/kvass.rsi - state: kvass - product: KvassTankFull - cost: 2000 - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSavory - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: pizza-box - product: CrateFoodDonkpocketSavory - cost: 6000 # Thanks bounties - category: Food - group: market - -- type: cargoProduct - id: FoodDonkpocketSweet - icon: - sprite: Objects/Consumable/Food/Baked/donkpocket.rsi - state: berry-box - product: CrateFoodDonkpocketSweet - cost: 6000 # Thanks bounties - category: Food - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml deleted file mode 100644 index ddf3ebdb9e1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_fun.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cargoProduct - id: CrateFunBBGun - icon: - sprite: Objects/Weapons/Guns/Pistols/water_pistol.rsi - state: display - product: CrateFunBBGun - cost: 1000 - category: Fun - group: market - -- type: cargoProduct - id: CapGunSet - icon: - sprite: Objects/Fun/caps.rsi - state: icon - product: CrateCapGunSet - cost: 1000 - category: Fun - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml deleted file mode 100644 index c025efd4f6a..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_livestock.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: LivestockSecDog - icon: - sprite: DeltaV/Mobs/Pets/secdog.rsi - state: secdog - product: CrateNPCSecDog - cost: 3500 - category: Livestock - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml deleted file mode 100644 index 503fb675ff1..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_medical.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: MedicalScrubsCrate - icon: - sprite: Clothing/Uniforms/Scrubs/blue.rsi - state: icon - product: CrateMedicalScrubs - cost: 500 - category: Medical - group: market diff --git a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml b/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml deleted file mode 100644 index 343ec4d5333..00000000000 --- a/Resources/Prototypes/DeltaV/Catalog/Cargo/cargo_vending.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: CrateVendingMachineRestockPride - icon: - sprite: Objects/Specific/Service/vending_machine_restock.rsi - state: base - product: CrateVendingMachineRestockPrideFilled - cost: 1100 - category: Service - group: market diff --git a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml index 51cba35429f..5f67790b3d1 100644 --- a/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml +++ b/Resources/Prototypes/DeltaV/Entities/Mobs/Customization/Markings/hair.yml @@ -93,3 +93,84 @@ sprites: - sprite: DeltaV/Mobs/Customization/hair.rsi state: classic_long3 + +- type: marking + id: ZetaHairLongSpikehair + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: long_spikehair + +- type: marking + id: ZetaHairNerfish + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: nerfish + +- type: marking + id: ZetaHairPlantpoofs + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: plantish_poofs + +- type: marking + id: ZetaHairRattyRoyalty + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: ratty_royalty + +- type: marking + id: ZetaHairShortMessy + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: short_and_messy + +- type: marking + id: ZetaHairShortSpikehair + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: short_spikehair + +- type: marking + id: ZetaHairSpikehawk + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: spikehawk + +- type: marking + id: ZetaHairPolitical + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: the_political + +- type: marking + id: ZetaHairZetaBasicBraids + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: zeta_basic_braids + +- type: marking + id: ZetaHairQuadspike + bodyPart: Hair + markingCategory: Hair + sprites: + - sprite: _Nuclear14/Mobs/Customization/hair.rsi + state: quadspike + \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Power/powercells.yml b/Resources/Prototypes/Entities/Objects/Power/powercells.yml index 7397bcaa517..7d5e389c638 100644 --- a/Resources/Prototypes/Entities/Objects/Power/powercells.yml +++ b/Resources/Prototypes/Entities/Objects/Power/powercells.yml @@ -6,7 +6,7 @@ - type: Item storedRotation: -90 - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.009 - type: PowerCell - type: Explosive explosionType: Default diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index 252f2f48eae..1b6a8510394 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -132,7 +132,7 @@ stackType: Brutepack count: 10 - type: StackPrice - price: 5 + price: 1 - type: entity id: Brutepack1 @@ -287,7 +287,7 @@ stackType: Gauze count: 10 - type: StackPrice - price: 10 + price: 1 - type: entity id: Gauze1 diff --git a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml index d03cc725efe..9218933fe32 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/lighters.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/lighters.yml @@ -87,6 +87,10 @@ netsync: false radius: 1.1 #smallest possible color: orange + - type: Storage + whitelist: + tags: + - Cigarette - type: entity name: cheap lighter diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 561b1faa094..1d65f918f9f 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -60,7 +60,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 1 - type: entity name: screwdriver @@ -121,7 +121,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 30 + price: 1 - type: entity name: wrench @@ -177,7 +177,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 22 + price: 1 - type: entity name: crowbar @@ -232,7 +232,7 @@ materialComposition: Steel: 100 - type: StaticPrice - price: 22 + price: 1 - type: Prying - type: entity @@ -312,7 +312,7 @@ Steel: 100 Plastic: 100 - type: StaticPrice - price: 56 + price: 2 - type: entity name: network configurator @@ -360,7 +360,7 @@ - key: enum.NetworkConfiguratorUiKey.Link type: NetworkConfiguratorBoundUserInterface - type: StaticPrice - price: 56 + price: 2 # - type: GuideHelp # guides: # - NetworkConfigurator @@ -413,7 +413,7 @@ # - type: DynamicPrice # price: 100 - type: StaticPrice - price: 100 + price: 10 - type: MeleeWeapon wideAnimationRotation: -90 attackRate: 0.9 @@ -659,7 +659,7 @@ Steel: 100 Wood: 50 - type: StaticPrice - price: 25 + price: 1 # Delta V: Adds tool quality for digging - type: Tool qualities: diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml index 3bef413dffa..0d65952d8f9 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/base_cartridge.yml @@ -33,4 +33,4 @@ params: volume: -1 - type: StaticPrice - price: 1 + price: 0.2 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml index d03d91966d0..64bc8489d25 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Rifles/rifles.yml @@ -48,7 +48,7 @@ gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - type: StaticPrice - price: 500 + price: 30 - type: entity name: AKMS diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml index 3962f6e1f57..550d7841016 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/SMGs/smgs.yml @@ -53,7 +53,7 @@ gun_magazine: !type:ContainerSlot gun_chamber: !type:ContainerSlot - type: StaticPrice - price: 500 + price: 10 - type: entity name: Atreides diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml index 52b05b6d60b..5172301feb6 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml @@ -42,7 +42,7 @@ ballistic-ammo: !type:Container ents: [] - type: StaticPrice - price: 500 + price: 10 - type: entity name: Bulldog diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml index 4b58642c307..620c3f75e47 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Snipers/snipers.yml @@ -36,7 +36,7 @@ ballistic-ammo: !type:Container ents: [] - type: StaticPrice - price: 500 + price: 10 - type: entity name: Kardashev-Mosin diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml deleted file mode 100644 index d7d0b665381..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_epistemics.yml +++ /dev/null @@ -1,9 +0,0 @@ -- type: cargoProduct - id: EpistemicsHolyWaterKit - icon: - sprite: Nyanotrasen/Objects/Consumable/Drinks/flaskholywater.rsi - state: icon - product: CrateHolyWaterKit - cost: 3000 - category: Epistemics - group: market diff --git a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml b/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml deleted file mode 100644 index dd7e7b0dc1e..00000000000 --- a/Resources/Prototypes/Nyanotrasen/Catalog/Cargo/cargo_service.yml +++ /dev/null @@ -1,19 +0,0 @@ -- type: cargoProduct - id: ServiceColoredLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementColoredLights - cost: 600 - category: Service - group: market - -- type: cargoProduct - id: ServiceMaintenanceLightsReplacement - icon: - sprite: Objects/Power/light_bulb.rsi - state: normal - product: CrateServiceReplacementMaintenanceLights - cost: 600 - category: Service - group: market diff --git a/Resources/Prototypes/Reagents/Materials/glass.yml b/Resources/Prototypes/Reagents/Materials/glass.yml index 30e7762a81e..425719e8632 100644 --- a/Resources/Prototypes/Reagents/Materials/glass.yml +++ b/Resources/Prototypes/Reagents/Materials/glass.yml @@ -4,7 +4,7 @@ name: materials-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: glass } color: "#a8ccd7" - price: 0.075 + price: 0.01 - type: material id: ReinforcedGlass @@ -12,7 +12,7 @@ name: materials-reinforced-glass icon: { sprite: Objects/Materials/Sheets/glass.rsi, state: rglass } color: "#549bb0" - price: 0.16 # 1-0.5 mix of glass and metal. + price: 0.015 # 1-0.5 mix of glass and metal. - type: material id: PlasmaGlass diff --git a/Resources/Prototypes/Reagents/Materials/materials.yml b/Resources/Prototypes/Reagents/Materials/materials.yml index fa51608a224..f410e016bcb 100644 --- a/Resources/Prototypes/Reagents/Materials/materials.yml +++ b/Resources/Prototypes/Reagents/Materials/materials.yml @@ -56,7 +56,7 @@ name: materials-plastic icon: { sprite: Objects/Materials/Sheets/other.rsi, state: plastic } color: "#d9d9d9" - price: 0.1 + price: 0.01 - type: material id: Wood @@ -65,7 +65,7 @@ unit: materials-unit-plank icon: { sprite: Objects/Materials/materials.rsi, state: wood } color: "#966F33" - price: 0.05 + price: 0.0033 - type: material id: Uranium diff --git a/Resources/Prototypes/Reagents/Materials/metals.yml b/Resources/Prototypes/Reagents/Materials/metals.yml index a2d2397dcde..c860d6d9b61 100644 --- a/Resources/Prototypes/Reagents/Materials/metals.yml +++ b/Resources/Prototypes/Reagents/Materials/metals.yml @@ -3,7 +3,7 @@ stackEntity: SheetSteel1 name: materials-steel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: steel } - price: 0.05 + price: 0.01 - type: material id: Gold @@ -12,7 +12,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: gold } color: "#FFD700" - price: 0.2 + price: 0.05 - type: material id: Silver @@ -21,7 +21,7 @@ unit: materials-unit-bar icon: { sprite: Objects/Materials/ingots.rsi, state: silver } color: "#C0C0C0" - price: 0.15 + price: 0.03 - type: material id: Brass @@ -29,7 +29,7 @@ name: materials-brass icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: brass } color: "#b18b25" - price: 0.1 + price: 0.01 - type: material id: Plasteel @@ -37,4 +37,4 @@ name: materials-plasteel icon: { sprite: Objects/Materials/Sheets/metal.rsi, state: plasteel } color: "#696969" #Okay, this is epic - price: 0.28 # 1-1 mix of plasma and steel. + price: 0.03 # 1-1 mix of plasma and steel. diff --git a/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml b/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml index 7b17ea25c52..4cc3a4fb7cc 100644 --- a/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml +++ b/Resources/Prototypes/_Nuclear14/Access/caravancompany.yml @@ -15,4 +15,5 @@ tags: - CaravanCompanyLeader - CaravanCompanyTrader - - CaravanCompanyGuard \ No newline at end of file + - CaravanCompanyGuard + - Orders # Delta V - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml new file mode 100644 index 00000000000..7fe69453137 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_armory.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: SmallGameRifleCrate + icon: + sprite: _Nuclear14/Objects/Weapons/Guns/Snipers/varmint.rsi + state: base + product: N14CrateArmyFilledSmallGameRifle + cost: 100 + category: Armory + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml new file mode 100644 index 00000000000..018073f2e0c --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_chems.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: AbraxoCleanerCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: abraxo + product: N14CrateBreakPlainFilledAbraxo + cost: 100 + category: Chems + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml new file mode 100644 index 00000000000..d15a78882e9 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_consumables.yml @@ -0,0 +1,39 @@ +- type: cargoProduct + id: EmergencyRationsCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Food/pre-war.rsi + state: porknbeans + product: N14CrateBreakPlainFilledEmergencyRations + cost: 60 + category: Consumables + group: market + +- type: cargoProduct + id: WaterBottlesCrate + icon: + sprite: Objects/Consumable/Drinks/waterbottle.rsi + state: icon + product: N14CrateBreakPlainFilledWatterBottle + cost: 200 + category: Consumables + group: market + +- type: cargoProduct + id: RepublicsCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Smokeables/Packs/republics.rsi + state: closed + product: N14CrateBreakPlainFilledCigarettesRepublic + cost: 50 + category: Consumables + group: market + +- type: cargoProduct + id: NukaColaCrate + icon: + sprite: _Nuclear14/Objects/Consumable/Drinks/nuka_cola.rsi + state: icon + product: N14CrateBreakPlainFilledNukaCola + cost: 80 + category: Consumables + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml new file mode 100644 index 00000000000..48f1b8707f9 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_livestock.yml @@ -0,0 +1,19 @@ +- type: cargoProduct + id: Brahmin + icon: + sprite: _Nuclear14/Mobs/Animals/brahmin.rsi + state: brahmin-2 + product: N14MobBrahmin + cost: 80 + category: Livestock + group: market + +- type: cargoProduct + id: Chicken + icon: + sprite: _Nuclear14/Mobs/Animals/chicken.rsi + state: chicken + product: N14MobChicken + cost: 30 + category: Livestock + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml new file mode 100644 index 00000000000..e1a720a272f --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_materials.yml @@ -0,0 +1,79 @@ +- type: cargoProduct + id: SteelSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/metal.rsi + state: steel + product: N14CrateBreakPlainFilledSteelSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: PlasticSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/other.rsi + state: plastic + product: N14CrateBreakPlainFilledPlasticSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: GlassSheetCrate + icon: + sprite: /Textures/Objects/Materials/Sheets/glass.rsi + state: glass + product: N14CrateBreakPlainFilledGlassSheet + cost: 60 + category: Materials + group: market + +- type: cargoProduct + id: WoodPlankCrate + icon: + sprite: /Textures/Objects/Materials/materials.rsi + state: wood + product: N14CrateBreakPlainFilledWood + cost: 20 + category: Materials + group: market + +- type: cargoProduct + id: GunpowderCrate + icon: + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: powder_lead + product: N14CrateBreakPlainFilledGunpowder + cost: 300 + category: Materials + group: market + +- type: cargoProduct + id: LeadBarCrate + icon: + sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi + state: ingot_lead + product: N14CrateBreakPlainFilledLeadBar + cost: 160 + category: Materials + group: market + +- type: cargoProduct + id: AdhesivesCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: duct_tape + product: N14CrateBreakPlainFilledAdhesive + cost: 40 + category: Materials + group: market + +- type: cargoProduct + id: MechanicPartsCrate + icon: + sprite: _Nuclear14/Objects/Misc/crafting_junk.rsi + state: gear_small + product: N14CrateBreakPlainFilledMechanicParts + cost: 60 + category: Materials + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml new file mode 100644 index 00000000000..996d53d2a05 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_medical.yml @@ -0,0 +1,9 @@ +- type: cargoProduct + id: StimpakCrate + icon: + sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi + state: stimpak + product: N14CrateBreakPlainFilledStimpak + cost: 300 + category: Medical / Aid + group: market \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml b/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml deleted file mode 100644 index 905d828655b..00000000000 --- a/Resources/Prototypes/_Nuclear14/Catalog/Cargo/cargo_wavesurvival.yml +++ /dev/null @@ -1,175 +0,0 @@ -# Supplies -- type: cargoProduct - id: CargoWastelanderBox - icon: - sprite: _Nuclear14/Objects/Misc/storage.rsi - state: box - product: N14BoxPlasticFilledWastelander - cost: 500 - category: Supplies - group: market - - -# Medical / Aid -- type: cargoProduct - id: CargoMedicalStimpak - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: stimpak - product: N14Stimpak - cost: 500 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalStimpakSuper - icon: - sprite: _Nuclear14/Objects/Specific/Medical/drugs.rsi - state: superstimpak - product: N14SuperStimpak - cost: 1000 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalRadaway - icon: - sprite: _Nuclear14/Objects/Specific/Medical/bloodbags.rsi - state: radaway - product: N14RadAwayBloodbag - cost: 500 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalAntidote - icon: - sprite: _Nuclear14/Objects/Specific/Medical/fallout2.rsi - state: antidote - product: N14Antidote - cost: 750 - category: Medical / Aid - group: market - -- type: cargoProduct - id: CargoMedicalAntidoteSyringe - icon: - sprite: _Nuclear14/Objects/Specific/Medical/antidote-injector.rsi - state: icon - product: N14ChemicalSyringeAntidote - cost: 2000 - category: Medical / Aid - group: market - - -# Weapons -- type: cargoProduct - id: CargoWeaponRifleR91 - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/r91.rsi - state: base - product: N14WeaponRifle556R91 - cost: 2000 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponChineseRifle - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/chineserifle.rsi - state: base - product: N14WeaponRifle762Chinese - cost: 2500 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponCarbine - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/assaultcarbine.rsi - state: base - product: N14WeaponRifle556Carbine - cost: 2500 - category: Weapons - group: market - -- type: cargoProduct - id: CargoWeaponMarksman - icon: - sprite: _Nuclear14/Objects/Weapons/Guns/Rifles/marksman.rsi - state: base - product: N14WeaponRifle762Marksman - cost: 3000 - category: Weapons - group: market - -# Ammo - - -# Clothing / Armor -- type: cargoProduct - id: CargoClothingPowerArmorT45 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t45.rsi - state: icon - product: N14ClothingOuterPowerArmorT45 - cost: 3000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT51 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t51.rsi - state: icon - product: N14ClothingOuterPowerArmorT51 - cost: 4000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT60 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60.rsi - state: icon - product: N14ClothingOuterPowerArmorT60 - cost: 5000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorT60Tesla - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/t60tesla.rsi - state: icon - product: N14ClothingOuterPowerArmorT60Tesla - cost: 6000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorAdvanced1 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced1.rsi - state: icon - product: N14ClothingOuterPowerArmorAdvanced1 - cost: 6000 - category: Clothing - group: market - -- type: cargoProduct - id: CargoClothingPowerArmorAdvanced2 - icon: - sprite: _Nuclear14/Clothing/OuterClothing/PowerArmor/advanced2.rsi - state: icon - product: N14ClothingOuterPowerArmorAdvanced2 - cost: 7000 - category: Clothing - group: market - -# Companions - - -# Crafting - - diff --git a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml index d706ceb1c11..60b439fb32c 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/Fills/crates.yml @@ -31,8 +31,171 @@ id: N14CrateBreakPlainFilledCigarettesRepublic suffix: republics name: Republic cigarette crate + description: Crate containing 6 republic cig packs components: - type: StorageFill contents: - id: N14CigarettePackRepublics - amount: 6 \ No newline at end of file + amount: 6 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledSteelSheet + name: Steel sheets crate + description: Crate containing 30 steel sheets + components: + - type: StorageFill + contents: + - id: SheetSteel + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledPlasticSheet + name: Plastic sheets crate + description: Crate containing 30 plastic sheets + components: + - type: StorageFill + contents: + - id: SheetPlastic + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGlassSheet + name: Glass sheets crate + description: Crate containing 30 glass sheets + components: + - type: StorageFill + contents: + - id: SheetGlass + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWood + name: Wood crate + description: Crate containing 30 wood planks + components: + - type: StorageFill + contents: + - id: MaterialWoodPlank + amount: 1 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledMechanicParts + name: Mechanic parts crate + description: Crate containing 4 screws, 2 small gears and 2 large gears + components: + - type: StorageFill + contents: + - id: N14JunkComponentScrew + amount: 4 + - id: N14JunkComponentGearSmall + amount: 2 + - id: N14JunkComponentGearLarge + amount: 2 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledAdhesive + name: Adhesives crate + description: Crate containing 4 duct tapes + components: + - type: StorageFill + contents: + - id: N14JunkDuctTape + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledStimpak + name: Stimpak crate + description: Crate containing 6 stimpaks + components: + - type: StorageFill + contents: + - id: N14Stimpak + amount: 6 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledEmergencyRations + name: Emergency rations crate + description: Crate containing 2 Pork n' Beans, 2 BlamCo Mac & Cheese, 2 Salisbury Steak and 2 Dandy Boy Apples. + components: + - type: StorageFill + contents: + - id: N14FoodPorkBeans + amount: 2 + - id: N14FoodSalisburysteak + amount: 2 + - id: N14FoodBlamcomaccheese + amount: 2 + - id: N14FoodDandyboyapples + amount: 2 + +- type: entity + parent: N14CrateArmy + id: N14CrateArmyFilledSmallGameRifle + name: Small game rifle crate + description: Crate containing 4 Varmint rifles. + components: + - type: StorageFill + contents: + - id: N14WeaponSniper556VarmintRifle + amount: 4 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledWatterBottle + name: Water bottles crate + description: Crate containing 10 water bottles + components: + - type: StorageFill + contents: + - id: DrinkWaterBottleFull + amount: 10 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledNukaCola + name: Nuka cola crate + description: Crate containing 10 nuka colas + components: + - type: StorageFill + contents: + - id: N14DrinkNukaCola + amount: 10 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledGunpowder + name: Gunpowder crate + description: Crate containing 20 gunpowder + components: + - type: StorageFill + contents: + - id: Gunpowder20 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledLeadBar + name: Lead bars crate + description: Crate containing 20 lead bars + components: + - type: StorageFill + contents: + - id: N14IngotLead20 + +- type: entity + parent: N14CrateBreakPlain + id: N14CrateBreakPlainFilledAbraxo + name: Abraxo cleaner crate + description: Crate containing 4 Abraxo Cleaners + components: + - type: StorageFill + contents: + - id: N14JunkAbraxoCleaner + amount: 4 diff --git a/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml b/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml index 18a59538d87..4181e13dbd9 100644 --- a/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml +++ b/Resources/Prototypes/_Nuclear14/Catalog/VendingMachines/Inventories/nuka.yml @@ -16,10 +16,9 @@ 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 +# higher number higher chances (also maximum amount) diff --git a/Resources/Prototypes/_Nuclear14/Damage/modifier_sets.yml b/Resources/Prototypes/_Nuclear14/Damage/modifier_sets.yml index abef5097a79..8a74733a49c 100644 --- a/Resources/Prototypes/_Nuclear14/Damage/modifier_sets.yml +++ b/Resources/Prototypes/_Nuclear14/Damage/modifier_sets.yml @@ -1,21 +1,21 @@ - type: damageModifierSet id: Ghoul coefficients: - Blunt: 1.2 - Slash: 1.1 - Piercing: 0.9 + Blunt: 1.05 + Slash: 1.05 + Piercing: 1.05 Cold: 1 Poison: 0.8 Cellular: 0.2 - Radiation: 0 + Radiation: 0.25 Asphyxiation: 0.1 Bloodloss: 0.8 - type: damageModifierSet id: GhoulGlowing coefficients: - Blunt: 1.5 - Slash: 1.5 + Blunt: 1.1 + Slash: 1.1 Piercing: 1.1 Cold: 0.6 Poison: 0.6 @@ -24,6 +24,19 @@ Asphyxiation: 0.1 Bloodloss: 0.8 +- type: damageModifierSet + id: GhoulNPC + coefficients: + Blunt: 1 + Slash: 1 + Piercing: 1 + Cold: 1 + Poison: 0.25 + Cellular: 0.2 + Radiation: 0 + Asphyxiation: 0.1 + Bloodloss: 0 + # immune to everything except physical and heat damage - type: damageModifierSet id: WastelandAnimal @@ -38,7 +51,7 @@ Bloodloss: 1 Cellular: 1 flatReductions: - Radiation: 5 + Radiation: 100 - type: damageModifierSet id: N14Insect # Exo-skeleton, should have simillarities to skeleton resistances. @@ -46,7 +59,7 @@ Blunt: 1.1 Heat: 1.5 flatReductions: - Radiation: 5 + Radiation: 100 - type: damageModifierSet id: N14Scale # Skin tougher, bones weaker, strong stomachs, cold-blooded (kindof) @@ -57,7 +70,7 @@ Heat: 0.9 Poison: 0.9 flatReductions: - Radiation: 5 + Radiation: 100 - type: damageModifierSet id: N14ScaleFireresist @@ -68,5 +81,5 @@ Heat: 0 Poison: 0.9 flatReductions: - Radiation: 5 + Radiation: 100 Heat: 10 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml index e1f68dacb9b..e495dfd20b2 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Belt/belts.yml @@ -28,15 +28,39 @@ - type: entity parent: N14ClothingBeltStorageBase - id: ClothingBeltBoSMidwestWebbing - name: Midwest BoS carrier - description: A simple black carrier capable of holding all kind of ammo. + id: N14ClothingBeltBoSWebbing + name: BoS webbing + description: A simple black carrier, capable of holding all kind of ammo and medicine for field-use. components: - type: Sprite sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi - type: Clothing sprite: _Nuclear14/Clothing/Belt/midwestboswebbing.rsi - type: Appearance + - type: Storage + whitelist: + tags: + - Wrench + - Bottle + - Spray + - Brutepack + - Bloodpack + - Gauze + - Ointment + - CigPack + - PillCanister + - Radio + - DiscreteHealthAnalyzer + - SurgeryTool + - CigPack + - N14AmmoCell + components: + - Hypospray + - Injector + - Pill + - HandLabeler + - BallisticAmmoProvider + - CartridgeAmmo - type: entity parent: N14ClothingBeltStorageBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml index 43846a10617..88e19262370 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/hats.yml @@ -516,3 +516,44 @@ Poison: 0.8 - type: ClothingSpecialModifier enduranceModifier: 1 + +#Blue Line Caravan Co. + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCaravan + name: railwayman's cap + description: A hat perfect for the working man/woman/person/ghoul. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi + - type: ClothingSpecialModifier + enduranceModifier: 1 + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCaravanUniform + name: Blue Line Caravan Co. employee hat + description: Serving the Blue Line Caravan Company loudly and proudly. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi + - type: ClothingSpecialModifier + charismaModifier: 1 + +- type: entity + parent: ClothingHeadBase + id: N14ClothingHeadHatCaravanSuit + name: Blue Line Caravan Co. boss' hat + description: Hat worn by those affectionately known as the Big Cheese, the Head Honcho, or simply Boss + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi + - type: ClothingSpecialModifier + charismaModifier: 2 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml index 68bd4665d3d..1da6e5ae44b 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Head/helmets.yml @@ -501,3 +501,25 @@ - type: Tag tags: - HidesHair + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMetal + id: N14ClothingHeadHatPressHelmet + name: prewar reporter helmet + description: An old piece of armor once used by the Free Press before the war. Should still offer some protection. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi + +- type: entity + parent: N14ClothingHeadHatBaseHelmetMetal + id: N14ClothingHeadHatPrewarMilitaryHelmet + name: prewar military helmet + description: An old piece of armor once used by the US Army before the end. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml index 158e80629e1..e917fe1fe4d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/OuterClothing/falloutarmor.yml @@ -1079,3 +1079,21 @@ Heat: 0.6 - type: ExplosionResistance damageCoefficient: 0.7 +# random other armor +- type: entity + parent: ClothingOuterBase + id: N14ClothingOuterPressArmor + name: prewar reporter armor + description: An old piece of armor once used by the Free Press before the war. Though the kevlar is worn, it will still offer some protection. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi + - type: Armor + modifiers: + coefficients: + Blunt: 0.75 + Slash: 0.75 + Piercing: 0.75 + Heat: 0.9 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml index 46f1d25af9e..4a7fe7ac3f7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Clothing/Uniform/falloutjumpsuits.yml @@ -314,6 +314,27 @@ - type: Clothing sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/cowboygrey.rsi +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformJumpsuitFudd + name: fudd clothes + description: A worn and partially torn pair of jeans, paired with a faded M81 pattern BDU jacket. "If you can't kill it with 6 rounds, you ain't a good shot." + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformJumpsuitMilUniform + name: prewar military uniform + description: A worn set of prewar M81 pattern BDUs. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi #NCR - type: entity @@ -556,7 +577,7 @@ - type: entity parent: ClothingUniformBase id: N14ClothingUniformJumpsuitBOSWashingtonFieldScribe - name: MidWest brotherhood scribe uniform + name: washington brotherhood scribe uniform description: A maroon jumper and black combat trousers, the uniform worn by field-scribes of Washington's Brotherhood of Steel. components: - type: Sprite @@ -604,9 +625,47 @@ parent: ClothingUniformBase id: N14ClothingUniformJumpsuitRCMP name: RCMP uniform - description: A elegant red jacket with black pants, not the best camoflage but what it represents is more than enough to make proud anyone who wears it. + description: A elegant red jacket with black pants, not the best camouflage but what it represents is more than enough to make proud anyone who wears it. components: - type: Sprite sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/mountie.rsi - type: Clothing sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/mountie.rsi + +#Blue Line Caravan Co + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformJumpsuitCaravanShirt + name: Blue Line Caravan Co. uniform + description: A white shirt and pair of blue slacks, yellow armband affixed to both sleeves signifying membership of Blue Line Caravan Company. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformJumpsuitCaravanOveralls + name: Blue Line Caravan Co. overalls + description: A white shirt and pair of workers overalls, yellow armband affixed to both sleeves signifying membership of Blue Line Caravan Company. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi + +- type: entity + parent: ClothingUniformBase + id: N14ClothingUniformJumpsuitCaravanSuit + name: Blue Line Caravan Co. suit + description: A finely trimmed suit, gold pin tacked on the chest. Worn only by those who have earned the favour and trust of The Boss, enough to run branches of their Blue Line Caravan Company. + components: + - type: Sprite + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi + - type: Clothing + sprite: _Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi + + + diff --git a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml index c8fef1b6a6a..f0b1243c88f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Markers/Spawners/mobs.yml @@ -377,6 +377,36 @@ prototypes: - N14MobRaiderPsychoRanged +- type: entity + name: Raider Ranged Psycho Spawner + id: N14SpawnMobRaiderPsychoHunter + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi + state: raider_ranged + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRaiderHunter + +- type: entity + name: Raider Ranged Psycho Spawner + id: N14SpawnMobRaiderPsychoSkrimisher + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/RaidersSimpleMob/Raiders.rsi + state: raider_ranged + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobRaiderSkrimisher + - type: entity name: Raider Psycho Boss Spawner id: N14SpawnMobRaiderBoss @@ -635,6 +665,21 @@ prototypes: - N14MobRobotEyebot +- type: entity + name: Spore Plant Spawner + id: N14SpawnMobSporePlant + parent: MarkerBase + components: + - type: Sprite + layers: + - state: green + - sprite: _Nuclear14/Mobs/Plants/sporeplant.rsi + state: sporeplant + - state: ai + - type: ConditionalSpawner + prototypes: + - N14MobSporeplant + #Pets - type: entity name: Haggis the Cat Spawner diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml index ddfbbb90656..cd099850895 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/basemob.yml @@ -204,7 +204,7 @@ components: - type: Damageable damageContainer: Biological - damageModifierSet: Ghoul + damageModifierSet: GhoulNPC # - type: NoSlip - type: NpcFactionMember factions: @@ -319,4 +319,4 @@ task: SimpleFollowHostileCompound # HTN compound must include FollowCompound so pet can follow its owner - type: LanguageKnowledge understands: - - GalacticCommon \ No newline at end of file + - GalacticCommon diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/mobs_despawning.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/mobs_despawning.yml index 705fa0fcb5d..2c5e4f85003 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/mobs_despawning.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/mobs_despawning.yml @@ -101,4 +101,14 @@ - type: entity parent: [ N14MobRaiderPsycho, N14MobDespawning ] id: N14MobRaiderPsychoDespawning + noSpawn: true + +- type: entity + parent: [ N14MobRaiderHunter, N14MobDespawning ] + id: N14MobRRaiderPsychoHunterDespawning + noSpawn: true + +- type: entity + parent: [ N14MobRaiderSkrimisher, N14MobDespawning ] + id: N14MobRRaiderPsychoSkrimisherDespawning noSpawn: true \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/plants.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/plants.yml new file mode 100644 index 00000000000..ce8680a34f8 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/plants.yml @@ -0,0 +1,68 @@ +- type: entity + name: wasteland plant + abstract: true + id: N14MobBaseHostilePlant + parent: N14MobBaseHostile + description: A mutated plant. You wonder where it came from, a vault perhaps? + components: + - type: Damageable + damageContainer: Biological + - type: NoSlip + - type: Speech + speechSounds: Squeak + - type: ReplacementAccent + accent: genericAggressive + - type: Butcherable + spawned: + - id: N14FoodMeatRadRaw #change to something else + amount: 1 + - type: Fixtures + fixtures: + fix1: + shape: + !type:PhysShapeCircle + radius: 0.30 + density: 30 + mask: + - SmallMobMask + layer: + - SmallMobLayer + +- type: entity + name: spore plant + parent: N14MobBaseHostilePlant + id: N14MobSporeplant + description: A mutated venus fly trap. Who knew they got this big? + components: + - type: Sprite + drawdepth: Mobs + layers: + - map: [ "enum.DamageStateVisualLayers.Base" ] + state: sporeplant + sprite: _Nuclear14/Mobs/Plants/sporeplant.rsi + - type: DamageStateVisuals + states: + Alive: + Base: sporeplant + Critical: + Base: sporeplant + Dead: + Base: dead + - type: MovementSpeedModifier + baseWalkSpeed : 0 + baseSprintSpeed : 0 + - type: Stamina + critThreshold: 20 + - type: Bloodstream + bloodMaxVolume: 50 + - type: ReplacementAccent + accent: mouse + - type: MobThresholds + thresholds: + 0: Alive + 65: Dead + - type: MeleeWeapon + range: 2 + damage: + groups: + Brute: 6 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/raiders_ranged.yml b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/raiders_ranged.yml index 5efb145176f..c4113301c1e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/raiders_ranged.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Mobs/NPCs/raiders_ranged.yml @@ -23,8 +23,8 @@ rootTask: task: SimpleHumanoidHostileCompound - type: Gun #Mobs currently cannot bolt a gun, so we have to simulate them firing it - fireRate: 2 - soundGunshot: /Audio/Weapons/Guns/Gunshots/mk58.ogg + fireRate: 1.35 + soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Pistols/N14WeaponPistol9mm/shot1.ogg useKey: false selectedMode: SemiAuto availableModes: @@ -98,8 +98,8 @@ suffix: AI components: - type: Gun - fireRate: 5 - soundGunshot: /Audio/Weapons/Guns/Gunshots/mk58.ogg + fireRate: 3 + soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Pistols/N14WeaponPistol9mm/shot1.ogg useKey: false selectedMode: FullAuto availableModes: @@ -117,3 +117,56 @@ prototypes: - RaiderBossGear +- type: entity + name: Psycho Raider Hunter + parent: N14MobRaiderPsychoRanged + id: N14MobRaiderHunter + description: Psychopatic raider armed with a long rifle. Dangerous at a distance. + suffix: AI + components: + - type: Gun + fireRate: 0.5 + soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Snipers/N14WeaponPipeRifle/shot1.ogg + useKey: false + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: CombatMode + - type: BasicEntityAmmoProvider + proto: N14Cartridge308Rifle + capacity: 3 + count: 3 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 2 + rechargeSound: + path: /Audio/Weapons/Guns/MagIn/bullet_insert.ogg + - type: Loadout + prototypes: + - RaiderHunterGear + +- type: entity + name: Psycho Raider Skrimisher + parent: N14MobRaiderPsychoRanged + id: N14MobRaiderSkrimisher + description: Psychopatic raider armed with a scattergun. Deadly at close range. + suffix: AI + components: + - type: Gun + fireRate: 0.5 + soundGunshot: /Audio/_Nuclear14/Weapons/Guns/Shotguns/N14WeaponCaravanShotgun/shot1.ogg + useKey: false + selectedMode: SemiAuto + availableModes: + - SemiAuto + - type: CombatMode + - type: BasicEntityAmmoProvider + proto: N14ShellShotgun20 + capacity: 6 + count: 6 + - type: RechargeBasicEntityAmmo + rechargeCooldown: 2 + rechargeSound: + path: /Audio/_Nuclear14/Weapons/Effects/Reload/Shotguns/shotgun_insert.ogg + - type: Loadout + prototypes: + - RaiderSkrimisherGear diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml index f51328af5ef..f0e29ee943e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Consumable/Drinks/drinks_bottles.yml @@ -312,6 +312,10 @@ reagents: - ReagentId: NukaColaQuantum Quantity: 50 + - type: PointLight + color: "#8DB6FF" + radius: 1.5 + energy: 0.2 - type: entity parent: N14DrinkNukaCola diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml index 13557001fad..b1f4cf06c17 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/materials.yml @@ -63,6 +63,14 @@ - type: Stack count: 10 +- type: entity + parent: Gunpowder + id: Gunpowder20 + suffix: 20 + components: + - type: Stack + count: 20 + - type: entity parent: Gunpowder id: Gunpowder1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml index 64b7a452ece..070e60547ca 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Materials/metals.yml @@ -56,6 +56,17 @@ - type: Stack count: 1 +- type: entity + parent: N14IngotLead + id: N14IngotLead20 + name: lead bar + suffix: 20 + components: + - type: Sprite + state: ingot_lead + - type: Stack + count: 20 + #MARK: Aluminum - type: entity parent: IngotBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml index 2660f34fcd3..21b5f0bc822 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Misc/currency.yml @@ -39,6 +39,11 @@ name: bottlecap description: A bottlecap from a bottle of Nuka-Cola. components: + - type: Cash + - type: Material + - type: PhysicalComposition + materialComposition: + Credit: 1 - type: StaticPrice price: 0 - type: Tag @@ -79,9 +84,8 @@ - type: stack id: Caps name: caps - icon: { sprite: /Textures/_Nuclear14/Objects/Misc/currency.rsi, state: caps3 } + icon: { sprite: _Nuclear14/Objects/Misc/currency.rsi, state: caps3 } spawn: N14CurrencyCap - maxCount: 500 - type: entity parent: N14CurrencyCap @@ -134,6 +138,9 @@ name: pre-war money description: Wads of useless paper. Make it rain! components: + - type: PhysicalComposition + materialComposition: + Credit: 0 - type: Stack stackType: PrewarMoney count: 1 @@ -199,7 +206,15 @@ state: prewar3 - type: Stack count: 500 - + +- type: material + id: NcrCredit + name: ncrCredit + unit: materials-unit-bill + stackEntity: N14CurrencyNCRDollar + icon: { sprite: /Textures/_Nuclear14/Objects/Misc/currency.rsi, state: ncr3 } + price: 0.66 + # NCR Dollars - type: entity parent: N14CurrencyCap @@ -207,6 +222,10 @@ name: NCR dollar description: Wads of paper, these ones bear the insignia of the NCR. Make it rain! components: + - type: Cash + - type: PhysicalComposition + materialComposition: + NcrCredit: 1 - type: Stack stackType: NCRDollar count: 1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml index 4d1b0a77c95..3ae954e1a3d 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/UndecidedLoadout.yml @@ -699,4 +699,4 @@ sprite: _Nuclear14/Objects/Misc/kits.rsi state: marksman content: - - KitMarksmanBoSWashington \ No newline at end of file + - KitMarksmanBoSWashington diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml index 42442e558af..9d92217e01c 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Kits/kits.yml @@ -139,10 +139,10 @@ path: /Audio/Effects/unwrap.ogg - type: entity - name: medic kit + name: combat lifesaver kit parent: KitBase id: KitMedic - description: A crate containing all an NCR Medic needs to patrol the wasteland. + description: A crate containing all an NCR CLS needs to patrol the wasteland. components: - type: Sprite state: medic @@ -156,6 +156,7 @@ - id: N14MagazineSMG9mm amount: 4 - id: N14CombatKnife + - id: N14ClothingHeadHatNCRHelmetMetalMedic - id: N14BoxCardboardMREBoxCFilled sound: path: /Audio/Effects/unwrap.ogg @@ -180,6 +181,7 @@ - id: N14WeaponPistol9mm - id: N14MagazinePistol9mm amount: 2 + - id: SheetSteel10 - id: N14CombatKnife - id: N14BoxCardboardMREBoxCFilled sound: @@ -654,14 +656,17 @@ - id: N14WeaponLaserPistol - id: N14PowerCellSmall amount: 2 - - id: N14ClothingBeltMedicalFilled + - id: Gauze + - id: N14AloeSalve + - id: Brutepack - id: ClothingHandsGlovesFingerless - id: N14ClothingHeadHatBrotherhoodFieldCap - id: N14ClothingOuterBrotherhoodMidwestFieldScribeCoat - id: N14CombatKnife - id: N14Stimpak + amount: 2 - id: N14BoxCardboardMREBoxKFilled - - id: ClothingBeltBoSMidwestWebbing + - id: N14ClothingBeltBoSWebbing - id: N14ClothingUniformJumpsuitBOSFieldScribe #engineer scribe @@ -796,7 +801,7 @@ - id: ClothingHandsGlovesChemist - id: ClothingHeadBrotherhoodScribeHeadset - id: N14ClothingBootsBlack - - id: N14ClothingOuterBrotherhoodMedicalScribeRobes #CHANGE THIS! + - id: N14ClothingOuterBrotherhoodMedicalScribeRobes - id: N14CombatKnife - id: N14Stimpak - id: N14BoxCardboardMREBoxKFilled @@ -817,14 +822,17 @@ - id: N14WeaponLaserPistol - id: N14PowerCellSmall amount: 2 - - id: N14ClothingBeltMedicalFilled - id: ClothingHandsGlovesFingerless - id: N14ClothingHeadHatBrotherhoodFieldCap - id: N14ClothingOuterBrotherhoodFieldScribeCoat - id: N14CombatKnife - id: N14Stimpak + amount: 2 + - id: Gauze + - id: N14AloeSalve + - id: Brutepack - id: N14BoxCardboardMREBoxKFilled - - id: ClothingBeltBoSWebbing + - id: N14ClothingBeltBoSWebbing - id: N14ClothingUniformJumpsuitBOSWashingtonFieldScribe #engineer scribe @@ -919,4 +927,4 @@ - id: N14PowerCellSmall amount: 2 - id: N14Stimpak - - id: N14BoxCardboardMREBoxKFilled \ No newline at end of file + - id: N14BoxCardboardMREBoxKFilled diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml index ac2373ad5fa..ae0f228b071 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Specific/Medical/chemicals.yml @@ -92,6 +92,8 @@ name: stimpak description: A syringe filled with a wondrous mixture of medical reagents. Essential for those with little to no medical knowledge. components: + - type: StaticPrice + price: 15 - type: Sprite layers: - state: stimpak @@ -120,6 +122,8 @@ name: dirty stimpak description: A syringe filled with a once-wondrous mixture of medical reagents, now tainted by the wastes. Essential for those with little to no medical knowledge. components: + - type: StaticPrice + price: 8 - type: SolutionContainerManager solutions: pen: @@ -134,6 +138,8 @@ name: super stimpak description: A stronger version of the stimpak. Be careful, however, as you can overdose from taking too much. components: + - type: StaticPrice + price: 25 - type: Sprite layers: - state: superstimpak @@ -371,6 +377,8 @@ name: RadAway description: A bloodbag filled with an odd oily reagent that cures any radiation you've sustained. components: + - type: StaticPrice + price: 20 - type: Sprite sprite: _Nuclear14/Objects/Specific/Medical/bloodbags.rsi netsync: false diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml index 27ea27bd0ec..99c1fa86a4f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Ammunition/Battery/Battery.yml @@ -6,7 +6,7 @@ parent: BaseItem components: - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.015 - type: Explosive explosionType: Default maxIntensity: 200 @@ -184,7 +184,7 @@ parent: BaseItem components: - type: Battery - pricePerJoule: 0.15 + pricePerJoule: 0.015 - type: Explosive explosionType: Default maxIntensity: 200 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 a33923e557b..8bbcdd3a935 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 @@ -34,7 +34,7 @@ - PowerCell - type: Appearance - type: StaticPrice - price: 500 + price: 25 - type: ContainerContainer containers: gun_magazine: !type:ContainerSlot diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml index fa9654b6cb3..5d9069181b7 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Pistols/pistols.yml @@ -64,7 +64,7 @@ zeroVisible: true - type: Appearance - type: StaticPrice - price: 500 + price: 8 - type: FollowDistance backStrength: 6 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml index 0f808faa0d4..a7c3804edb0 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml @@ -81,6 +81,7 @@ - type: entity parent: N14WeaponRevolver10mm id: N14WeaponRevolver10mmEmpty + suffix: Empty components: - type: RevolverAmmoProvider proto: null 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 6aa529c96ea..aabab71858f 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/baton-club.yml @@ -76,6 +76,30 @@ - belt - suitStorage +- type: entity + name: training sword + description: A crude wooden sword used for training in melee combat. + parent: BaseItem + id: N14TrainingSword + components: + - type: StaminaDamageOnHit + damage: 5 + - type: StaminaDamageOnCollide + damage: 5 + - type: MeleeWeapon + wideAnimationRotation: -60 + attackRate: 1.2 + damage: + types: + Blunt: 2 + soundSwing: + collection: N14MediumSwing + - type: Sprite + sprite: _Nuclear14/Objects/Weapons/Melee/training_sword.rsi + state: icon + - type: Item + size: Large + - type: entity name: trench club parent: BaseItem diff --git a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml index cac26dbbbb1..77500292825 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Objects/Weapons/Melee/spear.yml @@ -27,7 +27,7 @@ friction: 0.2 - type: Sharp - type: Sprite - sprite: Objects/Weapons/Melee/spear.rsi + sprite: _Nuclear14/Objects/Weapons/Melee/spear.rsi layers: - state: spear - state: spear1 diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml index 9395a23143b..c3aaad75f4e 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/craftingbenches.yml @@ -60,6 +60,7 @@ - N14WastelandSpear - N14WastelandTribalJavelin - N14BrassKnife + - N14TrainingSword - type: entity parent: N14WorkbenchBase diff --git a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/wrecks.yml b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/wrecks.yml index d5e9f7915ce..01671c71f86 100644 --- a/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/wrecks.yml +++ b/Resources/Prototypes/_Nuclear14/Entities/Structures/Misc/wrecks.yml @@ -16,6 +16,7 @@ layer: - MidImpassable - LowImpassable + - BulletImpassable - type: Damageable damageContainer: Inorganic damageModifierSet: Metallic @@ -23,7 +24,7 @@ thresholds: - trigger: !type:DamageTrigger - damage: 100 + damage: 500 behaviors: - !type:DoActsBehavior acts: ["Destruction"] @@ -42,6 +43,10 @@ - !type:PlaySoundBehavior sound: collection: MetalBreak + - type: PacifismDangerousAttack + - type: Explosive + explosionType: Default + totalIntensity: 120 # ~ 5 tile radius - type: Sprite sprite: _Nuclear14/Structures/Misc/wrecks.rsi layers: @@ -443,4 +448,4 @@ - MidImpassable - LowImpassable - type: Occluder - boundingBox: "-1,-0.7,1.5,0.4" \ No newline at end of file + boundingBox: "-1,-0.7,1.5,0.4" diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_blue_line_caravan.yml b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_blue_line_caravan.yml new file mode 100644 index 00000000000..5fc6b54b933 --- /dev/null +++ b/Resources/Prototypes/_Nuclear14/Loadouts/Roles/loadouts_blue_line_caravan.yml @@ -0,0 +1,48 @@ +- type: loadout + id: LoadoutBlueLineCCOveralls + category: Roles + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - CaravanGuard + items: + - N14ClothingUniformJumpsuitCaravanOveralls + +- type: loadout + id: LoadoutBlueLineCCOverallsTrader + category: Roles + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - CaravanTrader + items: + - N14ClothingUniformJumpsuitCaravanOveralls + +- type: loadout + id: LoadoutBlueLineCCCap + category: Roles + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - CaravanGuard + items: + - N14ClothingHeadHatCaravan + +- type: loadout + id: LoadoutBlueLineCCCapTrader + category: Roles + cost: 0 + exclusive: true + requirements: + - !type:CharacterJobRequirement + jobs: + - CaravanTrader + items: + - N14ClothingHeadHatCaravan + diff --git a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml index 2a39209e8c4..a58c2bc51a4 100644 --- a/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml +++ b/Resources/Prototypes/_Nuclear14/Loadouts/outerClothing.yml @@ -68,6 +68,16 @@ items: - N14ClothingOuterFlannelBrown +- type: loadout + id: N14ClothingOuterCoatFollowerLab + category: Outer + cost: 1 + requirements: + - !type:CharacterItemGroupRequirement + group: N14LoadoutOuter + items: + - N14ClothingOuterCoatFollowerLab + - type: loadout id: N14LoadoutOuterCoatWinterArmored category: Outer @@ -216,4 +226,4 @@ - !type:CharacterItemGroupRequirement group: N14LoadoutOuter items: - - N14ClothingOuterRaiderBlastmaster \ No newline at end of file + - N14ClothingOuterRaiderBlastmaster diff --git a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml index c79ed2b3d34..cc240bb9a12 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/materials.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/materials.yml @@ -14,7 +14,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_lead } color: "#C0C0C0" - price: 0.15 + price: 0.04 - type: material id: Sulfur @@ -23,7 +23,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_brass } color: "#FDD805" - price: 0.15 + price: 0.01 - type: material id: Aluminum @@ -32,7 +32,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_aluminum } color: "#C0C0C0" - price: 0.15 + price: 0.01 - type: material id: N14Copper @@ -41,7 +41,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_copper } color: "#B87333" - price: 0.15 + price: 0.01 - type: material id: N14Brass @@ -50,7 +50,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_brass } color: "#B5A642" - price: 0.20 + price: 0.01 - type: material id: N14Gold @@ -59,7 +59,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_gold } color: "#FFD700" - price: 1.00 + price: 0.14 - type: material id: N14Iron @@ -68,7 +68,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_iron } color: "#B0C4DE" - price: 0.15 + price: 0.02 - type: material id: N14Silver @@ -77,7 +77,7 @@ unit: materials-unit-bar icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: ingot_silver } color: "#C0C0C0" - price: 0.50 + price: 0.1 # Materials - type: material @@ -86,7 +86,7 @@ name: materials-gunpowder icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#3E201D" - price: 0.15 + price: 0.075 - type: material id: ScrapElectronic @@ -94,7 +94,7 @@ name: materials-scrap-electronic unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_electronic_3 } - price: 0.15 + price: 0.005 - type: material id: ScrapSteel @@ -102,7 +102,7 @@ name: materials-scrap-steel unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_steel_3 } - price: 0.1 + price: 0.005 - type: material id: ScrapGold @@ -111,7 +111,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_gold } color: "#FFD700" - price: 0.15 + price: 0.007 - type: material id: ScrapCopper @@ -120,7 +120,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_copper } color: "#B87333" - price: 0.1 + price: 0.005 - type: material id: ScrapBrass @@ -129,7 +129,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_brass } color: "#B5A642" - price: 0.1 + price: 0.005 - type: material id: Scrap @@ -138,7 +138,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_3 } color: "#4A4A4A" - price: 0.1 + price: 0.003 - type: material id: ScrapLead @@ -147,7 +147,7 @@ unit: materials-unit-bunch icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: scrap_lead } color: "#C0C0C0" - price: 0.1 + price: 0.005 - type: reagent id: Gunpowder @@ -172,7 +172,7 @@ name: materials-charcoal icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: powder_lead } color: "#1D3B3E" - price: 0.15 + price: 0.005 - type: material id: Fertilizer @@ -180,7 +180,7 @@ name: materials-fertilizer icon: { sprite: /Textures/_Nuclear14/Objects/Misc/Sacks/daesack2.rsi, state: icon } color: "#1D3B3E" - price: 0.15 + price: 0.05 - type: reagent id: Fertilizer @@ -236,7 +236,7 @@ name: materials-timber icon: { sprite: _Nuclear14/Structures/Decoration/flora.rsi, state: tree_timber } color: "#1D3B3E" - price: 0.15 + price: 0.003 - type: material id: Leather @@ -244,7 +244,7 @@ name: materials-leather unit: materials-unit-roll icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: leather_3 } - price: 0.15 + price: 0.02 - type: material id: Exoskeleton @@ -268,7 +268,7 @@ name: materials-raw-leather unit: materials-unit-roll icon: { sprite: _Nuclear14/Objects/Misc/materials.rsi, state: raw_leather_2 } - price: 0.10 + price: 0.01 - type: material id: Thread @@ -277,4 +277,4 @@ unit: materials-unit-roll icon: { sprite: /Textures/_Nuclear14/Objects/Misc/materials.rsi, state: thread } color: "#d2691e" - price: 0.10 \ No newline at end of file + price: 0.01 \ No newline at end of file diff --git a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml index 516100e09b5..213bdd70dba 100644 --- a/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Reagents/medicine.yml @@ -94,7 +94,9 @@ - !type:ModifyBleedAmount amount: -0.1 - !type:ChemVomit - probability: 0.05 + conditions: + - !type:ReagentThreshold + min: 30 # Strong overtime healing - type: reagent diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml index 4af179ab1b2..57fe4a2337b 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Lathes/weapons.yml @@ -112,4 +112,12 @@ materials: N14Brass: 200 N14Iron: 100 - Cloth: 200 \ No newline at end of file + Cloth: 200 + +- type: latheRecipe + id: N14TrainingSword + result: N14TrainingSword + category: N14WeaponMelee + completetime: 5 + materials: + Wood: 300 diff --git a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/medicine.yml b/Resources/Prototypes/_Nuclear14/Recipes/Reactions/medicine.yml index fa38a216641..602a52b9bca 100644 --- a/Resources/Prototypes/_Nuclear14/Recipes/Reactions/medicine.yml +++ b/Resources/Prototypes/_Nuclear14/Recipes/Reactions/medicine.yml @@ -146,4 +146,16 @@ amount: 5 effects: - !type:CreateEntityReactionEffect - entity: N14StimpakDirty \ No newline at end of file + entity: N14StimpakDirty + +- type: reaction + id: Bitterdrink + reactants: + ExtractBroc: + amount: 1 + ExtractXander: + amount: 1 + Water: + amount: 1 + products: + Bitterdrink: 1 diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/scribe.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/scribe.yml index b4ab512ceec..f29e154f28d 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/scribe.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/BrotherhoodWashington/scribe.yml @@ -34,11 +34,10 @@ head: N14ClothingHeadHatBrotherhoodBeret jumpsuit: N14ClothingUniformJumpsuitBOSBlack shoes: N14ClothingBootsCombatFilled - outerClothing: N14ClothingOuterBosScribe id: N14IDBrotherhoodWashingtonHolotagScribe ears: N14ClothingHeadsetBOSWashington belt: N14ClothingBeltUtilityFilled - pocket1: BoSWashingtonScribeKits # Crovax-N14 + pocket1: NCRBoSWashingtonScribekits back: N14ClothingBackpackMilitary # Crovax-N14 - type: playTimeTracker diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml index abe71e8b6ee..7fd1ed71466 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_guard.yml @@ -10,6 +10,7 @@ alwaysUseSpawner: true access: - CaravanCompanyGuard + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml special: - !type:AddComponentSpecial components: @@ -20,12 +21,14 @@ - type: startingGear id: CaravanGuardGear equipment: - jumpsuit: N14ClothingUniformJumpsuitCaravan + head: N14ClothingHeadHatCaravanUniform + jumpsuit: N14ClothingUniformJumpsuitCaravanShirt + gloves: N14ClothingHandsGlovesBlackBiker back: N14ClothingBackpackCaravanFilled shoes: N14ClothingBootsLeather id: N14IDPassportCaravan pocket2: N14WeaponPistol10mm - outerClothing: N14ClothingOuterLightMetalArmor + outerClothing: N14ClothingOuterPoliceVest suitstorage: N14WeaponRifle556R91 satchel: N14ClothingBackpackSatchelCaravanFilled duffelbag: N14ClothingBackpackDuffelCaravanFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml index 1980653ee87..0a0b40ec52c 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_leader.yml @@ -27,10 +27,10 @@ - type: startingGear id: CaravanLeaderGear equipment: - head: N14ClothingHeadHatTrucker - jumpsuit: N14ClothingUniformJumpsuitMerchant + head: N14ClothingHeadHatCaravanSuit + jumpsuit: N14ClothingUniformJumpsuitCaravanSuit back: N14ClothingBackpackCaravanLeaderFilled - shoes: N14ClothingBootsLeather + shoes: N14ClothingShoesBlack pocket1: N14WeaponPistol12mm id: N14IDPassportCaravanLeader diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml index 77872e31ad0..1983f0dd538 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/CaravanCompany/caravan_trader.yml @@ -11,6 +11,7 @@ access: - CaravanCompanyTrader - CaravanCompanyGuard + - Orders # DeltaV - Orders, see Resources/Prototypes/DeltaV/Access/cargo.yml special: - !type:AddComponentSpecial components: @@ -21,10 +22,12 @@ - type: startingGear id: CaravanTraderGear equipment: - jumpsuit: N14ClothingUniformJumpsuitTrader + head: N14ClothingHeadHatCaravanUniform + jumpsuit: N14ClothingUniformJumpsuitCaravanShirt back: N14ClothingBackpackCaravanTraderFilled - shoes: N14ClothingBootsLeather + shoes: N14ClothingShoesBrown id: N14IDPassportCaravanTrader + outerClothing: ClothingOuterVest innerClothingSkirt: N14ClothingUniformJumpsuitTrader #placeholder satchel: N14ClothingBackpackSatchelCaravanFilled duffelbag: N14ClothingBackpackDuffelCaravanFilled diff --git a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NPC/raider_pistol.yml b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NPC/raider_pistol.yml index 32729be793f..5bca92ed7dc 100644 --- a/Resources/Prototypes/_Nuclear14/Roles/Jobs/NPC/raider_pistol.yml +++ b/Resources/Prototypes/_Nuclear14/Roles/Jobs/NPC/raider_pistol.yml @@ -3,18 +3,42 @@ equipment: jumpsuit: N14ClothingUniformJumpsuitRags shoes: N14ClothingShoesRaider - head: N14ClothingHeadHatBandit - mask: ClothingMaskBandSkull - gloves: N14ClothingHandsGlovesBlackBiker - back: N14ClothingBackpackRandomFill - outerClothing: N14ClothingOuterRaiderCombat1 - + mask: N14ClothingMaskBrownMask + outerClothing: N14ClothingOuterLightMetalArmor + pocket1: Gauze1 + pocket2: N14MagazinePistol9mm + - type: startingGear - id: RaiderBossGear + id: RaiderHunterGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitBrahminFarmer + shoes: N14ClothingBootsCowboy + head: N14ClothingHeadHatCowboyBrown + mask: N14ClothingMaskRedMask + outerClothing: N14ClothingOuterRaiderBadlands + pocket1: N14Cartridge308Rifle + pocket2: N14HealingPowder + +- type: startingGear + id: RaiderSkrimisherGear equipment: jumpsuit: N14ClothingUniformJumpsuitRags - shoes: N14ClothingShoesRaider + shoes: N14ClothingBootsLeather head: ClothingHeadHelmetBone + gloves: ClothingClothWrap + outerClothing: N14ClothingOuterRaiderBlastmaster + pocket1: N14ShellShotgun20 + pocket2: N14Jet + +- type: startingGear + id: RaiderBossGear + equipment: + jumpsuit: N14ClothingUniformJumpsuitWastelandDoc + shoes: N14ClothingBootsLeather + head: N14ClothingHeadHatBeanie + mask: N14ClothingMaskBrownMask + eyes: N14ClothingEyesGlassesWelding gloves: N14ClothingHandsGlovesBlackBiker - back: N14ClothingBackpackRandomFill - outerClothing: N14ClothingOuterCombatRaider + outerClothing: N14ClothingOuterRaiderCombat1 + pocket1: N14Stimpak + pocket2: N14RadAwayInhaler diff --git a/Resources/Prototypes/_Nuclear14/radio_channels.yml b/Resources/Prototypes/_Nuclear14/radio_channels.yml index a1c5165dbe8..888765bf089 100644 --- a/Resources/Prototypes/_Nuclear14/radio_channels.yml +++ b/Resources/Prototypes/_Nuclear14/radio_channels.yml @@ -59,28 +59,28 @@ name: chat-radio-bosmidwest keycode: 'm' frequency: 1213 - color: "#8f4a4b" + color: "#3B72BF" - type: radioChannel id: BrotherhoodWashington name: chat-radio-boswashington keycode: 'w' frequency: 1313 - color: "#8f4a4b" + color: "#a2000f" - type: radioChannel id: Enclave name: chat-radio-enclave keycode: 'l' frequency: 1600 - color: "#8f4a4b" + color: "#c6cf00" - type: radioChannel id: NCR name: chat-radio-ncr keycode: 'r' frequency: 1546 - color: "#801c14" + color: "#d77715" - type: radioChannel id: PBS diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..e4d87c67542 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/icon.png new file mode 100644 index 00000000000..a8aa53202a4 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-left.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-left.png new file mode 100644 index 00000000000..8197983ef8f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-right.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-right.png new file mode 100644 index 00000000000..9c801786700 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/meta.json new file mode 100644 index 00000000000..8d150bb3cbb --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pato for Nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..2ef95890baf Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/icon.png new file mode 100644 index 00000000000..461d019005d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-left.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-left.png new file mode 100644 index 00000000000..ed5ce34cd66 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-right.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-right.png new file mode 100644 index 00000000000..19a4196b9e0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/meta.json new file mode 100644 index 00000000000..8d150bb3cbb --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanysuithat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pato for Nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..32e482275c1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/icon.png new file mode 100644 index 00000000000..b304405193f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-left.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-left.png new file mode 100644 index 00000000000..df5aa983f0d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-right.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-right.png new file mode 100644 index 00000000000..89cdbe9290f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/meta.json new file mode 100644 index 00000000000..8d150bb3cbb --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHats/caravancompanyuniformhat.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "made by Pato for Nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..8b1cc9199a1 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png new file mode 100644 index 00000000000..0490d4d2bd3 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json new file mode 100644 index 00000000000..4ea30dbaade --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/prewarmilitaryhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/obj/clothing/hats.dmi, https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/mob/head.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png new file mode 100644 index 00000000000..3e84971f66b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/equipped-HELMET.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png new file mode 100644 index 00000000000..dfd3cff8e57 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json new file mode 100644 index 00000000000..4ea30dbaade --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Head/FalloutHelmets/reporterhelmet.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/obj/clothing/hats.dmi, https://github.com/Civ13/Civ13/blob/8babab427b85181961f3770f024e348ffc1d3e41/icons/mob/head.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-HELMET", + "directions": 4 + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 00000000000..2785d1b9eb8 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/equipped-OUTERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png new file mode 100644 index 00000000000..8f85e11c24c Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json new file mode 100644 index 00000000000..b4088494004 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/OuterClothing/Armor/reportersvest.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/1bf1d0938cd99eeb3ca13762c0d9cbf82c27fc7e/icons/mob/suit.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/suits.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..aa22086631f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/icon.png new file mode 100644 index 00000000000..6c55d02a8ee Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/meta.json new file mode 100644 index 00000000000..c71131b6969 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyoveralls.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by Pato for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..e8bdb01033a Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/icon.png new file mode 100644 index 00000000000..9ddd93ab744 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/meta.json new file mode 100644 index 00000000000..c71131b6969 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanysuit.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by Pato for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..52824c000e7 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/icon.png new file mode 100644 index 00000000000..6300ed1ad5b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/meta.json new file mode 100644 index 00000000000..c71131b6969 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/caravancompanyuniform.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "made by Pato for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..38a8d26bc97 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png new file mode 100644 index 00000000000..1692b15326b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json new file mode 100644 index 00000000000..995c7b6f68b --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/fudd.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/mob/uniform.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 00000000000..874ab9c9f5b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/equipped-INNERCLOTHING.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png new file mode 100644 index 00000000000..651e3daf7d9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json new file mode 100644 index 00000000000..35a82e00d7c --- /dev/null +++ b/Resources/Textures/_Nuclear14/Clothing/Uniforms/FalloutSuits/prewaruniform.rsi/meta.json @@ -0,0 +1,18 @@ +{ + "version": 1, + "license": null, + "copyright": "Taken from Civ13 at https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/mob/uniform.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi, https://github.com/Civ13/Civ13/blob/d5cca4c4d7a649176c5f0b26d02dfccaaf5649f4/icons/obj/clothing/uniforms.dmi", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "icon" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/long_spikehair.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/long_spikehair.png new file mode 100644 index 00000000000..0b4c8921685 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/long_spikehair.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/meta.json new file mode 100644 index 00000000000..ab501d14cad --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "size": {"x": 32,"y": 32}, + "copyright": "Taken from https://github.com/tgstation/tgstation/blob/05ec94e46349c35e29ca91e5e97d0c88ae26ad44/icons/mob/species/human/human_face.dmi modified by Adrian16199, Zeta_Null", + "license": "CC-BY-SA-3.0", + "states": [ + { + "name": "long_spikehair", + "directions": 4 + }, + { + "name": "nerfish", + "directions": 4 + }, + { + "name": "plantish_poofs", + "directions": 4 + }, + { + "name": "quadspike", + "directions": 4 + }, + { + "name": "ratty_royalty", + "directions": 4 + }, + { + "name": "short_and_messy", + "directions": 4 + }, + { + "name": "short_spikehair", + "directions": 4 + }, + { + "name": "spikehawk", + "directions": 4 + }, + { + "name": "the_political", + "directions": 4 + }, + { + "name": "zeta_basic_braids", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/nerfish.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/nerfish.png new file mode 100644 index 00000000000..2a81fe99cc0 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/nerfish.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/plantish_poofs.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/plantish_poofs.png new file mode 100644 index 00000000000..6fe70054c1d Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/plantish_poofs.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/quadspike.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/quadspike.png new file mode 100644 index 00000000000..6246c5b09b9 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/quadspike.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/ratty_royalty.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/ratty_royalty.png new file mode 100644 index 00000000000..6e186cff80b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/ratty_royalty.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_and_messy.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_and_messy.png new file mode 100644 index 00000000000..e9249c7731f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_and_messy.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_spikehair.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_spikehair.png new file mode 100644 index 00000000000..f026e7a196f Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/short_spikehair.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/spikehawk.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/spikehawk.png new file mode 100644 index 00000000000..6c262797ba4 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/spikehawk.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/the_political.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/the_political.png new file mode 100644 index 00000000000..6f616b79cdc Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/the_political.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/zeta_basic_braids.png b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/zeta_basic_braids.png new file mode 100644 index 00000000000..23c250928b3 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Customization/hair.rsi/zeta_basic_braids.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/dead.png b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/dead.png new file mode 100644 index 00000000000..c4093e1834b Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/meta.json b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/meta.json new file mode 100644 index 00000000000..686b3eb36a3 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/meta.json @@ -0,0 +1,48 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by ladyayla for Nuclear 14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "sporeplant", + "directions": 4, + "delays": [ + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ], + [ + 0.2, + 0.2, + 0.2, + 0.2, + 0.2 + ] + ] + }, + { + "name": "dead" + } + ] +} \ No newline at end of file diff --git a/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/sporeplant.png b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/sporeplant.png new file mode 100644 index 00000000000..0a32a340508 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Mobs/Plants/sporeplant.rsi/sporeplant.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_dead.png b/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_dead.png index 2cd3e8435ab..cd37d2f8b99 100644 Binary files a/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_dead.png and b/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_dead.png differ diff --git a/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_melee.png b/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_melee.png index 4828dadd657..bfb6bc2a816 100644 Binary files a/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_melee.png and b/Resources/Textures/_Nuclear14/Mobs/RaidersSimpleMob/RaiderPsycho.rsi/raider_melee.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/icon.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/icon.png new file mode 100644 index 00000000000..b7998313099 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/icon.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-left.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-left.png new file mode 100644 index 00000000000..fe7b6510596 Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-left.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-right.png b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-right.png new file mode 100644 index 00000000000..625d3be8aeb Binary files /dev/null and b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/inhand-right.png differ diff --git a/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/meta.json b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/meta.json new file mode 100644 index 00000000000..c963e8efde1 --- /dev/null +++ b/Resources/Textures/_Nuclear14/Objects/Weapons/Melee/training_sword.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-3.0", + "copyright": "Made by 6spadesluke (Discord) for nuclear14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}