Skip to content

Commit

Permalink
made imports more expensive
Browse files Browse the repository at this point in the history
  • Loading branch information
KnigTheThrasher committed Jul 3, 2024
1 parent 12c4d2b commit 3d60612
Show file tree
Hide file tree
Showing 8 changed files with 55 additions and 38 deletions.
4 changes: 2 additions & 2 deletions code/modules/cargo/packs/security.dm
Original file line number Diff line number Diff line change
Expand Up @@ -116,15 +116,15 @@
/datum/supply_pack/security/firingpins
name = "Standard Firing Pins Crate"
desc = "Upgrade your arsenal with 10 standard firing pins."
cost = CARGO_CRATE_VALUE * 4
cost = 5000 //MONKESTATION EDIT: Guncargo nerf
access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/firingpins = 2)
crate_name = "firing pins crate"

/datum/supply_pack/security/firingpins/paywall
name = "Paywall Firing Pins Crate"
desc = "Specialized firing pins with a built-in configurable paywall."
cost = CARGO_CRATE_VALUE * 2
cost = 4000 //MONKESTATION EDIT: Guncargo nerf
access_view = ACCESS_ARMORY
contains = list(/obj/item/storage/box/firingpins/paywall = 2)
crate_name = "paywall firing pins crate"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,23 @@

/datum/armament_entry/company_import/akh_frontier/basic
subcategory = "Hand-Held Equipment"
cost = PAYCHECK_COMMAND

/datum/armament_entry/company_import/akh_frontier/basic/omni_drill
item_type = /obj/item/screwdriver/omni_drill
cost = 300

/datum/armament_entry/company_import/akh_frontier/basic/prybar
item_type = /obj/item/crowbar/large/doorforcer
restricted = TRUE
cost = 300

/datum/armament_entry/company_import/akh_frontier/basic/arc_welder
item_type = /obj/item/weldingtool/electric/arc_welder
cost = 300

/datum/armament_entry/company_import/akh_frontier/basic/compact_drill
item_type = /obj/item/pickaxe/drill/compact
cost = 300

// Flatpacked fabricator and related upgrades

Expand Down
17 changes: 14 additions & 3 deletions monkestation/code/modules/blueshift/armaments/deforest_medical.dm
Original file line number Diff line number Diff line change
Expand Up @@ -88,43 +88,54 @@

/datum/armament_entry/company_import/deforest/medpens
subcategory = "Medical Autoinjectors"
cost = PAYCHECK_LOWER * 3

/datum/armament_entry/company_import/deforest/medpens/occuisate
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/occuisate
cost = 150

/datum/armament_entry/company_import/deforest/medpens/morpital
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/morpital
cost = 150

/datum/armament_entry/company_import/deforest/medpens/lipital
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/lipital
cost = 150

/datum/armament_entry/company_import/deforest/medpens/meridine
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/meridine
cost = 150

/datum/armament_entry/company_import/deforest/medpens/calopine
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/calopine
cost = 150

/datum/armament_entry/company_import/deforest/medpens/coagulants
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/coagulants
cost = 150

/datum/armament_entry/company_import/deforest/medpens/lepoturi
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/lepoturi
cost = 150

/datum/armament_entry/company_import/deforest/medpens/psifinil
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/psifinil
cost = 150

/datum/armament_entry/company_import/deforest/medpens/halobinin
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/halobinin
cost = 150

/datum/armament_entry/company_import/deforest/medpens/robo_solder
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/robot_liquid_solder
cost = 150

/datum/armament_entry/company_import/deforest/medpens/robo_cleaner
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/robot_system_cleaner
cost = 150

/datum/armament_entry/company_import/deforest/medpens/pentibinin
item_type = /obj/item/reagent_containers/hypospray/medipen/deforest/pentibinin
cost = 150
contraband = TRUE

// Autoinjectors for fighting
Expand Down Expand Up @@ -175,11 +186,11 @@

/datum/armament_entry/company_import/deforest/equipment/loaded_defib
item_type = /obj/item/defibrillator/loaded
cost = PAYCHECK_COMMAND
cost = 200

/datum/armament_entry/company_import/deforest/equipment/surgical_tools
item_type = /obj/item/surgery_tray
cost = PAYCHECK_COMMAND
cost = 400

/datum/armament_entry/company_import/deforest/equipment/advanced_health_analyer
item_type = /obj/item/healthanalyzer/advanced
Expand Down
6 changes: 3 additions & 3 deletions monkestation/code/modules/blueshift/armaments/jarnsimiour.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@

