Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Balance: Cargo prices, GMM, Laser SMGs, Holy watermelons #931

Merged
merged 25 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
878799e
Small balance changes
AloeNeverDie Dec 29, 2024
72a4faf
review changes
AloeNeverDie Dec 29, 2024
b801199
comments and carbine nerf
AloeNeverDie Dec 29, 2024
14a7e78
New speed nerf
AloeNeverDie Dec 29, 2024
8986e3b
New price for pony
AloeNeverDie Dec 29, 2024
93a8e4c
fix tab spaces
AloeNeverDie Dec 29, 2024
a14ead7
Rubber now cost 150
AloeNeverDie Dec 30, 2024
1415df0
Anomaly cores now cost 2.5x more
AloeNeverDie Jan 11, 2025
8bfff05
stock market nerf
AloeNeverDie Jan 11, 2025
e981c6a
Correction after review
AloeNeverDie Jan 14, 2025
9655e0b
Merge branch 'master' into price_correction
AloeNeverDie Jan 15, 2025
e0989df
Merge branch 'master' into price_correction
AloeNeverDie Jan 15, 2025
2666ef0
Merge branch 'master' into price_correction
AloeNeverDie Jan 17, 2025
1dc32f8
GMM no longer sells materials
AloeNeverDie Jan 17, 2025
c84967e
Cargo wars 5: The Empire Strikes Back
AloeNeverDie Jan 18, 2025
3d0b0c0
melon hotfix
AloeNeverDie Jan 18, 2025
9863f48
deliver items gain no more gold to cargo
AloeNeverDie Jan 19, 2025
c0cdcdb
Merge branch 'master' into price_correction
AloeNeverDie Jan 19, 2025
611e8d5
Удаляет лишнюю строчку
AloeNeverDie Jan 19, 2025
fe047b6
Cargo now again recive money from department orders
AloeNeverDie Jan 19, 2025
030016b
Удаляет то, что не должно было попасть, меняет цены, ап лазерного кар…
AloeNeverDie Jan 21, 2025
b9e1678
Merge branch 'master' into price_correction
dj-34 Jan 21, 2025
42696c0
Apply suggestions from code review
dj-34 Jan 21, 2025
9268298
Only one charge of holymelon if potency more than 95
AloeNeverDie Jan 22, 2025
641b448
Merge branch 'master' into price_correction
Gaxeer Jan 22, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/modules/hydroponics/unique_plant_genes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
if(!.)
return
var/obj/item/seeds/our_seed = our_plant.get_plant_seed()
shield_uses = round(our_seed.potency / 20)
shield_uses = round(our_seed.potency / 30) // BANDASTATION EDIT - Original: shield_uses = round(our_seed.potency / 20)
//deliver us from evil o melon god
our_plant.AddComponent(/datum/component/anti_magic, \
antimagic_flags = MAGIC_RESISTANCE|MAGIC_RESISTANCE_HOLY, \
Expand Down
1 change: 1 addition & 0 deletions modular_bandastation/balance/_balance.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
#include "code/station_traits.dm"
#include "code/supply_packs.dm"
#include "code/crew_manifest.dm"
#include "code/cargo_packs.dm"

#include "code/~undefs.dm"
70 changes: 70 additions & 0 deletions modular_bandastation/balance/code/cargo_packs.dm
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
// MARK: WEAPONS

AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
/datum/supply_pack/security/disabler
cost = CARGO_CRATE_VALUE * 6

/datum/supply_pack/security/laser
cost = CARGO_CRATE_VALUE * 8

/datum/supply_pack/security/armory/ballistic
cost = CARGO_CRATE_VALUE * 35

/datum/supply_pack/security/armory/energy
cost = CARGO_CRATE_VALUE * 36

/datum/supply_pack/security/armory/laser_carbine
cost = CARGO_CRATE_VALUE * 27

/datum/supply_pack/security/armory/disabler_smg
cost = CARGO_CRATE_VALUE * 18

/datum/supply_pack/security/armory/battle_rifle
cost = CARGO_CRATE_VALUE * 150

/datum/supply_pack/goody/mars_single
cost = PAYCHECK_CREW * 80

/datum/supply_pack/goody/ballistic_single
cost = PAYCHECK_COMMAND * 30

/datum/supply_pack/goody/disabler_single
cost = PAYCHECK_COMMAND * 6

/datum/supply_pack/goody/energy_single
cost = PAYCHECK_COMMAND * 24

/datum/supply_pack/goody/laser_single
cost = PAYCHECK_COMMAND * 12

/datum/supply_pack/goody/double_barrel
cost = PAYCHECK_COMMAND * 36

// MARK: AMMO

AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
/datum/supply_pack/security/ammo
cost = CARGO_CRATE_VALUE * 16

/datum/supply_pack/security/armory/br_mag
cost = CARGO_CRATE_VALUE * 14
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved

/datum/supply_pack/goody/dumdum38
cost = PAYCHECK_CREW * 4

/datum/supply_pack/goody/match38
cost = PAYCHECK_CREW * 4

/datum/supply_pack/goody/rubber
cost = PAYCHECK_CREW * 3

/datum/supply_pack/goody/dumdum38br
cost = PAYCHECK_CREW * 4

/datum/supply_pack/goody/match38br
cost = PAYCHECK_CREW * 4

AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
/datum/supply_pack/goody/rubber
cost = PAYCHECK_CREW * 4

// MARK: MISC
/datum/supply_pack/critter/pony // Fun not allowed or has to be too expensive
cost = 9999
AloeNeverDie marked this conversation as resolved.
Show resolved Hide resolved
Loading