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.

Sign up for GitHub

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
+173 −16
Merged

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

Changes from 1 commit
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
Prev Previous commit
Next Next commit
Rubber now cost 150
@AloeNeverDie
AloeNeverDie committed Dec 30, 2024
commit a14ead7da144e6e10e183eb7f2a904b69d40b4eb
5 changes: 1 addition & 4 deletions modular_bandastation/balance/code/cargo_packs.dm
View file
Original file line number Diff line number Diff line change
@@ -52,17 +52,14 @@
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200

/datum/supply_pack/goody/rubber
cost = PAYCHECK_CREW * 3 // Original price: 100 Approximate new price: 200
cost = PAYCHECK_CREW * 3 // Original price: 75 Approximate new price: 150

/datum/supply_pack/goody/dumdum38br
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200

/datum/supply_pack/goody/match38br
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200

/datum/supply_pack/goody/rubber
cost = PAYCHECK_CREW * 4 // Original price: 75 Approximate new price: 200

// MARK: MISC
/datum/supply_pack/critter/pony // Fun not allowed or has to be too expensive
cost = 9000 // Original price: 800 New price: 9000

Unchanged files with check annotations Beta

View file
code/modules/mob/living/carbon/human/human_update_icons.dm
var/mutant_override = FALSE
var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])

Check warning on line 402 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]

Check warning on line 403 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_head.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_head.species_bodytype]
var/mutant_override = FALSE
var/obj/item/bodypart/chest/bodypart_chest = src.get_bodypart(BODY_ZONE_CHEST)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_chest.species_bodytype])

Check warning on line 471 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_chest.species_bodytype]

Check warning on line 472 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_chest.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_chest.species_bodytype]
var/mutant_override = FALSE
var/obj/item/bodypart/head/bodypart_head = src.get_bodypart(BODY_ZONE_HEAD)
if(worn_item.worn_icon_species && worn_item.worn_icon_species[bodypart_head.species_bodytype])

Check warning on line 541 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
icon_file = worn_item.worn_icon_species[bodypart_head.species_bodytype]

Check warning on line 542 in code/modules/mob/living/carbon/human/human_update_icons.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
mutant_override = TRUE
else if(bodypart_head.species_bodytype in icon_files_species)
icon_file = icon_files_species[bodypart_head.species_bodytype]
View file
modular_bandastation/species/code/clothing/mod.dm
var/mob/living/carbon/user = usr
if(istype(user))
var/obj/item/bodypart/head/bodypart_head = user.get_bodypart(BODY_ZONE_HEAD)
if(bodypart_head && worn_icon_species && worn_icon_species[bodypart_head.species_bodytype])

Check warning on line 18 in modular_bandastation/species/code/clothing/mod.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
module_icon = mutable_appearance(worn_icon_species[bodypart_head.species_bodytype], used_overlay, layer = standing.layer + 0.1)

Check warning on line 19 in modular_bandastation/species/code/clothing/mod.dm

GitHub Actions / Run Linters 

OD2304: Invalid index operation. datum[] index operations are not valid starting in BYOND 515.1641
if(!use_mod_colors)
module_icon.appearance_flags |= RESET_COLOR
. += module_icon