ADD: Добавление новых предметов в карго, ребаланс некоторых стоимостей в карго

code/game/objects/items/storage/filled_guncases.dm

@@ -285,6 +285,7 @@
 /obj/item/storage/guncase/energy/al607
 	gun_type = /obj/item/gun/energy/sharplite/al607
 	mag_type = /obj/item/stock_parts/cell/gun/sharplite/plus
+	mag_count = 1 // [CELADON-ADD] - CELADON_ECONOMY
 
 /obj/item/storage/guncase/energy/iongun
 	gun_type = /obj/item/gun/energy/ionrifle

code/modules/cargo/blackmarket/packs/weapons.dm

@@ -73,8 +73,8 @@
 	desc = "Be the ancient warrior you always wanted to be. Block bullets and impale your enemies."
 	item = /obj/item/shield/riot/spike
 
-	cost_min = 1000
-	cost_max = 1500
+	cost_min = 2500 // [CELADON-EDIT] - CELADON_ECONOMY // cost_min = 1000
+	cost_max = 3000 // [CELADON-EDIT] - CELADON_ECONOMY // cost_max = 1500
 	stock_max = 2
 	availability_prob = 50
 

code/modules/cargo/exports/special.dm

@@ -15,10 +15,11 @@
 	export_types = list(
 		/obj/item/documents
 	)
+	exclude_types = list(/obj/item/documents/photocopy) // [CELADON-ADD] - CELADON_ECONOMY
 
 /datum/export/anomaly
 	unit_name = "stabilized anomaly core"
 	desc = "Stabilized anomaly cores are in high demand for research in the Core Worlds, with many believing that the next big technological revolution will be driven by them. A thriving trade has grown around spacers who dedicate themselves to finding and stabilizing anomalies."
 	cost = 3000
-	elasticity_coeff = 0.1
+	elasticity_coeff = 0.05 // [CELADON-EDIT] - CELADON_ECONOMY
 	export_types = list(/obj/item/assembly/signaler/anomaly)

mod_celadon/black_market/code/ammo.dm

@@ -3,8 +3,78 @@
 	desc = "A large caliber magazine for the SVD sniper rifle. 10 round 7.62x54R in one magazine."
 	item = /obj/item/ammo_box/magazine/svd_rounds
 
-	cost_min = 650
-	cost_max = 800
+	cost_min = 200
+	cost_max = 400
 	stock_min = 3
 	stock_max = 6
 	availability_prob = 20
+
+/datum/blackmarket_item/ammo/invictus
+	name = "Invictus Magazine (.308)"
+	desc = "Contains a 20-round magazine for the Hunter's Pride Invictus Automatic Rifle."
+	item = /obj/item/ammo_box/magazine/invictus_308_mag
+	cost_min = 300
+	cost_max = 500
+	stock_min = 3
+	stock_max = 6
+	availability_prob = 20
+
+/datum/blackmarket_item/ammo/a308_box
+	name = ".308 Ammo Box"
+	desc = "Contains a 40-round .308 box."
+	item = /obj/item/storage/box/ammo/a308
+	cost_min = 300
+	cost_max = 400 // intentionally cheaper
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 50
+
+/datum/blackmarket_item/ammo/c8x50mm_box
+	name = "8x50mm Ammo Box"
+	desc = "Contains a 40-round 8x50mm ammo box for rifles such as the Illestren."
+	item = /obj/item/storage/box/ammo/a8_50r
+	cost_min = 300
+	cost_max = 400
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 50
+
+/datum/blackmarket_item/ammo/c299_box
+	name = ".299 Eoehoma Caseless Ammo Box"
+	desc = "Contains one 60-round box of .299 Caseless ammo from the defunct Eoehoma. Used for the E-40 Hybrid Rifle."
+	item = /obj/item/storage/box/ammo/c299
+	cost_min = 200
+	cost_max = 300
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 50
+
+/datum/blackmarket_item/ammo/a762x54_box
+	name = "7.62x54mm Ammo Box"
+	desc = "Contains a 40-round 7.62x54mm box loaded with SVD ammo, great against lightly armored targets."
+	item = /obj/item/storage/box/ammo/x762_54
+	cost_min = 300
+	cost_max = 400
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 50
+
+/datum/blackmarket_item/ammo/twobore_box
+	name = "Two-Bore Ammo Box"
+	desc = "Contains a 32-round two-bore buckshot ammo box."
+	item = /obj/item/storage/box/ammo/twobore
+	cost_min = 400
+	cost_max = 600
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 0
+
+/datum/blackmarket_item/ammo/mower
+	name = "Mower machine gun drum (.308)"
+	desc = "A drum shaped, 50-round magazine for the Mower .308 machine gun. These rounds do good damage with excelent armor penetration."
+	item = /obj/item/ammo_box/magazine/mower_lmg_308
+	cost_min = 500
+	cost_max = 1000
+	stock_min = 3
+	stock_max = 8
+	availability_prob = 0