/datum/armament_entry/company_import/blacksteel/blade/survival_knife
item_type = /obj/item/knife/combat/survival
cost = PAYCHECK_CREW * 2
cost = 500

/datum/armament_entry/company_import/blacksteel/blade/bowie_knife
item_type = /obj/item/storage/belt/bowie_sheath
cost = PAYCHECK_COMMAND * 3
cost = 700

/datum/armament_entry/company_import/blacksteel/blade/shamshir_sabre
item_type = /obj/item/storage/belt/sabre/cargo
cost = PAYCHECK_COMMAND * 3
cost = 1000
21 changes: 12 additions & 9 deletions monkestation/code/modules/blueshift/armaments/microstar.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,56 @@

/datum/armament_entry/company_import/microstar/basic_energy_weapons/disabler
item_type = /obj/item/gun/energy/disabler
cost = PAYCHECK_CREW * 5
cost = 500

/datum/armament_entry/company_import/microstar/basic_energy_weapons/mini_egun
item_type = /obj/item/gun/energy/e_gun/mini
cost = PAYCHECK_CREW * 5
cost = 700 //Can kill stuff but isn't that great

/datum/armament_entry/company_import/microstar/lethal_sidearm/energy_holster
item_type = /obj/item/storage/belt/holster/energy/thermal
cost = PAYCHECK_COMMAND * 6
cost = 700 //Same here

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons
subcategory = "Basic Energy Longarms"

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/laser
item_type = /obj/item/gun/energy/laser
cost = PAYCHECK_CREW * 5
cost = 1000

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/laser_carbine
item_type = /obj/item/gun/energy/laser/carbine
cost = PAYCHECK_CREW * 7 // slightly more expensive due to ease of use/full auto
cost = 1000

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/egun
item_type = /obj/item/gun/energy/e_gun
cost = PAYCHECK_COMMAND * 4
cost = 1000

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/mod_laser_small
item_type = /obj/item/gun/energy/modular_laser_rifle/carbine
cost = PAYCHECK_COMMAND * 5
cost = 1200

/datum/armament_entry/company_import/microstar/basic_energy_long_weapons/mod_laser_large
item_type = /obj/item/gun/energy/modular_laser_rifle
cost = PAYCHECK_COMMAND * 8
cost = 1500

// More expensive, unique energy weapons
/datum/armament_entry/company_import/microstar/experimental_energy
subcategory = "Experimental Energy Weapons"
cost = PAYCHECK_COMMAND * 6
restricted = TRUE

/datum/armament_entry/company_import/microstar/experimental_energy/hellfire
item_type = /obj/item/gun/energy/laser/hellgun
cost = 1500

/datum/armament_entry/company_import/microstar/experimental_energy/ion_carbine
item_type = /obj/item/gun/energy/ionrifle/carbine
cost = 2000

/datum/armament_entry/company_import/microstar/experimental_energy/xray_gun
item_type = /obj/item/gun/energy/xray
cost = 3000

/datum/armament_entry/company_import/microstar/experimental_energy/tesla_cannon
item_type = /obj/item/gun/energy/tesla_cannon
cost = 2500
4 changes: 2 additions & 2 deletions monkestation/code/modules/blueshift/armaments/nakamura.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@

/datum/armament_entry/company_import/nakamura_modsuits/core/standard
item_type = /obj/item/mod/core/standard
cost = PAYCHECK_CREW * 2
cost = 200

/datum/armament_entry/company_import/nakamura_modsuits/core/plasma
item_type = /obj/item/mod/core/plasma
cost = PAYCHECK_CREW

/datum/armament_entry/company_import/nakamura_modsuits/core/ethereal
item_type = /obj/item/mod/core/ethereal
cost = PAYCHECK_CREW
cost = 400

// MOD plating

Expand Down
14 changes: 7 additions & 7 deletions monkestation/code/modules/blueshift/armaments/nri.dm
Original file line number Diff line number Diff line change
Expand Up @@ -83,34 +83,34 @@

/datum/armament_entry/company_import/nri_surplus/firearm/shotgun_revolver
item_type = /obj/item/gun/ballistic/revolver/shotgun_revolver
cost = PAYCHECK_COMMAND * 6
cost = 1500

