Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master' into Chitinid
Browse files Browse the repository at this point in the history
  • Loading branch information
ElusiveCoin committed Jan 12, 2025
2 parents 98d1f6d + 7d0797a commit f43ac3b
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
14 changes: 7 additions & 7 deletions Resources/Changelog/DeltaVChangelog.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
Entries:
- author: Colin-Tel
changes:
- message: Adjusted hunger rate to be slightly less painful.
type: Tweak
id: 401
time: '2024-06-14T21:15:48.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/1384
- author: Bellwether
changes:
- message: The Chief Justice's apparel is now available in the uniform printer
Expand Down Expand Up @@ -3851,3 +3844,10 @@
id: 900
time: '2025-01-11T17:30:42.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2692
- author: rosieposieeee
changes:
- message: Rebalanced the prices of the eshield, china-lake, and juggernaut suit.
type: Tweak
id: 901
time: '2025-01-12T15:48:39.0000000+00:00'
url: https://github.com/DeltaV-Station/Delta-v/pull/2658
16 changes: 8 additions & 8 deletions Resources/Prototypes/Catalog/uplink_catalog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,9 @@
productEntity: EnergyShield
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 5 # DeltaV - was 4
Telecrystal: 12 # DeltaV - was 4
cost:
Telecrystal: 10 # DeltaV - Was 8
Telecrystal: 16 # DeltaV - Was 8
categories:
- UplinkWeaponry
conditions:
Expand Down Expand Up @@ -194,9 +194,9 @@
productEntity: ClothingBackpackDuffelSyndicateFilledGrenadeLauncher
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 20
Telecrystal: 35 # DeltaV - Was 20
cost:
Telecrystal: 25
Telecrystal: 40 # DeltaV - Was 25
categories:
- UplinkWeaponry

Expand All @@ -208,9 +208,9 @@
productEntity: ClothingBackpackDuffelSyndicateFilledLMG
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 24
Telecrystal: 20 # DeltaV - Was 8
cost:
Telecrystal: 30
Telecrystal: 24 # DeltaV - Was 12
categories:
- UplinkWeaponry

Expand Down Expand Up @@ -1624,9 +1624,9 @@
productEntity: CrateCybersunJuggernautBundle
discountCategory: veryRareDiscounts
discountDownTo:
Telecrystal: 8
cost:
Telecrystal: 12
cost:
Telecrystal: 20
categories:
- UplinkWearables

Expand Down

0 comments on commit f43ac3b

Please sign in to comment.