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

Rebalance Sol Rifles #901

Merged
merged 3 commits into from Dec 7, 2023
Merged

Rebalance Sol Rifles #901

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c9d015
Rebalance Cargo Rifles
RashCat Dec 1, 2023
35330d5
correct comments
Iajret Dec 1, 2023
f33cc5e
Derebalance of Marksman
Dec 3, 2023
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
12 changes: 6 additions & 6 deletions modular_skyrat/modules/company_imports/code/armament_datums/sol_defense.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,15 +70,15 @@
cost = PAYCHECK_COMMAND * 10
contraband = TRUE

/datum/armament_entry/company_import/sol_defense/longarm/infanterie
/* /datum/armament_entry/company_import/sol_defense/longarm/infanterie
item_type = /obj/item/gun/ballistic/automatic/sol_rifle
cost = PAYCHECK_COMMAND * 14
contraband = TRUE
contraband = TRUE */ // FLUFFY FRONTIER REMOVAL - SOL WEAPONS REBALANCE

/datum/armament_entry/company_import/sol_defense/longarm/outomaties
/* /datum/armament_entry/company_import/sol_defense/longarm/outomaties
item_type = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun
cost = PAYCHECK_COMMAND * 23
contraband = TRUE
contraband = TRUE */ // FLUFFY FRONTIER REMOVAL - SOL WEAPONS REBALANCE

/datum/armament_entry/company_import/sol_defense/longarm/kiboko
item_type = /obj/item/gun/ballistic/automatic/sol_grenade_launcher
Expand All @@ -105,10 +105,10 @@
item_type = /obj/item/ammo_box/magazine/c40sol_rifle/standard/starts_empty
cost = PAYCHECK_COMMAND

/datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_drum
/* /datum/armament_entry/company_import/sol_defense/magazines/sol_rifle_drum
item_type = /obj/item/ammo_box/magazine/c40sol_rifle/drum/starts_empty
cost = PAYCHECK_COMMAND * 3
contraband = TRUE
contraband = TRUE */ // FLUFFY FRONTIER REMOVAL - SOL WEAPONS REBALANCE

/datum/armament_entry/company_import/sol_defense/magazines/sol_grenade_standard
item_type = /obj/item/ammo_box/magazine/c980_grenade/starts_empty
Expand Down
2 changes: 1 addition & 1 deletion .../modules/modular_weapons/code/company_and_or_faction_based/carwo_defense_systems/rifle.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
fire_delay = 0.75 SECONDS

spread = 0
projectile_damage_multiplier = 1.2
projectile_damage_multiplier = 0.85 // FLUFFY FRONTIER EDIT - SOL WEAPONS REBALANCE. ORIGINAL: 1.2
This conversation was marked as resolved.
Show resolved Hide resolved
projectile_wound_bonus = 10

/obj/item/gun/ballistic/automatic/sol_rifle/marksman/Initialize(mapload)
Expand Down
Loading