forked from tgstation/tgstation
-
Notifications
You must be signed in to change notification settings - Fork 44
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
72a4faf
commit b801199
Showing
3 changed files
with
34 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,70 +1,68 @@ | ||
// MARK: WEAPONS | ||
|
||
/datum/supply_pack/security/disabler | ||
cost = CARGO_CRATE_VALUE * 6 | ||
cost = CARGO_CRATE_VALUE * 6 // Original price: 600 Approximate new price: 1200 | ||
|
||
/datum/supply_pack/security/laser | ||
cost = CARGO_CRATE_VALUE * 8 | ||
cost = CARGO_CRATE_VALUE * 8 // Original price: 800 Approximate new price: 1600 | ||
|
||
/datum/supply_pack/security/armory/ballistic | ||
cost = CARGO_CRATE_VALUE * 35 | ||
cost = CARGO_CRATE_VALUE * 35 // Original price: 3500 Approximate new price: 7000 | ||
|
||
/datum/supply_pack/security/armory/energy | ||
cost = CARGO_CRATE_VALUE * 36 | ||
cost = CARGO_CRATE_VALUE * 36 // Original price: 3600 Approximate new price: 7200 | ||
|
||
/datum/supply_pack/security/armory/laser_carbine | ||
cost = CARGO_CRATE_VALUE * 27 | ||
cost = CARGO_CRATE_VALUE * 27 // Original price: 1800 Approximate new price: 5400 | ||
|
||
/datum/supply_pack/security/armory/disabler_smg | ||
cost = CARGO_CRATE_VALUE * 18 | ||
cost = CARGO_CRATE_VALUE * 18 // Original price: 1400 Approximate new price: 3600 | ||
|
||
/datum/supply_pack/security/armory/battle_rifle | ||
cost = CARGO_CRATE_VALUE * 150 | ||
cost = CARGO_CRATE_VALUE * 150 // Original price: 20000 Approximate new price: 30000 | ||
|
||
/datum/supply_pack/goody/mars_single | ||
cost = PAYCHECK_CREW * 80 | ||
cost = PAYCHECK_CREW * 80 // Original price: 2000 Approximate new price: 4000 | ||
|
||
/datum/supply_pack/goody/ballistic_single | ||
cost = PAYCHECK_COMMAND * 30 | ||
cost = PAYCHECK_COMMAND * 30 // Original price: 1500 Approximate new price: 3000 | ||
|
||
/datum/supply_pack/goody/disabler_single | ||
cost = PAYCHECK_COMMAND * 6 | ||
cost = PAYCHECK_COMMAND * 6 // Original price: 300 Approximate new price: 600 | ||
|
||
/datum/supply_pack/goody/energy_single | ||
cost = PAYCHECK_COMMAND * 24 | ||
cost = PAYCHECK_COMMAND * 24 // Original price: 1200 Approximate new price: 2400 | ||
|
||
/datum/supply_pack/goody/laser_single | ||
cost = PAYCHECK_COMMAND * 12 | ||
cost = PAYCHECK_COMMAND * 12 // Original price: 600 Approximate new price: 1200 | ||
|
||
/datum/supply_pack/goody/double_barrel | ||
cost = PAYCHECK_COMMAND * 36 | ||
|
||
// MARK: AMMO | ||
cost = PAYCHECK_COMMAND * 36 // Original price: 1800 Approximate new price: 3600 | ||
|
||
/datum/supply_pack/security/ammo | ||
cost = CARGO_CRATE_VALUE * 16 | ||
cost = CARGO_CRATE_VALUE * 16 // Original price: 1600 Approximate new price: 3200 | ||
|
||
/datum/supply_pack/security/armory/br_mag | ||
cost = CARGO_CRATE_VALUE * 14 | ||
cost = CARGO_CRATE_VALUE * 14 // Original price: 1400 Approximate new price: 2800 | ||
|
||
// MARK: AMMO | ||
/datum/supply_pack/goody/dumdum38 | ||
cost = PAYCHECK_CREW * 4 | ||
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200 | ||
|
||
/datum/supply_pack/goody/match38 | ||
cost = PAYCHECK_CREW * 4 | ||
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200 | ||
|
||
/datum/supply_pack/goody/rubber | ||
cost = PAYCHECK_CREW * 3 | ||
cost = PAYCHECK_CREW * 3 // Original price: 100 Approximate new price: 200 | ||
|
||
/datum/supply_pack/goody/dumdum38br | ||
cost = PAYCHECK_CREW * 4 | ||
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200 | ||
|
||
/datum/supply_pack/goody/match38br | ||
cost = PAYCHECK_CREW * 4 | ||
cost = PAYCHECK_CREW * 4 // Original price: 100 Approximate new price: 200 | ||
|
||
/datum/supply_pack/goody/rubber | ||
cost = PAYCHECK_CREW * 4 | ||
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 = 9999 | ||
cost = 9999 // Original price: 800 New price: 9999 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
// MARK: carbine changes | ||
/obj/item/ammo_casing/energy/lasergun/carbine | ||
e_cost = LASER_SHOTS(20, STANDARD_CELL_CHARGE) // Original: LASER_SHOTS(40, STANDARD_CELL_CHARGE) | ||
|
||
/obj/projectile/beam/laser/carbine | ||
speed = 0.8 // Original: 1.25 | ||
|
||
/obj/item/gun/energy/laser/carbine/Initialize(mapload) | ||
. = ..() | ||
AddComponent(/datum/component/automatic_fire, 0.2 SECONDS, allow_akimbo = FALSE) // Original: automatic_fire, 0.15 SECONDS |