mod_celadon/black_market/code/weapons.dm

@@ -5,17 +5,47 @@
 	mag_type = /obj/item/ammo_box/magazine/svd_rounds
 	pair_item = list(/datum/blackmarket_item/ammo/svd_rounds)
 
-	cost_min = 7000
-	cost_max = 12000
+	cost_min = 3800
+	cost_max = 4000
 	stock_min = 1
 	stock_max = 1
 	availability_prob = 20
 
+/datum/blackmarket_item/weapon/northstar
+	name = "Gloves of the North Star"
+	desc = "These gloves let the user punch people very fast. Does not improve weapon attack speed or the meaty fists of a hulk."
+	item = /obj/item/clothing/gloves/rapid
+	cost_min = 1000
+	cost_max = 2000
+	stock_min = 1
+	stock_max = 2
+	availability_prob = 30
+
+/datum/blackmarket_item/weapon/clip_kukri
+	name = "Kukri Sword Crate"
+	desc = "A well-made titanium kukri manufactured on Serene. This one is in blue colors... For now."
+	cost_min = 500
+	cost_max = 750
+	stock_min = 1
+	stock_max = 2
+	item = /obj/item/storage/belt/sabre/kukri
+	availability_prob = 40
+
+/datum/blackmarket_item/weapon/cybersun_flyssa
+	name = "Energy Flyssa Crate"
+	desc = "A lathed, verified, and readied Energy Flyssa nicely taken from Cybersun officer. Can be recharged in a recharger. Wait a second..."
+	cost_min = 1000
+	cost_max = 1500
+	stock_min = 1
+	stock_max = 2
+	item = /obj/item/melee/energy/flyssa
+	availability_prob = 30
+
 /datum/blackmarket_item/weapon/esword
 	name = "Energy Sword"
 	desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \
 			pocketed when inactive. Activating it produces a loud, distinctive noise."
-	item = /obj/item/holo/esword
+	item = /obj/item/melee/energy/sword/saber
 
 	cost_min = 3500
 	cost_max = 4000
@@ -58,3 +88,66 @@
 	cost_max = 4000
 	stock = 2
 	availability_prob = 25