/datum/armament_entry/company_import/nri_surplus/firearm/plasma_thrower
item_type = /obj/item/gun/ballistic/automatic/pistol/plasma_thrower
cost = PAYCHECK_COMMAND * 6
cost = 1000

/datum/armament_entry/company_import/nri_surplus/firearm/plasma_marksman
item_type = /obj/item/gun/ballistic/automatic/pistol/plasma_marksman
cost = PAYCHECK_COMMAND * 6
cost = 1200

/datum/armament_entry/company_import/nri_surplus/firearm/miecz
item_type = /obj/item/gun/ballistic/automatic/miecz
cost = PAYCHECK_COMMAND * 10
cost = 1700

/datum/armament_entry/company_import/nri_surplus/firearm/sakhno_rifle
item_type = /obj/item/gun/ballistic/rifle/boltaction
cost = PAYCHECK_COMMAND * 12
cost = 1200 //it's a classic mosin, nothing fancy

/datum/armament_entry/company_import/nri_surplus/firearm/lanca
item_type = /obj/item/gun/ballistic/automatic/lanca
contraband = TRUE
cost = PAYCHECK_COMMAND * 14
cost = 2000
restricted = TRUE

/datum/armament_entry/company_import/nri_surplus/firearm/anti_materiel_rifle
item_type = /obj/item/gun/ballistic/automatic/wylom
contraband = TRUE
cost = PAYCHECK_COMMAND * 16
cost = 3000
restricted = TRUE

/datum/armament_entry/company_import/nri_surplus/firearm_ammo
Expand Down
22 changes: 11 additions & 11 deletions monkestation/code/modules/blueshift/armaments/sol.dm
Original file line number Diff line number Diff line change
Expand Up @@ -85,19 +85,19 @@

/datum/armament_entry/company_import/sol_defense/sidearm/eland
item_type = /obj/item/gun/ballistic/revolver/sol
cost = PAYCHECK_COMMAND * 4
cost = 1000

/datum/armament_entry/company_import/sol_defense/sidearm/wespe
item_type = /obj/item/gun/ballistic/automatic/pistol/sol
cost = PAYCHECK_COMMAND * 4
cost = 1200

/datum/armament_entry/company_import/sol_defense/sidearm/skild
item_type = /obj/item/gun/ballistic/automatic/pistol/trappiste
cost = PAYCHECK_COMMAND * 6
cost = 1400

/datum/armament_entry/company_import/sol_defense/sidearm/takbok
item_type = /obj/item/gun/ballistic/revolver/takbok
cost = PAYCHECK_COMMAND * 6
cost = 1500

// Lethal anything that's not a pistol, requires high company interest

Expand All @@ -107,34 +107,34 @@

/datum/armament_entry/company_import/sol_defense/longarm/renoster
item_type = /obj/item/gun/ballistic/shotgun/riot/sol
cost = PAYCHECK_COMMAND * 6
cost = 2000

/datum/armament_entry/company_import/sol_defense/longarm/sindano
item_type = /obj/item/gun/ballistic/automatic/sol_smg
cost = PAYCHECK_COMMAND * 6
cost = 2000

/datum/armament_entry/company_import/sol_defense/longarm/elite
item_type = /obj/item/gun/ballistic/automatic/sol_rifle/marksman
cost = PAYCHECK_COMMAND * 12
cost = 2500

/datum/armament_entry/company_import/sol_defense/longarm/bogseo
item_type = /obj/item/gun/ballistic/automatic/xhihao_smg
cost = PAYCHECK_COMMAND * 10
cost = 2000
contraband = TRUE

/datum/armament_entry/company_import/sol_defense/longarm/infanterie
item_type = /obj/item/gun/ballistic/automatic/sol_rifle
cost = PAYCHECK_COMMAND * 14
cost = 2500
contraband = TRUE

/datum/armament_entry/company_import/sol_defense/longarm/outomaties
item_type = /obj/item/gun/ballistic/automatic/sol_rifle/machinegun
cost = PAYCHECK_COMMAND * 23
cost = 4000
contraband = TRUE

/datum/armament_entry/company_import/sol_defense/longarm/kiboko
item_type = /obj/item/gun/ballistic/automatic/sol_grenade_launcher
cost = PAYCHECK_COMMAND * 46
cost = 5000
contraband = TRUE

/datum/armament_entry/company_import/sol_defense/magazines
Expand Down

0 comments on commit 3d60612

Please sign in to comment.