diff --git a/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs index bb731a71b91..042d557ae51 100644 --- a/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs +++ b/Content.Shared/Ame/Components/AmeFuelContainerComponent.cs @@ -9,11 +9,11 @@ public sealed partial class AmeFuelContainerComponent : Component /// The amount of fuel in the container. /// [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public int FuelAmount = 1600; // mono + public int FuelAmount = 1000; // mono, 1600 -> 1000 Forge /// /// The maximum fuel capacity of the container. /// [DataField, ViewVariables(VVAccess.ReadWrite), AutoNetworkedField] - public int FuelCapacity = 1600; // mono + public int FuelCapacity = 1000; // mono, 1600 -> 1000 Forge } diff --git a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml index bcda8d165d3..b2492e31cd4 100644 --- a/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/Entities/Clothing/OuterClothing/hardsuits.yml @@ -166,6 +166,9 @@ head: ClothingHeadHelmetHardsuitSpatio helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock + - type: StaticPrice # Forge-change + price: 1000 # Forge-change + vendPrice: 8000 # Forge-change #Salvage Hardsuit - type: entity @@ -205,6 +208,9 @@ head: ClothingHeadHelmetHardsuitSalvage helmetcover: ClothingHeadHelmetCoverBlock helmetattachment: ClothingHeadHelmetAttachmentBlock + - type: StaticPrice # Forge-change + price: 1500 # Forge-change + vendPrice: 10000 # Forge-change #Goliath Hardsuit - type: entity diff --git a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml index 87a686fe67a..43b1e2619a5 100644 --- a/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml +++ b/Resources/Prototypes/Entities/Objects/Power/antimatter_jar.yml @@ -15,7 +15,7 @@ - type: AmeFuelContainer - type: StaticPrice price: 400 - vendPrice: 4000 # Frontier: FuelVend price + vendPrice: 10000 # Frontier: FuelVend price, 4000 -> 10000 Forge-change - type: GuideHelp guides: [ AME, Power ] - type: Tag # Frontier diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml index e6ef1b38988..89d275e0a7b 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/healing.yml @@ -54,6 +54,8 @@ count: 15 #Was 10, Buffed due to limb damage changes (Goobstation) - type: StackPrice price: 15 # Mono - 5->15 + - type: StaticPrice # Forge-change + vendPrice: 5500 # Forge-change - type: entity id: Ointment1 @@ -154,6 +156,7 @@ count: 15 #Was 10, Buffed due to limb damage changes (Goobstation) - type: StackPrice price: 15 # Mono - 5->15 + vendPrice: 6000 # Forge-change - type: entity id: Brutepack1 @@ -254,6 +257,8 @@ count: 15 #Was 10, Buffed due to limb damage changes (Goobstation) - type: StackPrice price: 25 # Mono - 10->25 + - type: StaticPrice # Forge-change + vendPrice: 3150 # Forge-change # Forge change - type: entity @@ -346,6 +351,7 @@ count: 15 #Was 10, Buffed due to limb damage changes (Goobstation) - type: StackPrice price: 15 # Mono 10->15 + vendPrice: 6000 # Forge-change - type: entity id: Gauze1 diff --git a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml index 7f2cc90a3ba..c94f6ee6c48 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml @@ -159,6 +159,8 @@ Quantity: 3 - type: Tag # Mono tags: [SurvivalBox] + - type: StaticPrice # Forge-change + vendPrice: 3150 # Forge-change - type: entity name: poison auto-injector diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml index 10f4669211a..f003515fa83 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/base_pka.yml @@ -51,4 +51,4 @@ - suitStorage - Belt - type: UseDelay - delay: 0.65 # Mono + delay: 0.65 # Mono \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml index 66e708535a2..c459a22f09d 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/pka.yml @@ -19,3 +19,6 @@ deconstructionTarget: null #Frontier - type: Wieldable # Frontier # todo: add clothingcomponent with clothingVisuals states using unused texture and animations assets in kinetic_accelerator.rsi + - type: StaticPrice # Forge-change + price: 100 # Forge-change + vendPrice: 5000 # Forge-change \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml index c848c56fc3b..6b1d8d873c0 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/mining.yml @@ -169,6 +169,9 @@ slots: # Frontier - back # Frontier - suitStorage # Frontier + - type: StaticPrice # Forge-change + price: 100 # Forge-change + vendPrice: 7000 # Forge-change - type: entity parent: [ BaseKnife, BaseWeaponCrusher] @@ -198,6 +201,9 @@ malus: 0.225 - type: ThrowingAngle angle: 225 + - type: StaticPrice # Forge-change + price: 100 # Forge-change + vendPrice: 3500 # Forge-change # Like a crusher... but better - type: entity @@ -221,3 +227,6 @@ - type: Item size: Ginormous sprite: Objects/Weapons/Melee/crusher_glaive-inhands.rsi + - type: StaticPrice # Forge-change + price: 100 # Forge-change + vendPrice: 15500 # Forge-change \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/civimed.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/civimed.yml index 69c9fb1de19..67c27e2e860 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/civimed.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/civimed.yml @@ -9,8 +9,8 @@ EmergencyMedipen: 4294967295 # Infinite PillCanisterTricordrazine: 4294967295 # Infinite - Mono HypoMini: 4294967295 # Infinite - Mono - HypoMiniLimitedEdition: 10 # Limited because its a direct upgrade, and can be found on expeds - Hypospray: 1 # only one in stock. its supposed to be really rare to use these, but still findable. - Mono end + HypoMiniLimitedEdition: 1 # Limited because its a direct upgrade, and can be found on expeds, 10 ->1 Forge-change +# Hypospray: 1 # only one in stock. its supposed to be really rare to use these, but still findable. - Mono end, Forge-delete BodyBagFolded: 4294967295 # Infinite ClothingEyesHudMedical: 4294967295 # Infinite ClothingEyesEyepatchHudMedical: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/salvage.yml b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/salvage.yml index 12a4e457faa..423f558bea8 100644 --- a/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/salvage.yml +++ b/Resources/Prototypes/_NF/Catalog/VendingMachines/Inventories/salvage.yml @@ -5,7 +5,7 @@ WeaponProtoKineticAccelerator: 4 WeaponCrusher: 6 WeaponCrusherDagger: 8 - ClothingHandsConcussiveGauntlets: 2 # Mono + ClothingHandsConcussiveGauntlets: 1 # Mono, 2 -> 1 Forge-change WeaponGrapplingGun: 10 Pickaxe: 10 OreBag: 6 @@ -22,7 +22,7 @@ WeaponCrusher: 4294967295 # Infinite WeaponCrusherDagger: 4294967295 # Infinite WeaponGrapplingGun: 4294967295 # Infinite - ClothingHandsConcussiveGauntlets: 4294967295 # Infinite - Mono + ClothingHandsConcussiveGauntlets: 1 # Infinite - Mono, Infinite -> 1 Forge-change Pickaxe: 4294967295 # Infinite OreBag: 4294967295 # Infinite Floodlight: 4294967295 # Infinite diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml index 957932ddbd7..ae37c7b0d75 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/hardsuits.yml @@ -95,6 +95,9 @@ helmetattachment: ClothingHeadHelmetAttachmentBlock - type: StaminaDamageResistance # Mono - Stamres coefficient: 0.6 + - type: StaticPrice # Forge-change + price: 1000 # Forge-change + vendPrice: 4000 # Forge-change #ERT Mail Carrier Hardsuit - type: entity diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml index 5229fb18198..acce4d28948 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/Medical/hypospray.yml @@ -23,7 +23,7 @@ delay: 1 - type: StaticPrice price: 550 - vendPrice: 5000 # Mono + vendPrice: 10000 # Mono, 5000 -> 10000 Forge-change - type: PirateBountyItem # Frontier id: HypoMini # Frontier @@ -52,6 +52,7 @@ delay: 0.75 - type: StaticPrice price: 750 # Mono end + vendPrice: 20000 # 10000 -> 20000 Forge-change - type: entity name: NTCS-103 hypospray @@ -66,7 +67,7 @@ sprite: _NF/Objects/Specific/Medical/hypominilimitededition.rsi - type: StaticPrice # Mono price: 20 # 20 whole dollars - vendPrice: 10000 + vendPrice: 25000 # 10000 -> 25000 Forge-change - type: UseDelay delay: 0.65 diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml index 928c1ea1753..47eb1bcaca7 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/chemical-containers.yml @@ -221,7 +221,7 @@ - type: Appearance - type: StaticPrice price: 0 - vendPrice: 1500 # mono + vendPrice: 3100 # Forge-change - type: Stack stackType: FuelPlasma count: 25 # mono @@ -255,7 +255,7 @@ - type: Appearance - type: StaticPrice price: 0 - vendPrice: 3125 # mono + vendPrice: 5250 # Forge-change - type: Stack stackType: FuelUranium count: 25 # mono @@ -289,7 +289,7 @@ - type: Appearance - type: StaticPrice price: 0 - vendPrice: 6250 # mono + vendPrice: 12500 # 6250 -> 12500 Forge-change - type: Stack stackType: FuelBananium count: 25 # mono