diff --git a/Resources/Prototypes/Catalog/Bounties/bounties.yml b/Resources/Prototypes/Catalog/Bounties/bounties.yml index 134db049bf6..92158188b2b 100644 --- a/Resources/Prototypes/Catalog/Bounties/bounties.yml +++ b/Resources/Prototypes/Catalog/Bounties/bounties.yml @@ -31,7 +31,7 @@ - type: cargoBounty id: BountyBaseballBat - reward: 4000 + reward: 5000 description: bounty-description-baseball-bat idPrefix: CC entries: @@ -413,7 +413,7 @@ description: bounty-description-syringe entries: - name: bounty-item-syringe - amount: 10 + amount: 5 whitelist: tags: - Syringe @@ -488,7 +488,7 @@ - type: cargoBounty id: BountyOrgans - reward: 2000 + reward: 5000 description: bounty-description-organs idPrefix: UNTH entries: @@ -555,12 +555,12 @@ - type: cargoBounty id: BountyFood - reward: 4000 + reward: 20000 description: bounty-description-food idPrefix: UNTH entries: - name: bounty-item-food - amount: 30 + amount: 15 whitelist: tags: - Meat diff --git a/Resources/Prototypes/Entities/Clothing/Back/specific.yml b/Resources/Prototypes/Entities/Clothing/Back/specific.yml index cd143c5e8ef..91a341ee91c 100644 --- a/Resources/Prototypes/Entities/Clothing/Back/specific.yml +++ b/Resources/Prototypes/Entities/Clothing/Back/specific.yml @@ -99,8 +99,8 @@ materialComposition: Steel: 62 Glass: 250 - - type: StaticPrice #Goobstation - Recycle update - price: 50 + - type: StaticPrice #Amour - Cargo rebalance + price: 400 # Assmos - Extinguisher Nozzle - type: entity diff --git a/Resources/Prototypes/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/Entities/Clothing/Head/hats.yml index 2c7677dd1c3..c56b1dbe14f 100644 --- a/Resources/Prototypes/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/Entities/Clothing/Head/hats.yml @@ -186,7 +186,7 @@ materialComposition: Cloth: 25 - type: Armor # Orion - priceMultiplier: 0.6 + priceMultiplier: 0.4 # Amour - Cargo rebalance - type: entity parent: ClothingHeadHatBeret diff --git a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml index 109120faa5d..558a90ab243 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml @@ -268,6 +268,8 @@ - type: FloorCleaner # Goobstation radius: 3 cleanDelay: 6 + - type: StaticPrice # Amour - Cargo rebalance + price: 200 - type: entity name: wet floor sign diff --git a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml index d87777a2481..390345a4ea1 100644 --- a/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml @@ -189,8 +189,6 @@ blacklist: tags: - Book - - type: StaticPrice - price: 450 - type: DragDropTargetable # Goobstation Change End @@ -228,6 +226,8 @@ - type: MovementSpeedModifier baseWalkSpeed: 2.25 baseSprintSpeed: 2.25 #Goobedit + - type: StaticPrice + price: 7500 - type: entity id: MechRipleyBattery @@ -269,6 +269,8 @@ pilotWhitelist: components: - HumanoidAppearance + - type: StaticPrice + price: 8000 - type: entity parent: MechHonker diff --git a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml index 8658ac97ca0..8fd8e429f36 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml @@ -125,6 +125,8 @@ - type: SurgeryTool # Shitmed startSound: /Audio/Items/change_jaws.ogg endSound: /Audio/Items/change_jaws.ogg + - type: StaticPrice #Amour - Cargo rebalance + price: 550 - type: entity # Goobstation - Recycler Update parent: JawsOfLifeBase diff --git a/Resources/Prototypes/Entities/Objects/Tools/tools.yml b/Resources/Prototypes/Entities/Objects/Tools/tools.yml index 1519122bf2d..9d16f1dc260 100644 --- a/Resources/Prototypes/Entities/Objects/Tools/tools.yml +++ b/Resources/Prototypes/Entities/Objects/Tools/tools.yml @@ -505,8 +505,8 @@ materialComposition: Steel: 300 Plastic: 100 - - type: StaticPrice - price: 100 + - type: StaticPrice #Amour - Cargo rebalance + price: 250 - type: MeleeWeapon wideAnimationRotation: -90 attackRate: 1.5 diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml index 425fc399998..ca40f49e19f 100644 --- a/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml +++ b/Resources/Prototypes/Entities/Objects/Weapons/Guns/Basic/spraynozzle.yml @@ -38,4 +38,6 @@ - type: PhysicalComposition #Goobstation - Recycle update materialComposition: Steel: 375 - Glass: 125 \ No newline at end of file + Glass: 125 + - type: StaticPrice #Amour - Cargo rebalance + price: 450 diff --git a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/mechs.yml b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/mechs.yml index 24b39f2077b..0df01e0ab88 100644 --- a/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/mechs.yml +++ b/Resources/Prototypes/_Goobstation/Entities/Objects/Specific/Mech/mechs.yml @@ -95,7 +95,7 @@ - type: Damageable damageModifierSet: MediumArmorNT - type: StaticPrice - price: 1000 + price: 8000 - type: Tag tags: - DoorBumpOpener @@ -153,7 +153,7 @@ - type: CanMoveInAir - type: MovementAlwaysTouching - type: StaticPrice - price: 1500 + price: 8000 - type: Tag tags: - DoorBumpOpener @@ -225,7 +225,7 @@ baseWalkSpeed: 2 baseSprintSpeed: 2 #Goobedit - type: StaticPrice - price: 3000 + price: 10000 - type: Tag tags: - DoorBumpOpener @@ -290,7 +290,7 @@ fuelCost: 30 doAfterDelay: 15 - type: StaticPrice - price: 5000 + price: 15000 - type: Tag tags: - DoorBumpOpener