+
+/datum/blackmarket_item/weapon/guncase/e50_underbarrel
+	name = "Underbarrel Energy Cannon"
+	desc = "The normal E-50 too big to handle for you? This underbarrel conversion cuts it down to a managable size with only a <i>minor</i> chance of painfully burning your hands."
+	item = /obj/item/attachment/gun/energy/e50
+	mag_type = /obj/item/stock_parts/cell/gun
+
+	cost_min = 4000
+	cost_max = 5000
+	stock_max = 2
+	availability_prob = 20
+	spawn_weighting = FALSE
+
+// MARK: SRM guns
+/datum/blackmarket_item/weapon/guncase/vickland
+	name = "Vickland Battle Rifle"
+	desc = "Somehow-somewhere somewho has been seen with this gun. Now you see this gun here. It's a high-powered semi-automatic battle rifle chambered in 8x50mmR and produced by Hunter's Pride. Fed via stripper clips with a 10 round capacity."
+	cost_min = 3000
+	cost_max = 4000
+	item = /obj/item/gun/ballistic/automatic/marksman/vickland
+	pair_item = list(/datum/blackmarket_item/ammo/c8x50mm_box)
+	gun_unloaded = FALSE
+	mag_number = 0
+
+	stock_min = 1
+	stock_max = 2
+	availability_prob = 25
+
+/datum/blackmarket_item/weapon/guncase/invictus
+	name = "Invictus Automatic Rifle"
+	desc = "A pretty big gun for hunting pretty big creatures. The gun itself has been hunted, so the price is high. It's a high-powered automattic rifle chambered in .308 and produced by Hunter's Pride. Comes with two magazines with a 20 round capacity."
+	cost_min = 5000
+	cost_max = 6500
+	item = /obj/item/gun/ballistic/automatic/assault/invictus
+	pair_item = list(/datum/blackmarket_item/ammo/invictus)
+	stock_min = 1
+	stock_max = 2
+	availability_prob = 25
+
+/datum/blackmarket_item/weapon/guncase/twobore
+	name = "HP Huntsman double-barrel shotgun"
+	desc = "Incredibly big double-barrel shotgun! But the previous owner is not so big now. If you want an intact trophy, don't aim for the head. Chambered in two-bore."
+	item = /obj/item/gun/ballistic/shotgun/doublebarrel/twobore
+	gun_unloaded = FALSE
+	mag_number = 0
+	pair_item = list(/datum/blackmarket_item/ammo/twobore_box)
+
+	cost_min = 3000
+	cost_max = 4500
+	stock = 1
+	availability_prob = 25
+
+// MARK: Mower (.308)
+/datum/blackmarket_item/weapon/guncase/mower
+	name = "Machinegun \"Mower\""
+	desc = "FUCKING HELL, JERRY! A hefty and relatively accurate HMG, the Mower is built for heavy fire support on the move. Chambered in .308."
+	item = /obj/item/gun/ballistic/automatic/hmg/mower
+	pair_item = list(/datum/blackmarket_item/ammo/mower)
+
+	cost_min = 5000
+	cost_max = 6500
+	stock = 1
+	availability_prob = 25

mod_celadon/outpost_console/code/supply_pack/independent/engineering/tools.dm

@@ -227,6 +227,14 @@
 	crate_type = /obj/structure/closet/crate/wooden
 	crate_name = "basic mining crate"
 
+/datum/supply_pack/faction/independent/tools/entrenching
+	name = "Entrenching Tool Crate"
+	desc = "Contains one dual-purpose mining tool, useful as a pickaxe, shovel, and weapon. Fits in your bag."
+	cost = 500
+	contains = list(/obj/item/trench_tool)
+	crate_name = "mining crate"
+
+
 /obj/structure/closet/crate/privatecrate
 	desc = "A private steel crate."
 	icon_state = "privatecrate"

mod_celadon/outpost_console/code/supply_pack/independent/equipment/armor.dm

@@ -19,7 +19,7 @@
 /datum/supply_pack/faction/independent/armor/riot_armor
 	name = "Riot Armor"
 	desc = "Contains one full set of riot armor. Although heavily padded to deal with close-quarters threats, they perform poorly against most firearms."
-	cost = 1000
+	cost = 750
 	contains = list(/obj/item/clothing/suit/armor/riot,
 					/obj/item/clothing/head/helmet/riot)
 	crate_name = "riot armor crate"
@@ -55,7 +55,7 @@
 /datum/supply_pack/faction/independent/armor/medium_marine_armor
 	name = "Medium Tactical Armor"
 	desc = "One set of well-rounded medium tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece."
-	cost = 3000
+	cost = 2600
 	contains = list(/obj/item/clothing/suit/armor/vest/marine/medium,
 					/obj/item/clothing/head/helmet/bulletproof/x11)
 	crate_name = "armor crate"
@@ -64,9 +64,9 @@
 /datum/supply_pack/faction/independent/armor/heavy_marine_armor
 	name = "Heavy Tactical Armor"
 	desc = "One set of well-rounded heavy tactical body armor. Plates are attached to the vest and cover the limbs. The set includes a helmet and chestpiece."
-	cost = 5000
+	cost = 3750
 	contains = list(/obj/item/clothing/suit/armor/vest/marine/heavy,
-					/obj/item/clothing/head/helmet/bulletproof/x11)
+					/obj/item/clothing/head/helmet/riot)
 	crate_name = "armor crate"
 	crate_type = /obj/structure/closet/crate/secure/plasma