diff --git a/code/game/objects/items/storage/filled_guncases.dm b/code/game/objects/items/storage/filled_guncases.dm index 479d56635c94..1d6016a6debe 100644 --- a/code/game/objects/items/storage/filled_guncases.dm +++ b/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 diff --git a/code/modules/cargo/blackmarket/packs/weapons.dm b/code/modules/cargo/blackmarket/packs/weapons.dm index 6f5bf1a78a05..bd2b16de0d38 100644 --- a/code/modules/cargo/blackmarket/packs/weapons.dm +++ b/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 diff --git a/code/modules/cargo/exports/special.dm b/code/modules/cargo/exports/special.dm index 8e2caf333edc..3b4f3e7b0e3c 100644 --- a/code/modules/cargo/exports/special.dm +++ b/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) diff --git a/mod_celadon/black_market/code/ammo.dm b/mod_celadon/black_market/code/ammo.dm index 1cb949fe82eb..aa2b7962eff3 100644 --- a/mod_celadon/black_market/code/ammo.dm +++ b/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 diff --git a/mod_celadon/black_market/code/weapons.dm b/mod_celadon/black_market/code/weapons.dm index 86010e44a6e6..06253f581471 100644 --- a/mod_celadon/black_market/code/weapons.dm +++ b/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 minor 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 diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/engineering/tools.dm b/mod_celadon/outpost_console/code/supply_pack/independent/engineering/tools.dm index ddd35aec7f63..7a3182f4f720 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/engineering/tools.dm +++ b/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" diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/equipment/armor.dm b/mod_celadon/outpost_console/code/supply_pack/independent/equipment/armor.dm index 84406e4844c7..58171a25079b 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/equipment/armor.dm +++ b/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 diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/medical/chemistry.dm b/mod_celadon/outpost_console/code/supply_pack/independent/medical/chemistry.dm index 5bc795089785..f46fbde17185 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/medical/chemistry.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/medical/chemistry.dm @@ -1,6 +1,7 @@ /datum/supply_pack/faction/independent/chemistry category = "Medical - Chemistry" crate_type = /obj/structure/closet/crate/chem + stable_price = TRUE /* MARK: = Химия = @@ -13,7 +14,7 @@ /datum/supply_pack/faction/independent/chemistry/starter name = "Chemical Starter Kit" desc = "Contains thirteen different chemicals, for all the fun experiments you can make." - cost = 1250 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised. + cost = 700 // This is intentionally underpriced; the hope is that people will start using ghettochem, upon which time the price can be raised. contains = list(/obj/item/reagent_containers/glass/bottle/aluminium, /obj/item/reagent_containers/glass/bottle/bromine, /obj/item/reagent_containers/glass/bottle/carbon, @@ -42,7 +43,7 @@ /datum/supply_pack/faction/independent/chemistry/tools name = "Chemical Synthesis" desc = "Contains all the tools you will need for drug making." - cost = 750 + cost = 250 contains = list(/obj/item/reagent_containers/glass/filter, /obj/item/book/manual/wiki/chemistry, /obj/item/clothing/glasses/science, @@ -56,7 +57,7 @@ /datum/supply_pack/faction/independent/chemistry/press name = "Pill Press" desc = "Contains one standard press for making pills by hand." - cost = 500 + cost = 350 contains = list(/obj/machinery/chem_press) crate_name = "pill press crate" @@ -67,146 +68,146 @@ /datum/supply_pack/faction/independent/chemistry/aluminium name = "Bulk Aluminium" desc = "Contains a jug filled with 150u of aluminium." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/aluminium) crate_name = "bulk aluminium crate" /datum/supply_pack/faction/independent/chemistry/bromine name = "Bulk Bromine" desc = "Contains a jug filled with 150u of bromine." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/bromine) crate_name = "bulk bromine crate" /datum/supply_pack/faction/independent/chemistry/carbon name = "Bulk Carbon" desc = "Contains a jug filled with 150u of carbon." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/carbon) crate_name = "bulk carbon crate" /datum/supply_pack/faction/independent/chemistry/chlorine name = "Bulk Chlorine" desc = "Contains a jug filled with 150u of chlorine." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/chlorine) crate_name = "bulk chlorine crate" /datum/supply_pack/faction/independent/chemistry/copper name = "Bulk Copper" desc = "Contains a jug filled with 150u of copper." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/copper) crate_name = "bulk copper crate" /datum/supply_pack/faction/independent/chemistry/fluorine name = "Bulk Fluorine" desc = "Contains a jug filled with 150u of fluorine." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/fluorine) crate_name = "bulk fluorine crate" /datum/supply_pack/faction/independent/chemistry/hydrogen name = "Bulk Hydrogen" desc = "Contains a jug filled with 150u of Hydrogen." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/hydrogen) crate_name = "bulk hydrogen crate" /datum/supply_pack/faction/independent/chemistry/iodine name = "Bulk Iodine" desc = "Contains a jug filled with 150u of iodine." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/iodine) crate_name = "bulk iodine crate" /datum/supply_pack/faction/independent/chemistry/lithium name = "Bulk Lithium" desc = "Contains a jug filled with 150u of lithium." - cost = 750 + cost = 200 contains = list(/obj/item/reagent_containers/glass/chem_jug/lithium) crate_name = "bulk lithium crate" /datum/supply_pack/faction/independent/chemistry/mercury name = "Bulk Mercury" desc = "Contains a jug filled with 150u of mercury." - cost = 750 + cost = 200 contains = list(/obj/item/reagent_containers/glass/chem_jug/mercury) crate_name = "bulk mercury crate" /datum/supply_pack/faction/independent/chemistry/nitrogen name = "Bulk Nitrogen" desc = "Contains a jug filled with 150u of nitrogen." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/nitrogen) crate_name = "bulk nitrogen crate" /datum/supply_pack/faction/independent/chemistry/oxygen name = "Bulk Oxygen" desc = "Contains a jug filled with 150u of oxygen." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/oxygen) crate_name = "bulk oxygen crate" /datum/supply_pack/faction/independent/chemistry/phosphorus name = "Bulk Phosphorus" desc = "Contains a jug filled with 150u of phosphorus." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/phosphorus) crate_name = "bulk phosphorus crate" /datum/supply_pack/faction/independent/chemistry/potassium name = "Bulk Potassium" desc = "Contains a jug filled with 150u of potassium." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/potassium) crate_name = "bulk potassium crate" /datum/supply_pack/faction/independent/chemistry/radium name = "Bulk Radium" desc = "Contains a jug filled with 150u of radium." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/radium) crate_name = "bulk radium crate" /datum/supply_pack/faction/independent/chemistry/sodium name = "Bulk Sodium" desc = "Contains a jug filled with 150u of sodium." - cost = 750 + cost = 100 contains = list(/obj/item/reagent_containers/glass/chem_jug/sodium) crate_name = "bulk sodium crate" /datum/supply_pack/faction/independent/chemistry/sulfur name = "Bulk Sulfur" desc = "Contains a jug filled with 150u of sulfur." - cost = 750 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/sulfur) crate_name = "bulk sulfur crate" /datum/supply_pack/faction/independent/chemistry/eznutriment name = "Bulk E-Z-Nutriment" desc = "Contains a jug filled with 150u of E-Z-Nutriment." - cost = 500 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/eznutriment) crate_name = "bulk E-Z-Nutriment crate" /datum/supply_pack/faction/independent/chemistry/left4zednutriment name = "Bulk Left 4 Zed" desc = "Contains a jug filled with 150u of Left 4 Zed." - cost = 500 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/left4zednutriment) crate_name = "bulk Left 4 Zed crate" /datum/supply_pack/faction/independent/chemistry/robustharvestnutriment name = "Bulk Robust Harvest" desc = "Contains a jug filled with 150u of Robust Harvest." - cost = 500 + cost = 300 contains = list(/obj/item/reagent_containers/glass/chem_jug/robustharvestnutriment) crate_name = "bulk Robust Harvest crate" /datum/supply_pack/faction/independent/chemistry/holywater name = "Flask of holy water" desc = "Father Lootius' own brand of ready-made filled with 100u of holy water." - cost = 1000 + cost = 700 contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater) crate_name = "flask of holy water crate" diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/medical/medical.dm b/mod_celadon/outpost_console/code/supply_pack/independent/medical/medical.dm index 280cd60574aa..57c5e21a7b23 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/medical/medical.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/medical/medical.dm @@ -110,6 +110,15 @@ contains = list(/obj/item/storage/box/medipens) crate_name = "epinephrine medipen crate" +/datum/supply_pack/faction/independent/medical/anesthetic + name = "Anesthetics" + desc = "Contains a standard anesthetics tank, for standard surgical procedures." + cost = 200 + contains = list(/obj/item/clothing/mask/breath/medical, + /obj/item/tank/internals/anesthetic) + crate_name = "anesthetics crate" + + /datum/supply_pack/faction/independent/medical/surplus name = "Medical Surplus" desc = "Contains an assortment of medical supplies haphazardly pulled from storage. German doctor not included." @@ -158,3 +167,124 @@ contains = list(/obj/item/food/grown/cannabis) crate_name = "marijuana crate" crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/faction/independent/medical/painkillers + name = "Painkiller Supply" + desc = "Contains a supply of painkillers. Great for stopping headaches, feeling broken bones, and screaming people!" + cost = 1000 + contains = list( + /obj/item/reagent_containers/chem_pack/dimorlin, + /obj/item/reagent_containers/glass/bottle/morphine, + /obj/item/reagent_containers/glass/bottle/morphine, + /obj/item/reagent_containers/glass/bottle/tramal, + /obj/item/reagent_containers/glass/bottle/tramal,) + +// MARK: Hypospray & vials + +/datum/supply_pack/faction/independent/medical/vials + category = "Medical - Hypospray and Vials" + stable_price = TRUE + crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/faction/independent/medical/vials/mkii_hypo + name = "mk.II Hypospray kit" + desc = "Contains a Hypospray manufactured by Nanotrasen and Cybersun, for on the field medical care. Comes with an assortment of Ready-To-Go Vials" + cost = 1200 + contains = list(/obj/item/storage/box/hypospray) + crate_name = "mk.II hypospray crate" + +/datum/supply_pack/faction/independent/medical/vials/indo_vial + name = "Indomide Vial Crate" + desc = "Contains a spare indomide vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide, + ) + crate_name = "indomide vial crate" + +/datum/supply_pack/faction/independent/medical/vials/alvi_vial + name = "Alvitane Vial Crate" + desc = "Contains a spare alvitane vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane, + ) + crate_name = "alvitane vial crate" + +/datum/supply_pack/faction/independent/medical/vials/dylo_vial + name = "Pancrazine Vial Crate" + desc = "Contains a spare dylovene vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine, + ) + crate_name = "pancrazine vial crate" + +/datum/supply_pack/faction/independent/medical/vials/dexa_vial + name = "Dexalin Vial Crate" + desc = "Contains a spare dexalin vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/dexalin, + ) + crate_name = "dexalin vial crate" + +/datum/supply_pack/faction/independent/medical/vials/tric_vial + name = "Cureall Vial Crate" + desc = "Contains a spare cureall vial, for usage in a Hypospray." + cost = 300 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall, + ) + crate_name = "cureall vial crate" + +/datum/supply_pack/faction/independent/medical/vials/morb_vial + name = "Morphine Vial Crate" + desc = "Contains a spare morphine vial, for usage in a Hypospray." + cost = 500 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/morphine, + ) + crate_name = "morphine vial crate" + +/datum/supply_pack/faction/independent/medical/vials/atro_vial + name = "Atropine Vial Crate" + desc = "Contains a spare atropine vial, for usage in a Hypospray." + cost = 500 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/atropine, + ) + crate_name = "atropine vial crate" + +/datum/supply_pack/faction/independent/medical/vials/stas_vial + name = "Stasis Vial Crate" + desc = "Contains a spare stasis vial, for usage in a Hypospray." + cost = 800 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/stasis, + ) + crate_name = "stasis vial crate" + +/datum/supply_pack/faction/independent/medical/vials/erp_vial + name = "Radiation Purgant Vial Crate" + desc = "Contains one spare radiation purgant vial, for usage in a Hypospray." + cost = 300 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/erp) + crate_name = "radiation purgant vial crate" + +/datum/supply_pack/faction/independent/medical/vials/sal_vial + name = "SalGlu Vial Crate" + desc = "Contains one spare SalGlu Solution vial, for usage in a Hypospray." + cost = 300 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/salclu) + crate_name = "SalGlu vial crate" + +/datum/supply_pack/faction/independent/medical/vials/chit_vial + name = "Chitosan Vial Crate" + desc = "Contains one spare Chitosan vial, for usage in a Hypospray." + cost = 300 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan) + crate_name = "chitosan vial crate" diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/misc/civilian.dm b/mod_celadon/outpost_console/code/supply_pack/independent/misc/civilian.dm index ee73e1c24151..120d0abb444b 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/misc/civilian.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/misc/civilian.dm @@ -118,6 +118,86 @@ MARK: Bundles /obj/item/flashlight/glowstick/pink) crate_name = "party equipment crate" +// Coffee +/datum/supply_pack/faction/independent/civilian/coffee_starter + name = "Personal Coffee Starter Kit" + desc = "If you're looking to get some coffee supply for your caffeine-starved bridge crew, this is the place to start. Contains three mugs, a coffee pot, and two coffee cartridges. Coffee machine not included." + cost = 100 + contains = list(/obj/item/reagent_containers/food/drinks/mug, + /obj/item/reagent_containers/food/drinks/mug, + /obj/item/reagent_containers/food/drinks/mug, + /obj/item/reagent_containers/glass/coffeepot, + /obj/item/coffee_cartridge, + /obj/item/coffee_cartridge) + crate_name = "Basic Coffee Supply Crate" + +/datum/supply_pack/faction/independent/civilian/coffee_cartridge + name = "Solar's Best Coffee Cartridge Resupply" + desc = "Contains five coffee cartridges for your coffee machine, imported from Sol." + cost = 200 + contains = list(/obj/item/coffee_cartridge, + /obj/item/coffee_cartridge, + /obj/item/coffee_cartridge, + /obj/item/coffee_cartridge, + /obj/item/coffee_cartridge) + crate_name = "Coffee Cartridge Supply Crate" + +/datum/supply_pack/faction/independent/civilian/coffee_cartridge_fancy + name = "Premium Coffee Cartridge Resupply" + desc = "Contains an assortment of five high-quality coffee cartridges." + cost = 300 + contains = list(/obj/item/coffee_cartridge/fancy, + /obj/item/coffee_cartridge/fancy, + /obj/item/coffee_cartridge/fancy, + /obj/item/coffee_cartridge/fancy, + /obj/item/coffee_cartridge/fancy) + crate_name = "Premium Coffee Supply Crate" + +/datum/supply_pack/faction/independent/civilian/coffeekit + name = "Coffee Shop Starter Crate" + desc = "All the basic equipment needed for enterprising coffee-selling spacefarers. Coffeemaker not included." + cost = 200 + contains = list(/obj/item/storage/box/coffeepack/robusta, + /obj/item/storage/box/coffeepack/arabica, + /obj/item/reagent_containers/glass/coffeepot, + /obj/item/storage/fancy/coffee_condi_display, + /obj/item/reagent_containers/food/drinks/bottle/cream, + /obj/item/reagent_containers/condiment/milk, + /obj/item/reagent_containers/condiment/soymilk, + /obj/item/reagent_containers/condiment/sugar, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/caramel) + crate_name = "coffee equpment crate" + +/datum/supply_pack/faction/independent/civilian/coffeemaker + name = "Coffeemaker Crate" + desc = "Contains one pre-assembled Attention model coffeemaker." + cost = 750 + contains = list(/obj/machinery/coffeemaker) + crate_name = "coffeemaker crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/faction/independent/civilian/coffeemaker_premium + name = "Premium Coffeemaker Crate" + desc = "Contains one pre-assembled professional-grade Sirere model coffeemaker." + cost = 1000 + contains = list(/obj/machinery/coffeemaker/premium) + crate_name = "premium coffeemaker crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/faction/independent/civilian/syrup + name = "Coffee Syrups Box" + desc = "A packaged box of various syrups, perfect to make your delicious coffee even more diabetic." + cost = 100 + contains = list(/obj/item/reagent_containers/glass/bottle/syrup_bottle/caramel, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/liqueur, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/honey, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/vanilla, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/tea, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/creme_de_cacao, + /obj/item/reagent_containers/glass/bottle/syrup_bottle/creme_de_menthe) + crate_name = "coffee syrups box" + crate_type = /obj/structure/closet/cardboard + /datum/supply_pack/faction/independent/civilian/bigband name = "Big Band Instrument Collection" desc = "Get your demoralized crew movin' and groovin' with this fine collection! Contains nine different instruments!" @@ -198,9 +278,8 @@ MARK: Decoration / flooring /datum/supply_pack/faction/independent/civilian/noslipfloor name = "High-traction Floor Tiles" desc = "Make slipping a thing of the past with thirty industrial-grade anti-slip floortiles!" - cost = 1000 - contains = list(/obj/item/stack/tile/noslip/thirty, - /obj/item/stack/tile/noslip/thirty) + cost = 200 + contains = list(/obj/item/stack/tile/noslip/thirty) crate_name = "high-traction floor tiles crate" /datum/supply_pack/faction/independent/civilian/jukebox diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/misc/vendor_refill.dm b/mod_celadon/outpost_console/code/supply_pack/independent/misc/vendor_refill.dm index d23d738d00de..6474e13168a0 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/misc/vendor_refill.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/misc/vendor_refill.dm @@ -47,11 +47,11 @@ crate_name = "games supply crate" /datum/supply_pack/faction/independent/vendor_refill/vend_circ - name = "Vendor circuit board " - desc = "Circuit board for building vendors." + name = "Custom Vendor circuit board" + desc = "Circuit board for custom building vendors." cost = 250 contains = list(/obj/item/circuitboard/machine/vendor, - /obj/item/screwdriver) + /obj/item/vending_refill/custom) crate_name = "vend circuit crate" /datum/supply_pack/faction/independent/vendor_refill/shaft diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/security/ammo.dm b/mod_celadon/outpost_console/code/supply_pack/independent/security/ammo.dm index 17afdc6e7780..6180d984cfac 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/security/ammo.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/security/ammo.dm @@ -23,6 +23,7 @@ > 5.56x42 (Hydra) > [-] 5.56x45 (G36) > 7.62 +> .299 > .45-70 > .300 > .308 @@ -96,7 +97,7 @@ match damage = 20 armour_penetration = -10 */ -- Используют: +- Используют: - Револьверы: HP Detective - Винтовки: Flaming Arrow Lever Action @@ -111,7 +112,7 @@ hp damage = 50 armour_penetration = -20 */ -- Используют: +- Используют: - Авто-пистолеты: CM-357 (SF) - Револьверы: Firebrand / Viper-23 / Horizon-X (IQ) / Rhino (NT) / R-23 'Viper' (S) - Винтовки: Absolution Lever Action @@ -124,8 +125,8 @@ hp damage = 50 armour_penetration = 0 */ -- Используют: -- Револьверы: Shadow / Montagne +- Используют: +- Револьверы: Shadow / Montagne - Пистолеты: M20 Auto Elite / Pinscher Heavy Pistol (IQ) - SMG: Firestorm @@ -140,7 +141,7 @@ hp damage = 70 armour_penetration = -10 */ -- Используют: +- Используют: - Револьвер: Ashhand Hunting - Винтовки: Beacon Break Action @@ -157,7 +158,7 @@ hp damage = 35 armour_penetration = 10 */ -- Используют: +- Используют: - Штурмовые: CM-82 / SMR-80 (S) / SAW-80 (S) - Снапер-DMR: SBR-80 (S) @@ -172,8 +173,8 @@ hp damage = 50 armour_penetration = 10 */ -- Используют: -- Винтовки: Illestren / Model 23 'Woodsman' / +- Используют: +- Винтовки: Illestren / Model 23 'Woodsman' / Vickland /* MARK: 7.62x40mm @@ -187,7 +188,7 @@ hp damage = 40 armour_penetration = 10 */ -- Используют: +- Используют: - Винтовки: Super Sporter - Штурмовые: SKM-24 / SKM-44 (IQ) / CM-24 (SF) - LMG: CM-40 (SF) @@ -203,7 +204,7 @@ hp damage = 60 armour_penetration = -10 */ -- Используют: +- Используют: - Винтовки: - Штурмовые: Morita Mk.I - LMG: KM-05 Rottweiler (IQ) @@ -283,7 +284,7 @@ bullet damage = 40 armour_penetration = 50 */ -- Используют: +- Используют: - Снайпер: Boomslang-90 / SSG-08 Saluki (IQ) / CM-F90 (SF) / MSR-90 'Boomslang' (S) /* MARK: 7.62x54mm @@ -297,7 +298,7 @@ bullet damage = 50 armour_penetration = 40 */ -- Используют: +- Используют: - Снайпер: Scout Sniper // Гаусс @@ -382,10 +383,9 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc38 name = ".38 Ammo Boxes" - desc = "Contains two 45-round ammo boxes for refilling .38 weapons." - cost = 250 - contains = list(/obj/item/storage/box/ammo/c38, - /obj/item/storage/box/ammo/c38) + desc = "Contains a 60-round ammo box for refilling .38 weapons." + cost = 125 + contains = list(/obj/item/storage/box/ammo/c38) crate_name = "ammo crate" /* @@ -394,25 +394,25 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc9mm_ammo_box name = "9x18mm Ammo Box" - desc = "Contains a 45-round 9x18mm box for pistols and SMGs such as the Commander or Saber." + desc = "Contains a 60-round 9x18mm box for pistols and SMGs such as the Commander or Saber." contains = list(/obj/item/storage/box/ammo/c9mm) cost = 200 /datum/supply_pack/faction/independent/ammo/ammoc9mmap_ammo_box name = "9x18mm AP Ammo Box" - desc = "Contains a 45-round 9x18mm box loaded with armor piercing ammo." + desc = "Contains a 60-round 9x18mm box loaded with armor piercing ammo." contains = list(/obj/item/storage/box/ammo/c9mm_ap) cost = 250 /datum/supply_pack/faction/independent/ammo/ammoc9mmhp_ammo_box name = "9x18mm HP Ammo Box" - desc = "Contains a 45-round 9x18mm box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 60-round 9x18mm box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/c9mm_hp) cost = 250 /datum/supply_pack/faction/independent/ammo/ammoc9mmrubber_ammo_box name = "9x18mm Rubber Ammo Box" - desc = "Contains a 45-round 9x18mm box loaded with less-than-lethal rubber rounds." + desc = "Contains a 60-round 9x18mm box loaded with less-than-lethal rubber rounds." contains = list(/obj/item/storage/box/ammo/c9mm_rubber) cost = 200 @@ -422,27 +422,27 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc10mm_ammo_box name = "10x22mm Ammo Box" - desc = "Contains a 36-round 10x22mm box for pistols and SMGs like the Ringneck or the SkM-44(k)." + desc = "Contains a 60-round 10x22mm box for pistols and SMGs like the Ringneck or the SkM-44(k)." contains = list(/obj/item/storage/box/ammo/c10mm) - cost = 200 + cost = 210 -// /datum/supply_pack/faction/independent/ammo/ammoc10mmap_ammo_box -// name = "10x22mm AP Ammo Box" -// desc = "Contains a 36-round 10x22mm box loaded with armor piercing ammo." -// contains = list(/obj/item/storage/box/ammo/c10mm_ap) -// cost = 260 +/datum/supply_pack/faction/independent/ammo/ammoc10mmap_ammo_box + name = "10x22mm AP Ammo Box" + desc = "Contains a 60-round 10x22mm box loaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/c10mm_ap) + cost = 260 /datum/supply_pack/faction/independent/ammo/ammoc10mmhp_ammo_box name = "10x22mm HP Ammo Box" - desc = "Contains a 36-round 10x22mm box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 60-round 10x22mm box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/c10mm_hp) - cost = 250 + cost = 260 -// /datum/supply_pack/faction/independent/ammo/ammoc10mmrubber_ammo_box -// name = "10x22mm Rubber Ammo Box" -// desc = "Contains a 36-round 10x22mm box loaded with less-than-lethal rubber rounds." -// contains = list(/obj/item/storage/box/ammo/c10mm_rubber) -// cost = 200 +/datum/supply_pack/faction/independent/ammo/ammoc10mmrubber_ammo_box + name = "10x22mm Rubber Ammo Box" + desc = "Contains a 36-round 10x22mm box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/storage/box/ammo/c10mm_rubber) + cost = 210 /* MARK: .44 @@ -472,27 +472,27 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc45_ammo_box name = ".45 Ammo Box" - desc = "Contains a 36-round .45 box for pistols and SMGs like the Candor or the C-20r." + desc = "Contains a 48-round .45 box for pistols and SMGs like the Candor or the C-20r." contains = list(/obj/item/storage/box/ammo/c45) cost = 200 -// /datum/supply_pack/faction/independent/ammo/ammoc45ap_ammo_box -// name = ".45 AP Ammo Box" -// desc = "Contains a 36-round .45 box loaded with armor piercing ammo." -// contains = list(/obj/item/storage/box/ammo/c45_ap) -// cost = 260 +/datum/supply_pack/faction/independent/ammo/ammoc45ap_ammo_box + name = ".45 AP Ammo Box" + desc = "Contains a 48-round .45 box loaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/c45_ap) + cost = 260 /datum/supply_pack/faction/independent/ammo/ammoc45hp_ammo_box name = ".45 HP Ammo Box" - desc = "Contains a 36-round .45 box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 48-round .45 box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/c45_hp) cost = 250 -// /datum/supply_pack/faction/independent/ammo/ammoc45mmrubber_ammo_box -// name = ".45 Rubber Ammo Box" -// desc = "Contains a 36-round .45 box loaded with less-than-lethal rubber rounds." -// contains = list(/obj/item/storage/box/ammo/c45_rubber) -// cost = 200 +/datum/supply_pack/faction/independent/ammo/ammoc45mmrubber_ammo_box + name = ".45 Rubber Ammo Box" + desc = "Contains a 48-round .45 box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/storage/box/ammo/c45_rubber) + cost = 200 /* MARK: .357 @@ -500,19 +500,19 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoa357_ammo_box name = ".357 Ammo Box" - desc = "Contains a 36-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand." + desc = "Contains a 48-round .357 box for revolvers such as the Scarborough Revolver and the HP Firebrand." contains = list(/obj/item/storage/box/ammo/a357) cost = 250 /datum/supply_pack/faction/independent/ammo/ammoa357hp_ammo_box name = ".357 HP Ammo Box" - desc = "Contains a 36-round .357 box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 48-round .357 box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/a357_hp) cost = 325 /datum/supply_pack/faction/independent/ammo/ammoa357match_ammo_box name = ".357 Match Ammo Box" - desc = "Contains a 36-round .357 match box for better performance against armor." + desc = "Contains a 48-round .357 match box for better performance against armor." contains = list(/obj/item/storage/box/ammo/a357_match) cost = 325 @@ -534,7 +534,7 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc46x30mm_hp name = "4.6x30mm HP Ammo Box" - desc = "Contains a 80-round 4.6x30mm hollow point box for PDWs such as the WT-550." + desc = "Contains an 80-round 4.6x30mm hollow point box for PDWs such as the WT-550." contains = list(/obj/item/storage/box/ammo/c46x30mm/hp) cost = 375 @@ -544,9 +544,9 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc57x39mm_boxcrate name = "5.7x39mm Ammo Box" - desc = "Contains one 80-round 5.7x39mm box for PDWs such as the Sidewinder." + desc = "Contains an 80-round 5.7x39mm box for PDWs such as the Sidewinder." contains = list(/obj/item/storage/box/ammo/c57x39) - cost = 400 + cost = 300 // /datum/supply_pack/faction/independent/ammo/ammoc57x39mm_ap // name = "5.7x39mm AP Ammo Box" @@ -556,9 +556,9 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc57x39mm_hp name = "5.7x39mm HP Ammo Box" - desc = "Contains one 80-round 5.7x39mm Hollow Point box for PDWs such as the Sidewinder." + desc = "Contains an 80-round 5.7x39mm Hollow Point box for PDWs such as the Sidewinder." contains = list(/obj/item/storage/box/ammo/c57x39/hp) - cost = 475 + cost = 375 /* MARK: 5.56 HITP caseless @@ -566,27 +566,27 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoc556mmHITP_ammo_box name = "5.56mm HITP Caseless Ammo Box" - desc = "Contains a 48-round 5.56mm HITP caseless box for SolGov sidearms like the Pistole C." + desc = "Contains a 60-round 5.56mm HITP caseless box for SolGov sidearms like the Pistole C." contains = list(/obj/item/storage/box/ammo/c556mm) cost = 250 -// /datum/supply_pack/faction/independent/ammo/ammoc556mmHITPap_ammo_box -// name = "5.56mm HITP caseless AP Ammo Box" -// desc = "Contains a 48-round 5.56mm HITP caseless boxloaded with armor piercing ammo." -// contains = list(/obj/item/storage/box/ammo/c556mm_ap) -// cost = 205 +/datum/supply_pack/faction/independent/ammo/ammoc556mmHITPap_ammo_box + name = "5.56mm HITP caseless AP Ammo Box" + desc = "Contains a 60-round 5.56mm HITP caseless boxloaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/c556mm_ap) + cost = 300 /datum/supply_pack/faction/independent/ammo/ammoc556mmhitphp_ammo_box name = "5.56mm HITP Caseless HP Ammo Box" - desc = "Contains a 48-round 5.56mm HITP caseless box loaded with hollow point ammo, great against unarmored targets." + desc = "Contains a 60-round 5.56mm HITP caseless box loaded with hollow point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/c556mm_hp) cost = 300 -// /datum/supply_pack/faction/independent/ammo/ammoc556HITPrubber_ammo_box -// name = "5.56mm HITP Caseless Rubber Ammo Box" -// desc = "Contains a 48-round 5.56 HITP caseless box loaded with less-than-lethal rubber rounds." -// contains = list(/obj/item/storage/box/ammo/c556mm_rubber) -// cost = 165 +/datum/supply_pack/faction/independent/ammo/ammoc556HITPrubber_ammo_box + name = "5.56mm HITP Caseless Rubber Ammo Box" + desc = "Contains a 60-round 5.56 HITP caseless box loaded with less-than-lethal rubber rounds." + contains = list(/obj/item/storage/box/ammo/c556mm_rubber) + cost = 200 /* MARK: 12 Gauge @@ -636,24 +636,24 @@ MARK: .22lr name = ".410 Flechette Box" desc = "Contains a box with 60 flechette rounds of .410 caliber." contains = list(/obj/item/storage/box/ammo/a410_ammo_box/flechette) - cost = 1500 + cost = 1000 // де факто .45-70 только у шотгана. /datum/supply_pack/faction/independent/ammo/a410_slug name = ".410 Slug Box" desc = "Contains a box with 60 slug cartridges of .410 caliber." contains = list(/obj/item/storage/box/ammo/a410_ammo_box/slug) - cost = 2000 + cost = 600 // .410-му стоит понизить патронов в коробке до 32, а в стаке до 8, таким образом стандартизируя его с 12g. /* MARK: 5.56x42 */ -/* Inclusive Syndicate + /datum/supply_pack/faction/independent/ammo/ammoa556_ammo_box name = "5.56x42mm Ammo Box" desc = "Contains one 60-round 5.56x42mm box for most newer rifles." contains = list(/obj/item/storage/box/ammo/a556_42) - cost = 700 + cost = 300 // /datum/supply_pack/faction/independent/ammo/ammoa556_ap // name = "5.56x42mm AP Ammo Box" @@ -665,8 +665,8 @@ MARK: .22lr name = "5.56x42mm HP Ammo Box" desc = "Contains one 60-round 5.56x42mm Hollow Point box for most newer rifles." contains = list(/obj/item/storage/box/ammo/a556_42/hp) - cost = 1000 -*/ + cost = 375 // Взято с оффов. Я вообще не вижу, чтобы индепенденты бегали с ХП или АП патронами. Слишком дорого сейчас ХП и АП патроны взяты. + /* MARK: 5.56x45 @@ -698,13 +698,24 @@ MARK: .22lr name = "7.62x40mm AP Ammo Box" desc = "Contains one 60-round 7.62x40mm Armour Piercing box for the SKM rifles." contains = list(/obj/item/storage/box/ammo/a762_40/ap) - cost = 600 + cost = 500 /datum/supply_pack/faction/independent/ammo/ammoa762_hp name = "7.62x40mm HP Ammo Box" desc = "Contains one 60-round 7.62x40mm Hollow Point box for the SKM rifles." contains = list(/obj/item/storage/box/ammo/a762_40/hp) - cost = 600 + cost = 500 + +/* + MARK: .299 +*/ + +/datum/supply_pack/faction/independent/ammo/c299 + 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." + contains = list(/obj/item/storage/box/ammo/c299) + cost = 220 //5.4 ammo efficiency at 20 damage + /* MARK: .45-70 @@ -746,7 +757,7 @@ MARK: .22lr name = ".308 Ammo Box" desc = "Contains a 40-round .308 box." contains = list(/obj/item/storage/box/ammo/a308) - cost = 650 + cost = 240 // until it gets 35 damage or smth like that like in https://github.com/shiptest-ss13/Shiptest/pull/4380 // /datum/supply_pack/faction/independent/ammo/a308_rubber_box // name = ".308 Rubber Ammo Box" @@ -754,17 +765,26 @@ MARK: .22lr // contains = list(/obj/item/storage/box/ammo/a308/a308_rub) // cost = 300 -/datum/supply_pack/faction/independent/ammo/a308_sp_box - name = ".308 SP Ammo Box" +/datum/supply_pack/faction/independent/ammo/a308_hp_box + name = ".308 hp Ammo Box" desc = "Contains a 40-round .308 box loaded with soft point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/a308/hp) - cost = 800 + cost = 350 -// /datum/supply_pack/faction/independent/ammo/a308_ap_box -// name = ".308 AP Ammo Box" -// desc = "Contains a 40-round .308 box loaded with armor piercing ammo." -// contains = list(/obj/item/storage/box/ammo/a308/ap) -// cost = 1300 +/datum/supply_pack/faction/independent/ammo/a308_ap_box + name = ".308 AP Ammo Box" + desc = "Contains a 40-round .308 box loaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/a308/ap) + cost = 350 + +/* + MARK: 7.62x54mm +*/ +/datum/supply_pack/faction/independent/ammo/x762_54_box + name = "7.62x54mm Ammo Box" + desc = "Contains a 40-round 7.62x54mm box loaded with SVD ammo, great against lightly armored targets." + contains = list(/obj/item/storage/box/ammo/x762_54) + cost = 300 /* MARK: 6.5x57mm @@ -774,13 +794,13 @@ MARK: .22lr name = "6.5x57mm Ammo Box" desc = "Contains a twenty-round 6.5x57mm ammo box for various sniper rifles such as the CM-F90 and the Boomslang series." contains = list(/obj/item/storage/box/ammo/a65clip) - cost = 500 + cost = 200 /datum/supply_pack/faction/independent/ammo/ammoa65clip_trackers name = "6.5x57mm Tracker Shell" desc = "Contains a 10-round 6.5x57mm tracker box for various sniper rifles such as the CM-F90 and the Boomslang series." contains = list(/obj/item/storage/box/ammo/a65clip/trac) - cost = 600 + cost = 250 /* MARK: 8x50mm @@ -830,9 +850,9 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoferropelletboxcrate name = "Ferromagnetic Pellet (FE pellet) Box" - desc = "Contains a 48-round ferromagnetic pellet ammo box for gauss guns such as the Claris." + desc = "Contains a 88-round ferromagnetic pellet ammo box for gauss guns such as the Claris." contains = list(/obj/item/storage/box/ammo/ferropellet) - cost = 350 + cost = 300 /* MARK: ferroslugs @@ -840,7 +860,7 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoferroslugboxcrate name = "Ferromagnetic Slug Box" - desc = "Contains a twenty-round ferromagnetic slug for gauss guns such as the Model-H." + desc = "Contains a 40-round ferromagnetic slug for gauss guns such as the Model-H." contains = list(/obj/item/storage/box/ammo/ferroslug) cost = 300 @@ -850,6 +870,6 @@ MARK: .22lr /datum/supply_pack/faction/independent/ammo/ammoferrolanceboxcrate name = "Ferromagnetic Lance Box" - desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle." + desc = "Contains a 64-round box for high-powered gauss guns such as the GAR assault rifle." contains = list(/obj/item/storage/box/ammo/ferrolance) cost = 400 diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm index 9ea48a07dbb8..2787955472ea 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/security/gun.dm @@ -177,7 +177,6 @@ hp cost = 1250 contains = list(/obj/item/storage/guncase/pistol/m20_auto_elite) crate_name = "pistol crate" - //max_ammo = 9 /* mark: .45 bullet @@ -305,6 +304,13 @@ hp contains = list(/obj/item/storage/guncase/energy/kalixrifle) crate_name = "beam rifle crate" +/datum/supply_pack/faction/independent/gun/laser/kalix/nock + name = "Energy - Etherbor VG-F3 Beam Volleygun" + desc = "Contains a single VG-F3 Beam Volleygun, a civilian-grade volleygun developed in the PGF, manufactured by Etherbor Industries." + cost = 3000 + contains = list(/obj/item/storage/guncase/energy/kalixnock) + crate_name = "beam volleygun crate" + /datum/supply_pack/faction/independent/gun/ion name = "Energy - SL Ion" desc = "Contains a single Mk.I Ion Projector, a special anti-tank rifle designed to disable electronic threats at range." @@ -352,6 +358,13 @@ hp cost = 3000 crate_name = "shotgun crate" +/datum/supply_pack/faction/independent/gun/slammer + name = "Shotgun - Slammer (12g)" + desc = "For when you need to deal with a 6-hooligan riot. Contains a mag-fed pump shotgun, with a 6-round capacity." + cost = 3000 + contains = list(/obj/item/storage/guncase/slammer) + crate_name = "shotgun crate" + /datum/supply_pack/faction/independent/gun/saiga name = "Shotgun - Saiga (410x76mm)" desc = "Contains a Saiga-410 assault shotgun and additional empty medium-sized magazines." @@ -439,10 +452,37 @@ hp /datum/supply_pack/faction/independent/gun/beacon name = "Rifle - Beacon Break Action (.45-70)" desc = "Contains a single shot break action rifle to hunt wildlife that annoys you in particular. Chambered in devastating .45-70 rounds. Warranty voided if sawed off." - cost = 2250 + cost = 1500 contains = list(/obj/item/storage/guncase/beacon) crate_name = "rifle crate" +/datum/supply_pack/faction/independent/gun/pyre + name = "Rifle - Pyre Lever Action (.45-70)" + desc = "Contains a devastating but unwieldy lever-action rifle for annihilating larger wildlife. Chambered in .45-70." + cost = 4000 + contains = list(/obj/item/storage/guncase/pyre) + crate_name = "rifle crate" + + +/* mark: 5.56x42mm +bullet + damage = 25 + armour_penetration = 20 +ap + damage = 20 + armour_penetration = 40 +hp + damage = 35 + armour_penetration = 10 +*/ +/datum/supply_pack/faction/independent/gun/hydra80 + name = "Rifle - Hydra-80 (5.56x42mm)" + desc = "Contains a dated variant of the Hydra assault rifle, with a quick trigger and semi-auto. Accepts only small magazines. Chambered in 5.56x42mm" + contains = list(/obj/item/storage/guncase/hydra80) + cost = 2500 + crate_name = "rifle crate" + + /* mark: 7.62x40mm bullet damage = 30 @@ -479,6 +519,25 @@ hp contains = list(/obj/item/storage/guncase/woodsman) crate_name = "hunting rifle crate" +/* mark: .308 +bullet + damage = 30 + armour_penetration = 40 +ap + damage = 28 + armour_penetration = 60 +hp + damage = 60 + armour_penetration = -10 +*/ +/datum/supply_pack/faction/independent/gun/f3 + name = "DMR - F3 Marksman (.308)" + desc = "Contains an old semi-automatic marksman rifle chambered in .308 and is usually produced by Solar Federation. Come with 2 empty 10-round magazines." + cost = 4000 + contains = list(/obj/item/storage/guncase/f3) + crate_name = "rifle crate" + + /* MARK: Auto Rifles */ @@ -553,8 +612,8 @@ bullet */ /datum/supply_pack/faction/independent/gun/boomslang90 name = "Marksman - Boomslang-90 (6.5x57mm)" - desc = "Contains a civilian variant of the Boomslang Sniper rifle- modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm." - cost = 5000 + desc = "Contains a civilian variant of the Boomslang Sniper rifle - modified with a 2x scope, rather than a sniper scope. Chambered in the powerful 6.5x57mm." + cost = 4000 contains = list(/obj/item/storage/guncase/boomslang) crate_name = "rifle crate" diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/security/magazines.dm b/mod_celadon/outpost_console/code/supply_pack/independent/security/magazines.dm index b7cc76fef734..255331685b31 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/security/magazines.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/security/magazines.dm @@ -85,6 +85,12 @@ contains = list(/obj/item/ammo_box/magazine/m23/empty) cost = 200 +/datum/supply_pack/faction/independent/magazine/woodsman_mag_extended + name = "Woodsman - Extended Magazine (8x50mmR)" + desc = "Contains an 8x50mmR magazine for the Woodsman Rifle, with a capacity of 10 rounds." + contains = list(/obj/item/ammo_box/magazine/m23/extended/empty) + cost = 500 + /datum/supply_pack/faction/independent/magazine/firestorm_mag name = "Firestorm Stick - Magazine (.44)" @@ -99,6 +105,12 @@ contains = list(/obj/item/ammo_box/magazine/m15/empty) cost = 300 +/datum/supply_pack/faction/independent/magazine/short_hydra_mag + name = "Hydra-80 - Short Magazine (5.56x42mm)" + desc = "Contains a 5.56x42mm made specially for the Hydra-80, with a capacity of 20 rounds." + contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small/empty) + cost = 300 + /datum/supply_pack/faction/independent/magazine/c45_cobra_mag name = "Cobra - Magazine (.45)" desc = "Contains a .45 magazine for the Cobra-20, with a capacity of 24 rounds." @@ -117,6 +129,12 @@ contains = list(/obj/item/ammo_box/magazine/boomslang/short/empty) cost = 750 +/datum/supply_pack/faction/independent/magazine/f4_mag + name = "F3/F4 Magazine (.308)" + desc = "Contains a .308 magazine for SsG-04 and F3 platform rifles, with a capacity of 10 rounds." + contains = list(/obj/item/ammo_box/magazine/f4_308/empty) + cost = 500 + /datum/supply_pack/faction/independent/magazine/firestorm_40_mag name = "Firestorm - Pan Magazine (.44)" desc = "Contains a .44 pan magazine for the Hunter's Pride Firestorm SMG, with a capacity of 40 rounds." @@ -159,13 +177,13 @@ name = "Enegry - Etherbor Cell" desc = "Contains an Etherbor weapon cell, compatible with Etherbor armaments with a slightly higher capacity." contains = list(/obj/item/stock_parts/cell/gun/kalix) - cost = 600 + cost = 450 /datum/supply_pack/faction/independent/magazine/guncell name = "Enegry - Weapon Cell" desc = "Contains a weapon cell, compatible with laser guns." contains = list(/obj/item/stock_parts/cell/gun) - cost = 650 + cost = 450 // =========================================================== @@ -226,6 +244,12 @@ // //Магазины для оружия +/datum/supply_pack/faction/independent/magazine/slammer + name = "Slammer - Magazine (12g)" + desc = "Contains a 6-round 12ga magazine for the Slammer shotgun." + contains = list(/obj/item/ammo_box/magazine/m12g_slammer) + cost = 300 + /datum/supply_pack/faction/independent/magazine/a410_saiga name = "Saiga - Short Magazine (.410)" desc = "Contains two .410 caliber short magazines for the Saiga-410 shotgun, containing 6 rounds." diff --git a/mod_celadon/outpost_console/code/supply_pack/independent/tech/modsuits.dm b/mod_celadon/outpost_console/code/supply_pack/independent/tech/modsuits.dm index 2b1e18a05a26..e88c4f99f3ef 100644 --- a/mod_celadon/outpost_console/code/supply_pack/independent/tech/modsuits.dm +++ b/mod_celadon/outpost_console/code/supply_pack/independent/tech/modsuits.dm @@ -5,7 +5,7 @@ /datum/supply_pack/faction/independent/modsuits/science/mod_core name = "MOD Core" desc = "One MODsuit core used in MOD construction." - cost = 4000 + cost = 2000 contains = list(/obj/item/mod/core/standard) crate_name = "MOD core crate" crate_type = /obj/structure/closet/crate/secure/science @@ -13,7 +13,7 @@ /datum/supply_pack/faction/independent/modsuits/science/mod_core_plasma name = "MOD Plasma Core" desc = "One MODsuit core used in MOD construction. This core is designed to be charged from solid plasma." - cost = 4000 + cost = 2000 contains = list(/obj/item/mod/core/plasma) crate_name = "MOD core crate" crate_type = /obj/structure/closet/crate/secure/science diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq/equipment/spacesuit.dm b/mod_celadon/outpost_console/code/supply_pack/inteq/equipment/spacesuit.dm index 1c80e1dd326b..03a4948fe13e 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq/equipment/spacesuit.dm +++ b/mod_celadon/outpost_console/code/supply_pack/inteq/equipment/spacesuit.dm @@ -24,3 +24,11 @@ contains = list(/obj/item/clothing/suit/space/inteq, /obj/item/clothing/head/helmet/space/inteq) crate_name = "space suit crate" + +/datum/supply_pack/faction/inteq/spacesuit/bombsuit + name = "Inteq EOD Hardsuit" + desc = "Contains one EOD hardsuit, to provide safety with explosives." + cost = 2000 + contains = list(/obj/item/clothing/suit/space/hardsuit/bomb/inteq) + crate_name = "EOD hardsuit crate" + crate_type = /obj/structure/closet/crate/secure/science diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq/medical.dm b/mod_celadon/outpost_console/code/supply_pack/inteq/medical.dm index ca9f5140e748..8948c4465e3f 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq/medical.dm +++ b/mod_celadon/outpost_console/code/supply_pack/inteq/medical.dm @@ -1,3 +1,4 @@ +/* /datum/supply_pack/faction/inteq/medical category = "Medical - Medical" @@ -93,3 +94,4 @@ /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan ) crate_name = "chitosan vial crate" +*/ diff --git a/mod_celadon/outpost_console/code/supply_pack/inteq/security/ammo.dm b/mod_celadon/outpost_console/code/supply_pack/inteq/security/ammo.dm index bfff5d00109d..4c4dc7c875f5 100644 --- a/mod_celadon/outpost_console/code/supply_pack/inteq/security/ammo.dm +++ b/mod_celadon/outpost_console/code/supply_pack/inteq/security/ammo.dm @@ -48,25 +48,25 @@ MARK: 9x18mm /datum/supply_pack/faction/inteq/ammo/wt_ammo_box name = "4.6x30mm ammo box" - desc = "4.6x30mm ammo box for guns like the P46 Schnauzer. Contains 50 shells" + desc = "4.6x30mm ammo box for guns like the P46 Schnauzer. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm) cost = 300 // old - 500 /datum/supply_pack/faction/inteq/ammo/wt_ammo_box_ap name = "4.6x30mm AP ammo box" - desc = "4.6x30mm AP ammo box for guns like the P46 Schnauzer. Contains 50 shells" + desc = "4.6x30mm AP ammo box for guns like the P46 Schnauzer. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/ap) cost = 600 // old - 1000 /datum/supply_pack/faction/inteq/ammo/wt_ammo_box_hp name = "4.6x30mm HP ammo box" - desc = "4.6x30mm HP ammo box for guns like the P46 Schnauzer. Contains 50 shells" + desc = "4.6x30mm HP ammo box for guns like the P46 Schnauzer. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/hp) cost = 375 // old - 700 /datum/supply_pack/faction/inteq/ammo/wt_ammo_box_rubber name = "4.6x30mm Rubber ammo box" - desc = "4.6x30mm Rubber ammo box for guns like the P46 Schnauzer. Contains 50 shells" + desc = "4.6x30mm Rubber ammo box for guns like the P46 Schnauzer. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/rubber) cost = 300 // old - 500 @@ -182,22 +182,21 @@ MARK: 9x18mm /datum/supply_pack/faction/inteq/ammo/a762_ammo_box name = "7.62x40mm Ammo Box" - desc = "Contains two 120-round 7.62x40mm ammo, issued by IRMG." - contains = list(/obj/item/storage/box/ammo/a762_40/inteq, - /obj/item/storage/box/ammo/a762_40/inteq) - cost = 700 + desc = "Contains one 60-round 7.62x40mm ammo, issued by IRMG." + contains = list(/obj/item/storage/box/ammo/a762_40/inteq) + cost = 300 /datum/supply_pack/faction/inteq/ammo/a762_ap name = "7.62x40mm Armour Piercing Ammo Box" desc = "Contains one 60-round 7.62x40mm Armour Piercing ammo, issued by IRMG." contains = list(/obj/item/storage/box/ammo/a762_40/ap/inteq) - cost = 450 + cost = 400 /datum/supply_pack/faction/inteq/ammo/a762_hp name = "7.62x40mm Hollow Point Ammo Box" desc = "Contains one 60-round 7.62x40mm Hollow Point ammo, issued by IRMG." contains = list(/obj/item/storage/box/ammo/a762_40/hp/inteq) - cost = 450 + cost = 400 /* MARK: .308 @@ -205,21 +204,21 @@ MARK: 9x18mm /datum/supply_pack/faction/inteq/ammo/a308_ammo_box name = "308 Ammo Box" - desc = "Contains a thirty-round .308 ammo box for DMRs such as the SsG-04 and CM-GAL-S" + desc = "Contains a 40-round .308 ammo box for DMRs such as the SsG-04 and CM-GAL-S" contains = list(/obj/item/storage/box/ammo/a308) - cost = 200 + cost = 240 // until it gets 35 damage or smth like that like in https://github.com/shiptest-ss13/Shiptest/pull/4380 /datum/supply_pack/faction/inteq/ammo/a308_ap name = "308 Armour Piercing Ammo Box" - desc = "Contains a thirty-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S." + desc = "Contains a 40-round .308 armour piercing box for DMRs such as the SsG-04 and CM-GAL-S." contains = list(/obj/item/storage/box/ammo/a308/ap) - cost = 250 + cost = 350 /datum/supply_pack/faction/inteq/ammo/a308_hp name = "308 Hollow Point Ammo Box" - desc = "Contains a thirty-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S." + desc = "Contains a 40-round .308 hollow point box for DMRs such as the SsG-04 and CM-GAL-S." contains = list(/obj/item/storage/box/ammo/a308/hp) - cost = 250 + cost = 350 /* MARK: 5.56x45mm @@ -248,7 +247,7 @@ MARK: 9x18mm */ /datum/supply_pack/faction/inteq/ammo/a65clip_box - name = "6.5mm Ammo Box Crate" + name = "6.5x57mm Ammo Box Crate" desc = "Contains a twenty-round 6.5mm ammo box for various sniper rifles such as the CM-F90 and the Boomslang series." contains = list(/obj/item/storage/box/ammo/a65clip) cost = 200 //4 ammo efficiency at 40 damage diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/armor.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/armor.dm index e590ff0ee1ae..2b9841290fea 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/armor.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/armor.dm @@ -3,7 +3,28 @@ /datum/supply_pack/faction/nanotrasen/armor/armorsec name = "Nanotrasen Security Kit" - desc = "Some security armor vests and helmets to protect you. Produced by Nanotrasen" + desc = "One kit of security armor vest and helmet to protect you. Produced by Nanotrasen" contains = list(/obj/item/clothing/suit/armor/nanotrasen, /obj/item/clothing/head/helmet/m10/nanotrasen) - cost = 500 + cost = 300 + +/datum/supply_pack/faction/nanotrasen/armor/armorbulletproof + name = "Nanotrasen Bulletproof Armor Kit" + desc = "One kit of bulletproof armor vest and helmet to protect you. Produced by Nanotrasen" + contains = list(/obj/item/clothing/suit/armor/vest/bulletproof, + /obj/item/clothing/head/helmet/bulletproof/x11/nanotrasen) + cost = 750 + +/datum/supply_pack/faction/nanotrasen/armor/armorheavy + name = "Nanotrasen heavy Armor Kit" + desc = "One kit of heavy tactical armor vest and heavy riot helmet to protect you. Produced by Nanotrasen" + contains = list(/obj/item/clothing/suit/armor/vest/marine/heavy, + /obj/item/clothing/head/helmet/riot/nanotrasen) + cost = 3000 + +/datum/supply_pack/faction/nanotrasen/armor/armorriot + name = "Nanotrasen Riot Armor Kit" + desc = "Contains one full set of riot armor. Although heavily padded to deal with close-quarters threats, they perform poorly against most firearms. Produced by Nanotrasen" + contains = list(/obj/item/clothing/suit/armor/riot, + /obj/item/clothing/head/helmet/riot/nanotrasen) + cost = 750 diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/spacesuit.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/spacesuit.dm index 59e5af73b2f9..4c287a442634 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/spacesuit.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/equipment/spacesuit.dm @@ -27,11 +27,11 @@ crate_type = /obj/structure/closet/crate/secure/plasma /datum/supply_pack/faction/nanotrasen/spacesuit/sci_hardsuit - name = "Scientific Hardsuit" - desc = "Contains one science hardsuit, designed to provide safety under advanced experimental conditions, or while handling explosives." + name = "EOD Hardsuit" + desc = "Contains one EOD hardsuit, designed to provide safety under advanced experimental conditions, or while handling explosives." cost = 2000 contains = list(/obj/item/clothing/suit/space/hardsuit/bomb) - crate_name = "scientific hardsuit crate" + crate_name = "EOD hardsuit crate" crate_type = /obj/structure/closet/crate/secure/science /datum/supply_pack/faction/nanotrasen/spacesuit/atmos_hardsuit @@ -45,7 +45,7 @@ /datum/supply_pack/faction/nanotrasen/spacesuit/advanced_hardsuit name = "Advanced Hardsuit" desc = "The culimination of research into robust engineering equipment. This hardsuit makes the wearer near immune to the natural hazards the Frontier can throw." - cost = 4000 + cost = 3000 contains = list(/obj/item/clothing/suit/space/hardsuit/engine/elite) crate_name = "advanced hardsuit crate" crate_type = /obj/structure/closet/crate/secure/engineering @@ -53,7 +53,7 @@ /datum/supply_pack/faction/nanotrasen/spacesuit/heavy_sec_hardsuit name = "Heavy Security Hardsuit" desc = "Nanotrasen's premier solution to security hazards in low pressure environments, a well armored, highly mobile combat suit. The wearer is advised to have their zero-g training completed before utilizing the jetpack module." - cost = 5000 + cost = 4000 contains = list(/obj/item/clothing/suit/space/hardsuit/security/hos) crate_name = "advanced hardsuit crate" crate_type = /obj/structure/closet/crate/secure/gear @@ -62,10 +62,10 @@ name = "Nanotrasen Security Hardsuit" desc = "A cheap spare security hardsuit used on NT's stations by the sec department. Provides weak protection against most damage types. Using it for combat in the frontier region of space is not recommended" contains = list(/obj/item/clothing/suit/space/hardsuit/security) - cost = 3500 + cost = 1800 /datum/supply_pack/faction/nanotrasen/spacesuit/hardsuitswat name = "Nanotrasen MK2 SWAT hardsuit" desc = "Advanced MK2 SWAT hardsuit used by elite corporate assets. While it is bulky, slow and is missing a built in flashlight, it provides excellent protection against almost any weapon and is great for work in hazardous environments" contains = list(/obj/item/clothing/suit/space/hardsuit/swat/captain) - cost = 8000 + cost = 5000 diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/medical.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/medical.dm index ffc5e5633277..a6f5bb2ac090 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/medical.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/medical.dm @@ -27,35 +27,36 @@ ) crate_name = "empty vial crate" -// /datum/supply_pack/faction/nanotrasen/medical/vials/bica_vial -// name = "Bicardine Vial" -// desc = "Contains a spare bicardine vial, for usage in a Hypospray." -// cost = 400 -// contains = list( -// /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/bicaridine, -// ) -// crate_name = "bicardine vial crate" - -// /datum/supply_pack/faction/nanotrasen/medical/vials/kelo_vial -// name = "Kelotane Vial" -// desc = "Contains a spare kelotane vial, for usage in a Hypospray." -// cost = 400 -// contains = list( -// /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/kelotane, -// ) -// crate_name = "kelotane vial crate" - -// /datum/supply_pack/faction/nanotrasen/medical/vials/dylo_vial -// name = "Dylovene Vial" -// desc = "Contains a spare dylovene vial, for usage in a Hypospray." -// cost = 400 -// contains = list( -// /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/antitoxin, -// ) -// crate_name = "dylovene vial crate" - -/datum/supply_pack/faction/nanotrasen/medical/vials/dexa_vial - name = "Dexalin Vial" + +/datum/supply_pack/faction/nanotrasen/medical/indo_vial + name = "Indomide Vial Crate" + desc = "Contains a spare indomide vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/indomide, + ) + crate_name = "indomide vial crate" + +/datum/supply_pack/faction/nanotrasen/medical/alvi_vial + name = "Alvitane Vial Crate" + desc = "Contains a spare alvitane vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/alvitane, + ) + crate_name = "alvitane vial crate" + +/datum/supply_pack/faction/nanotrasen/medical/dylo_vial + name = "Pancrazine Vial Crate" + desc = "Contains a spare dylovene vial, for usage in a Hypospray." + cost = 400 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/pancrazine, + ) + crate_name = "pancrazine vial crate" + +/datum/supply_pack/faction/nanotrasen/medical/dexa_vial + name = "Dexalin Vial Crate" desc = "Contains a spare dexalin vial, for usage in a Hypospray." cost = 400 contains = list( @@ -63,17 +64,17 @@ ) crate_name = "dexalin vial crate" -// /datum/supply_pack/faction/nanotrasen/medical/vials/tric_vial -// name = "Tricordrazine Vial" -// desc = "Contains a spare tricordrazine vial, for usage in a Hypospray." -// cost = 300 -// contains = list( -// /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall, -// ) -// crate_name = "tricordrazine vial crate" - -/datum/supply_pack/faction/nanotrasen/medical/vials/morb_vial - name = "Morphine Vial" +/datum/supply_pack/faction/nanotrasen/medical/tric_vial + name = "Cureall Vial Crate" + desc = "Contains a spare cureall vial, for usage in a Hypospray." + cost = 300 + contains = list( + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/cureall, + ) + crate_name = "cureall vial crate" + +/datum/supply_pack/faction/nanotrasen/medical/morb_vial + name = "Morphine Vial Crate" desc = "Contains a spare morphine vial, for usage in a Hypospray." cost = 500 contains = list( @@ -81,8 +82,8 @@ ) crate_name = "morphine vial crate" -/datum/supply_pack/faction/nanotrasen/medical/vials/atro_vial - name = "Atropine Vial" +/datum/supply_pack/faction/nanotrasen/medical/atro_vial + name = "Atropine Vial Crate" desc = "Contains a spare atropine vial, for usage in a Hypospray." cost = 500 contains = list( @@ -90,8 +91,8 @@ ) crate_name = "atropine vial crate" -/datum/supply_pack/faction/nanotrasen/medical/vials/stas_vial - name = "Stasis Vial" +/datum/supply_pack/faction/nanotrasen/medical/stas_vial + name = "Stasis Vial Crate" desc = "Contains a spare stasis vial, for usage in a Hypospray." cost = 800 contains = list( @@ -99,32 +100,26 @@ ) crate_name = "stasis vial crate" -/datum/supply_pack/faction/nanotrasen/medical/vials/erp_vial - name = "Radiation Purgant Vial" - desc = "Contains 2 spare radiation purgant vials, for usage in a Hypospray." - cost = 600 +/datum/supply_pack/faction/nanotrasen/medical/erp_vial + name = "Radiation Purgant Vial Crate" + desc = "Contains one spare radiation purgant vial, for usage in a Hypospray." + cost = 300 contains = list( - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/erp, - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/erp - ) + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/erp) crate_name = "radiation purgant vial crate" -/datum/supply_pack/faction/nanotrasen/medical/vials/sal_vial - name = "SalGlu Vial" - desc = "Contains 2 spare SalGlu Solution vials, for usage in a Hypospray." - cost = 600 +/datum/supply_pack/faction/nanotrasen/medical/sal_vial + name = "SalGlu Vial Crate" + desc = "Contains one spare SalGlu Solution vial, for usage in a Hypospray." + cost = 300 contains = list( - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/salclu, - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/salclu - ) + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/salclu) crate_name = "SalGlu vial crate" -/datum/supply_pack/faction/nanotrasen/medical/vials/chit_vial - name = "Chitosan Vial" - desc = "Contains 2 spare Chitosan vials, for usage in a Hypospray." - cost = 600 +/datum/supply_pack/faction/nanotrasen/medical/chit_vial + name = "Chitosan Vial Crate" + desc = "Contains one spare Chitosan vial, for usage in a Hypospray." + cost = 300 contains = list( - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan, - /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan - ) + /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan) crate_name = "chitosan vial crate" diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/ammo.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/ammo.dm index 6d9347667b3e..176b91918f70 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/ammo.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/ammo.dm @@ -6,6 +6,7 @@ [-] - отключены. > 9x18mm +> 12g > 4.63x30mm > ferro pellets @@ -14,53 +15,88 @@ MARK: 9x18mm /datum/supply_pack/faction/nanotrasen/ammo/c9mm_ammo_box name = "9x18mm ammo box" - desc = "9x18mm ammo box for guns like the commander or the saber SMG. Contains 50 shells" + desc = "9x18mm ammo box for guns like the Challenger or the SMG Expedition. Contains 45 shells" contains = list(/obj/item/storage/box/ammo/c9mm) cost = 250 /datum/supply_pack/faction/nanotrasen/ammo/c9mm_ammo_box_ap name = "9x18mm AP ammo box" - desc = "9x18mm AP ammo box for guns like the commander or the saber SMG. Contains 50 shells" + desc = "9x18mm AP ammo box for guns like the Challenger or the SMG Expedition. Contains 45 shells" contains = list(/obj/item/storage/box/ammo/c9mm_ap) cost = 450 /datum/supply_pack/faction/nanotrasen/ammo/c9mm_ammo_box_hp name = "9x18mm HP ammo box" - desc = "9x18mm HP ammo box for guns like the commander or the saber SMG. Contains 50 shells" + desc = "9x18mm HP ammo box for guns like the Challenger or the SMG Expedition. Contains 45 shells" contains = list(/obj/item/storage/box/ammo/c9mm_hp) cost = 350 /datum/supply_pack/faction/nanotrasen/ammo/c9mm_rubber name = "9x18mm Rubber ammo box" - desc = "9x18mm Rubber ammo box for guns like the commander or the saber SMG. Contains 50 shells" + desc = "9x18mm Rubber ammo box for guns like the Challenger or the SMG Expedition. Contains 50 shells" contains = list(/obj/item/storage/box/ammo/c9mm_rubber) cost = 250 + +/* + MARK: 12 Gauge +*/ + +/datum/supply_pack/faction/nanotrasen/ammo/buckshot + name = "12g Buckshot" + desc = "Contains a box of 32 12 gauge buckshot shells for use in lethal persuasion." + cost = 500 + contains = list(/obj/item/storage/box/ammo/a12g_buckshot) + +/datum/supply_pack/faction/nanotrasen/ammo/slugs + name = "12g Shotgun Slug" + desc = "Contains a box of 32 12 gauge slug shells for use in lethal persuasion." + cost = 200 + contains = list(/obj/item/storage/box/ammo/a12g_slug) + +/datum/supply_pack/faction/nanotrasen/ammo/blank_shells + name = "12g Blank Shell" + desc = "Contains a box of 12 gauge blank shells." + cost = 200 + contains = list(/obj/item/storage/box/ammo/a12g_blank) + +/datum/supply_pack/faction/nanotrasen/ammo/rubbershot + name = "12g Rubbershot" + desc = "Contains a box of 32 12 gauge rubbershot shells. Perfect for crowd control and training." + cost = 500 + contains = list(/obj/item/storage/box/ammo/a12g_rubbershot) + +/datum/supply_pack/faction/nanotrasen/ammo/techshells + name = "12g Unloaded Shotgun Technological Shells" + desc = "Contains a box of 7 versatile tech shells, capable of producing a variety of deadly effects for any situation. Some assembly required." + cost = 200 + contains = list(/obj/item/storage/box/techshot) + /* MARK: 4.63x30mm */ /datum/supply_pack/faction/nanotrasen/ammo/wt_ammo_box name = "4.6x30mm ammo box" - desc = "4.6x30mm ammo box for guns like the WT550. Contains 50 shells" + desc = "4.6x30mm ammo box for guns like the WT550. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm) cost = 300 // old - 500 /datum/supply_pack/faction/nanotrasen/ammo/wt_ammo_box_ap name = "4.6x30mm AP ammo box" - desc = "4.6x30mm AP ammo box for guns like the WT550. Contains 50 shells" + desc = "4.6x30mm AP ammo box for guns like the WT550. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/ap) cost = 600 // old - 1000 /datum/supply_pack/faction/nanotrasen/ammo/wt_ammo_box_hp name = "4.6x30mm HP ammo box" - desc = "4.6x30mm HP ammo box for guns like the WT550. Contains 50 shells" + desc = "4.6x30mm HP ammo box for guns like the WT550. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/hp) cost = 375 // old - 700 /datum/supply_pack/faction/nanotrasen/ammo/wt_ammo_box_rubber name = "4.6x30mm Rubber ammo box" - desc = "4.6x30mm Rubber ammo box for guns like the WT550. Contains 50 shells" + desc = "4.6x30mm Rubber ammo box for guns like the WT550. Contains 80 shells" contains = list(/obj/item/storage/box/ammo/c46x30mm/rubber) cost = 300 // old - 500 @@ -70,12 +106,12 @@ MARK: 9x18mm /datum/supply_pack/faction/nanotrasen/ammo/ferropelletboxcrate name = "Ferromagnetic Pellet (FE pellet) Box" - desc = "Contains a 48-round ferromagnetic pellet ammo box for gauss guns." + desc = "Contains a 88-round ferromagnetic pellet ammo box for gauss guns." contains = list(/obj/item/storage/box/ammo/ferropellet) cost = 200 /datum/supply_pack/faction/nanotrasen/ammo/hcpellets name = "High Conductivity Pellet Box" - desc = "Contains a 48-round high conductivity pellet ammo box for gauss guns." + desc = "Contains a 88-round high conductivity pellet ammo box for gauss guns." contains = list(/obj/item/storage/box/ammo/ferropellet/hc) cost = 250 diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm index c072336a697b..a23631c262ee 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/gun.dm @@ -58,7 +58,7 @@ MARK: E-Guns - NT-SL name = "E-Shotgun - SL 'E-SG 500 Second Edition'" desc = "Contains an energy-based shotgun equipped with dual kill/disable modes, ideal for short range. For NT employee use only." cost = 3000 - contains = list(/obj/item/gun/energy/e_gun/e_old/iot) + contains = list(/obj/item/storage/guncase/iot) crate_name = "shotgun crate" /datum/supply_pack/faction/nanotrasen/gun/blaze @@ -116,8 +116,8 @@ MARK: E-Guns - NT-SL crate_type = /obj/structure/closet/crate/secure/plasma /datum/supply_pack/faction/nanotrasen/gun/ion_carbine - name = "Ion-Rifle - SL MK2 Ion carbine" - desc = "An improved model on the ion projector, built to be more compact and ergonomic, while keeping the same max charge. Developed by Nanotrasen-Sharplite" + name = "Ion-Rifle - NT-SL MK2 Ion carbine" + desc = "Contains an ion carbine, designed for disabling, destroying and obliterating any electronic component or enemy. An improved model on the ion projector, built to be more compact and ergonomic, while keeping the same max charge. Developed by Nanotrasen-Sharplite." contains = list(/obj/item/storage/guncase/ion_carbine) cost = 11000 @@ -149,6 +149,14 @@ hp desc = "Contains a Challenger pistol, produced by Nanotrasen along with Vigilitas Interstellar and is chambered in 9x18mm." cost = 750 contains = list(/obj/item/storage/guncase/pistol/commander) + +/datum/supply_pack/faction/nanotrasen/gun/vi/champion + name = "Machinepistol - PHB Champion (9x18mm)" + desc = "Contains a compact 9x18mm burst fire machine pistol by Nanotrasen along with Vigilitas Interstellar. For NT employee use only." + cost = 1500 + contains = list(/obj/item/storage/guncase/saber) // LMAO + crate_name = "Machinepistol crate" + /* MARK: 9x18mm bullet damage = 20 @@ -160,27 +168,41 @@ hp damage = 30 armour_penetration = -30 */ +/datum/supply_pack/faction/nanotrasen/gun/vi/Negotiator + name = "Shotgun - VI AST12 Negotiator (12g)" + desc = "Contains an advanced shotgun with five round dual magazine tubes. For NT employee use only." + cost = 3350 // Бульдог 4к + contains = list(/obj/item/storage/guncase/cycler) + crate_name = "shotgun crate" /datum/supply_pack/faction/nanotrasen/gun/vi/combatshotgun name = "Shotgun - Combat Shotgun (12g)" - desc = "For when the enemy absolutely needs to be replaced with lead. Contains two Aussec-designed combat shotguns." - cost = 3500 - contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat) + desc = "Contains a Aussec-designed combat shotgun. For when the enemy absolutely needs to be replaced with lead. Chambered in 12g." + cost = 3000 // Его никто не покупает + contains = list(/obj/item/gun/ballistic/shotgun/automatic/combat) // У него размеры задаются в папке QOL crate_name = "combat shotguns crate" /datum/supply_pack/faction/nanotrasen/gun/vi/saber name = "SMG - VI Saber (9x18mm)" - desc = "An experimental ballistic weapon produced by Vigilitas Interstellar. Uses 9x18mm rounds" + desc = "Contains an outdated ballistic weapon produced by Vigilitas Interstellar. Chambered in 9x18mm." cost = 2500 contains = list(/obj/item/storage/guncase/saber_old) crate_name = "SMG crate" /datum/supply_pack/faction/nanotrasen/gun/vi/vector - name = "SMG - VI Vector (9x18mm)" - desc = "Contains a Vector PDW produced by Sharplite Defense and chambered in 9x18mm." - cost = 3000 + name = "SMG - Vector (9x18mm)" + desc = "Contains an outdated Vector SMG, previously produced en masse and now stockpilled by various organizations. Chambered in 9x18mm." + cost = 2300 // Вы видели его разброс? + contains = list(/obj/item/storage/guncase/vector_old) + crate_name = "SMG crate" + +/datum/supply_pack/faction/nanotrasen/gun/vi/expedition + name = "SMG - SGL9 Expedition (9x18mm)" + desc = "Contains a Expedition SMG produced by Nanotrasen with cooperation of Vigilitas Interstellar as a definitive upgrade over old Vector SMG. Chambered in 9x18mm." + cost = 2700 // Кобра но чуть хуже. contains = list(/obj/item/storage/guncase/vector) crate_name = "SMG crate" + /* MARK: 9x18mm bullet damage = 20 @@ -193,20 +215,28 @@ hp armour_penetration = -30 */ -/* + + /datum/supply_pack/faction/nanotrasen/gun/vi/podium name = "Pistol - Advantage PH46 Podium (4.6x30mm)" desc = "Contains a compact armor-piercing sidearm, chambered in 4.6x30mm. For NT employee use only." cost = 1250 contains = list(/obj/item/storage/guncase/pistol/podium) -*/ /datum/supply_pack/faction/nanotrasen/gun/vi/wt550 name = "SMG - VI WT-550 (4.6x30mm)" - desc = "A ballistic PDW produced by Vigilitas Interstellar. Quite old, but still is amazing at filling corporation's enemies with lead. Uses 4.6x30mm rounds" - cost = 3500 + desc = "Contains a ballistic PDW produced by Vigilitas Interstellar. Quite old, but still is amazing at filling corporation's enemies with lead. Chambered in 4.6x30mm." + cost = 4000 contains = list(/obj/item/storage/guncase/wt550_old) crate_name = "PDW crate" + +/datum/supply_pack/faction/nanotrasen/gun/vi/resolution + name = "SMG - PD46 Resolution (4.6x30mm)" + desc = "Contains a incredibly compact automatic personal defense weapon, chambered in 4.6x30mm." + cost = 3500 + contains = list(/obj/item/storage/guncase/wt550) + crate_name = "PDW crate" + /* MARK: 4.6x30mm bullet damage = 20 @@ -263,8 +293,8 @@ hp /datum/supply_pack/faction/nanotrasen/gun/exp/al607 name = "P-Marksman - AL607 'Sarissa'" - desc = "Contains a AL607 Laser Sniper. For NT employee use only." - cost = 10000 + desc = "Contains a AL607 Laser Sniper. Comes with 1 upgraded plasma-cell. For NT employee use only." + cost = 5000 // Хуже Хейдеса де факто и де юре. У оффов стоит дешевле чем Хейдес. Но там плазма батарейки. contains = list(/obj/item/storage/guncase/energy/al607) crate_name = "sniper rifle crate" @@ -283,43 +313,6 @@ hp contains = list(/obj/item/storage/guncase/cadejo) crate_name = "beam carbine crate" - -/datum/supply_pack/faction/nanotrasen/gun/exp/cycler - name = "Advantage AST12 Negotiator" - desc = "Contains an advanced shotgun with five round dual magazine tubes. For NT employee use only." - cost = 20000 - contains = list(/obj/item/storage/guncase/cycler) - crate_name = "shotgun crate" - - -/datum/supply_pack/faction/nanotrasen/gun/exp/expedition - name = "SMG - SGL9 Expedition (9x18mm)" - desc = "Contains a Expidition SMG produced by Nanotrasen Advantage. Chambered in 9x18mm." - cost = 25 - contains = list(/obj/item/storage/guncase/vector) - crate_name = "SMG crate" - -/datum/supply_pack/faction/nanotrasen/gun/exp/resolution - name = "PDW - PD46 Resolution (4.6x30mm)" - desc = "Contains a compact automatic personal defense weapon chambered in 4.6x30mm." - cost = 25 - contains = list(/obj/item/storage/guncase/wt550) - crate_name = "PDW crate" - -/datum/supply_pack/faction/nanotrasen/gun/exp/bdm50 - name = "PDW - BDM-50 'Akita' (4.6x30mm)" - desc = "Contains a compact Automatic personal defense weapon chambered in 4.6x30mm, in use by the IRMG." - cost = 25 - contains = list(/obj/item/storage/guncase/bdm50) - crate_name = "PDW crate" - -/datum/supply_pack/faction/nanotrasen/gun/exp/champion - name = "PHB Champion Machinepistol (9x18mm)" - desc = "Contains a compact 9x18mm burst fire machine pistol produced by Nanotrasen advantage. For NT employee use only." - cost = 25 - contains = list(/obj/item/storage/guncase/saber) - crate_name = "Machinepistol crate" - /datum/supply_pack/faction/nanotrasen/gun/exp/energy name = "Variable Energy Carbine - X12 'Volt'" desc = "Contains a versatile energy gun, capable of firing both nonlethal and lethal blasts of light." diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/magazines.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/magazines.dm index 30c610601410..3a52f87a4d86 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/magazines.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/magazines.dm @@ -17,9 +17,15 @@ contains = list(/obj/item/ammo_box/magazine/co9mm/empty) cost = 150 +/datum/supply_pack/faction/nanotrasen/magazine/podium_mag + name = "Podium Magazine Crate" + desc = "Contains a 4.6x30mm magazine for the Podium and Schnauzer pistols, with a capacity of 12 rounds." + contains = list(/obj/item/ammo_box/magazine/m46_30_podium) + cost = 200 + /datum/supply_pack/faction/nanotrasen/magazine/smgm9mm_mag - name = "Vector/Saber - Magazine (9x18mm)" - desc = "Contains a 9x18mm magazine for the Vector and Saber SMGs, with a capacity of 30 rounds." + name = "Vector/Saber/Expedition - Magazine (9x18mm)" + desc = "Contains a 9x18mm magazine for the Vector, Saber and Expedition SMGs, with a capacity of 30 rounds." contains = list(/obj/item/ammo_box/magazine/m9mm_expedition/empty) cost = 250 @@ -35,19 +41,19 @@ /datum/supply_pack/faction/nanotrasen/magazine/guncell name = "E-Cell - Weapon Cell" - desc = "Contains a weapon cell, compatible with laser guns." + desc = "Contains a weapon cell, compatible with laser guns. It has a rating of 10 MJs." contains = list(/obj/item/stock_parts/cell/gun) cost = 500 /datum/supply_pack/faction/nanotrasen/magazine/upgradedguncell name = "E-Cell - Upgraded Weapon Cell" - desc = "Contains an upgraded weapon cell, compatible with laser guns. For NT use only." + desc = "Contains an upgraded weapon cell, compatible with laser guns. It has a rating of 20 MJs. For NT use only." contains = list(/obj/item/stock_parts/cell/gun/upgraded) cost = 1000 /datum/supply_pack/faction/nanotrasen/magazine/powercells_mini name = "E-Mini - NT Energy Weapon Miniature Cell" - desc = "The crate contains a three miniature batteries for energy weapons." + desc = "The crate contains a three miniature batteries for energy weapons. Every battery has a rating of 5 MJs." contains = list(/obj/item/stock_parts/cell/gun/mini/empty, /obj/item/stock_parts/cell/gun/mini/empty, /obj/item/stock_parts/cell/gun/mini/empty) @@ -55,7 +61,7 @@ /datum/supply_pack/faction/nanotrasen/magazine/powercells_basic name = "E-Cell - NT Energy Weapon Basic Cell Supply Pack" - desc = "The crate contains a three basic batteries for energy weapons." + desc = "The crate contains a three basic batteries for energy weapons. Every battery has a rating of 10 MJs." contains = list(/obj/item/stock_parts/cell/gun/empty, /obj/item/stock_parts/cell/gun/empty, /obj/item/stock_parts/cell/gun/empty) @@ -75,38 +81,24 @@ // MARK: Sharplite Ammo -/* -/datum/supply_pack/faction/nanotrasen/magazine/wt550_mag - name = "Resolution Auto Rifle Magazine" - desc = "Contains a 20-round magazine for the Resolution Auto Rifle. Each magazine is designed to facilitate rapid tactical reloads." - cost = 25 - contains = list(/obj/item/ammo_box/magazine/wt550m9/empty) - -/datum/supply_pack/faction/nanotrasen/magazine/expedition_mag - name = "SGL9 Expedition Submachinegun Magazine" - desc = "Contains a 30-round magazine for the Expedition Submachinegun, chambered in 9mm." - cost = 25 - contains = list(/obj/item/ammo_box/magazine/m9mm_expedition) -*/ - -/* -/datum/supply_pack/faction/nanotrasen/magazine/guncell - name = "E-Cell - Eoehoma-style Power Cell" - desc = "Contains a weapon power cell built to be compatible with Eoehoma weapons, and systems that still use Eoehoma's style of cell." - contains = list(/obj/item/stock_parts/cell/gun/empty) - cost = 500 -*/ +// Возможно при реворке плазмы мы лишимся бонуса к энергии. Кто знает. +/datum/supply_pack/faction/nanotrasen/magazine/nt_guncell_mini + name = "P-cell Sharplite Mini Power Cell" + desc = "Contains a proprietary weapon cell, compatible with the Ohm self-defence pistol. It has a rating of 7 MJs." + contains = list(/obj/item/stock_parts/cell/gun/sharplite/mini) + cost = 300 + stable_price = TRUE /datum/supply_pack/faction/nanotrasen/magazine/nt_guncell name = "P-Cell - Sharplite Weapon Cell" - desc = "Contains a proprietary weapon cell, compatible with most Sharplite energy weapons." + desc = "Contains a proprietary weapon cell, compatible with most Sharplite energy weapons. It has a rating of 15 MJs." contains = list(/obj/item/stock_parts/cell/gun/sharplite/empty) - cost = 1750 + cost = 750 // 5 MJ -> 250 кредитов stable_price = TRUE /datum/supply_pack/faction/nanotrasen/magazine/nt_gun_plus name = "P-Cell - Sharplite Upgraded Weapon Cell" - desc = "Contains an upgraded weapon cell, compatible with most Nanotrasen models. For NT use only." + desc = "Contains an upgraded weapon cell, compatible with most Nanotrasen models. It has a rating of 30 MJs. For NT use only." contains = list(/obj/item/stock_parts/cell/gun/sharplite/plus/empty) - cost = 3500 + cost = 2250 // 5 MJ -> 250 кредитов + надбавка за "имбовость". В целом, хочется поставить просто 2000 stable_price = TRUE diff --git a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/sec_supply.dm b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/sec_supply.dm index 8bec014945d1..21dc68766f05 100644 --- a/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/sec_supply.dm +++ b/mod_celadon/outpost_console/code/supply_pack/nanotrasen/security/sec_supply.dm @@ -10,6 +10,13 @@ crate_name = "dualsaber crate" crate_type = /obj/structure/closet/crate/secure/weapon +/datum/supply_pack/faction/nanotrasen/sec_supply/suns_sabre + name = "Officer's Sabre" + desc = "Contains a single sabre, intended for resolving discipline problems and cutting through armor perfectly." + cost = 750 + contains = list(/obj/item/storage/belt/sabre) + crate_name = "Officer's sabre crate" + /datum/supply_pack/faction/nanotrasen/sec_supply/radio name = "Radio Transceiver Crate" desc = "Contains one tactical communications device." diff --git a/mod_celadon/outpost_console/code/supply_pack/solfed/security/ammo.dm b/mod_celadon/outpost_console/code/supply_pack/solfed/security/ammo.dm index b27b3cf2dbfb..cb01914cf511 100644 --- a/mod_celadon/outpost_console/code/supply_pack/solfed/security/ammo.dm +++ b/mod_celadon/outpost_console/code/supply_pack/solfed/security/ammo.dm @@ -89,7 +89,7 @@ name = "5.56x45mm Armour Piercing Ammo Box" desc = "Contains one 60-round 5.56x45mm Armour Piercing ammo." contains = list(/obj/item/storage/box/ammo/a556_box/m903) - cost = 1300 + cost = 1300 // у 5.56x45 на 40 процентов выше шанс вунда чем у обычного 5.56 бтв. Фиксануть бы. Я не меняю ибо я ненавижу г36. /* MARK: 5.56 HITP Caseless @@ -127,19 +127,19 @@ name = "5.56x42mm Ammo Box" desc = "Contains one 60-round 5.56x42mm box." contains = list(/obj/item/storage/box/ammo/a556_42) - cost = 700 + cost = 300 /datum/supply_pack/faction/solfed/ammo/a556_ap name = "5.56x42mm Armour Piercing Ammo Box" desc = "Contains one 60-round 5.56x42mm Armour Piercing box." contains = list(/obj/item/storage/box/ammo/a556_42/ap) - cost = 1000 + cost = 500 /datum/supply_pack/faction/solfed/ammo/a556_hp name = "5.56x42mm Hollow Point Ammo Box" desc = "Contains one 60-round 5.56x42mm Hollow Point box." contains = list(/obj/item/storage/box/ammo/a556_42/hp) - cost = 1000 + cost = 375 /* MARK: 6.5x57mm @@ -149,13 +149,13 @@ name = "6.5x57mm Ammo Box" desc = "Contains a twenty-round 6.5x57mm ammo box for various sniper rifles such as the CM-F90 and the Boomslang series." contains = list(/obj/item/storage/box/ammo/a65clip) - cost = 500 + cost = 200 //4 ammo efficiency at 40 damage /datum/supply_pack/faction/solfed/ammo/ammoa65clip_trackers name = "6.5x57mm Tracker Shell" desc = "Contains a 10-round 6.5x57mm tracker box for various sniper rifles such as the CM-F90 and the Boomslang series." contains = list(/obj/item/storage/box/ammo/a65clip/trac) - cost = 600 + cost = 250 /* MARK: 7.62x40mm @@ -171,19 +171,19 @@ name = "7.62x40mm AP Ammo Box" desc = "Contains one 60-round 7.62x40mm Armour Piercing box for the SKM rifles." contains = list(/obj/item/storage/box/ammo/a762_40/ap) - cost = 600 + cost = 450 /datum/supply_pack/faction/solfed/ammo/ammoa762_hp name = "7.62x40mm HP Ammo Box" desc = "Contains one 60-round 7.62x40mm Hollow Point box for the SKM rifles." contains = list(/obj/item/storage/box/ammo/a762_40/hp) - cost = 600 + cost = 450 /datum/supply_pack/faction/solfed/ammo/a762_40_rubber name = "7.62x40mm Rubber Ammo Box" desc = "A box of standard 7.62x40mm rubber ammo." contains = list(/obj/item/storage/box/ammo/a762_40/rubber) - cost = 800 + cost = 300 /* MARK: .308 @@ -193,25 +193,19 @@ name = ".308 Ammo Box" desc = "Contains a 40-round .308 box." contains = list(/obj/item/storage/box/ammo/a308) - cost = 650 + cost = 240 // until it gets 35 damage or smth like that like in https://github.com/shiptest-ss13/Shiptest/pull/4380 -// /datum/supply_pack/faction/solfed/ammo/a308_rubber_box -// name = ".308 Rubber Ammo Box" -// desc = "Contains a 40-round .308 box loaded with less-than-lethal rubber rounds." -// contains = list(/obj/item/storage/box/ammo/a308/a308_rub) -// cost = 300 - -/datum/supply_pack/faction/solfed/ammo/a308_sp_box - name = ".308 SP Ammo Box" - desc = "Contains a 40-round .308 box loaded with soft point ammo, great against unarmored targets." +/datum/supply_pack/faction/solfed/ammo/a308_hp_box + name = ".308 HP Ammo Box" + desc = "Contains a 40-round .308 box loaded with hollow-point ammo, great against unarmored targets." contains = list(/obj/item/storage/box/ammo/a308/hp) - cost = 800 + cost = 350 -// /datum/supply_pack/faction/solfed/ammo/a308_ap_box -// name = ".308 AP Ammo Box" -// desc = "Contains a 40-round .308 box loaded with armor piercing ammo." -// contains = list(/obj/item/storage/box/ammo/a308/ap) -// cost = 1300 +/datum/supply_pack/faction/solfed/ammo/a308_ap_box + name = ".308 AP Ammo Box" + desc = "Contains a 40-round .308 box loaded with armor piercing ammo." + contains = list(/obj/item/storage/box/ammo/a308/ap) + cost = 350 /* MARK: Ferroslugs @@ -225,7 +219,7 @@ /datum/supply_pack/faction/solfed/ammo/hcslugs name = "High Conductivity Slug (FE slug) Box" - desc = "Contains a 48-round high conductivity slug for gauss guns such as the Model-H." + desc = "Contains a 48-round high conductivity slug for gauss guns such as the Model-H. Used as an armor-piercing ammo." contains = list(/obj/item/storage/box/ammo/ferroslug/hc) cost = 225 @@ -235,15 +229,15 @@ /datum/supply_pack/faction/solfed/ammo/ferropelletboxcrate name = "Ferromagnetic Pellet (FE pellet) Box" - desc = "Contains a 48-round ferromagnetic pellet ammo box for gauss guns such as the Claris." + desc = "Contains a 88-round ferromagnetic pellet ammo box for gauss guns such as the Claris." contains = list(/obj/item/storage/box/ammo/ferropellet) - cost = 200 //5.7 ammo efficiency at 25 damage + cost = 250 //5.7 ammo efficiency at 25 damage /datum/supply_pack/faction/solfed/ammo/hcpellets name = "High Conductivity Pellet (FE pellet) Box" - desc = "Contains a 48-round high conductivity pellet ammo box for gauss guns such as the Claris." + desc = "Contains a 88-round high conductivity pellet ammo box for gauss guns such as the Claris. Used as an armor-piercing ammo." contains = list(/obj/item/storage/box/ammo/ferropellet/hc) - cost = 250 + cost = 310 /* MARK: Ferro Lances @@ -251,15 +245,15 @@ /datum/supply_pack/faction/solfed/ammo/ferrolanceboxcrate name = "Ferromagnetic Lance (FE lance) Box" - desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle." + desc = "Contains a 64-round box for high-powered gauss guns such as the GAR assault rifle." contains = list(/obj/item/storage/box/ammo/ferrolance) cost = 300 //5 ammo efficiency at 30 damage /datum/supply_pack/faction/solfed/ammo/ferrolanceboxcrate_hc name = "High Conductivity Lance (FE lance) Box" - desc = "Contains a 48-round box for high-powered gauss guns such as the GAR assault rifle." + desc = "Contains a 64-round box for high-powered gauss guns such as the GAR assault rifle. Used as an armor-piercing ammo." contains = list(/obj/item/storage/box/ammo/ferrolance/hc) - cost = 350 + cost = 380 /* MARK: 8x58mm @@ -270,10 +264,3 @@ desc = "Contains a 20-round 8x58 ammo box for Solarian-manufactured sniper rifles, such as the SSG-69." contains = list(/obj/item/storage/box/ammo/a858) cost = 200 - -/datum/supply_pack/faction/solfed/ammo/a858_box - name = "8x58mm Caseless Ammo box" - desc = "Contains a 8x58mm Caseless Ammo box for the standard-issue SSG-669C, containing 40-rounds." - contains = list(/obj/item/storage/box/ammo/a858) - cost = 400 - diff --git a/mod_celadon/outpost_console/code/supply_pack/solfed/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/solfed/security/gun.dm index 3be5c0ce89a0..24eb4512c929 100644 --- a/mod_celadon/outpost_console/code/supply_pack/solfed/security/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/solfed/security/gun.dm @@ -95,7 +95,7 @@ hp /datum/supply_pack/faction/solfed/gun/ballistic/cm5 name = "SMG - CM-5 (9x18mm)" desc = "Contains a CM-5 automatic SMG, produced proudly within Lanchester City. Confederated Minutemen issue only." - cost = 3500 + cost = 2700 contains = list(/obj/item/storage/guncase/cm5) crate_name = "SMG crate" /* MARK: 9x18mm diff --git a/mod_celadon/outpost_console/code/supply_pack/solfed/security/sec_supply.dm b/mod_celadon/outpost_console/code/supply_pack/solfed/security/sec_supply.dm index 7212ccad192d..785284b9636c 100644 --- a/mod_celadon/outpost_console/code/supply_pack/solfed/security/sec_supply.dm +++ b/mod_celadon/outpost_console/code/supply_pack/solfed/security/sec_supply.dm @@ -2,6 +2,13 @@ category = "Security - Supplies" crate_type = /obj/structure/closet/crate/secure/gear +/datum/supply_pack/faction/solfed/solarian_sabre + name = "Solarian Ceremonial Sabre" + desc = "Contains one ceremonial Solarian sabre. To keep tradition alive. Still quite sharp." + cost = 750 + contains = list(/obj/item/storage/belt/sabre/solgov) + crate_name = "solarian ceremonial sabre crate" + /datum/supply_pack/faction/solfed/sec_supply/halberd name = "Energy Halberd" desc = "Contains one Solarian Energy Halberd, for issue to your local Sonnensoldner battalion." diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/armor.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/armor.dm index e4ed66c963eb..219393672c35 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/armor.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/armor.dm @@ -22,7 +22,7 @@ /datum/supply_pack/faction/syndicate/armor/ngr_armor name = "NGR Armor" desc = "One fairly durable, well manufactured type-1 armor vest and associated helmet, painted in the proud reds of the New Gorlex Republic." - cost = 1000 + cost = 500 contains = list(/obj/item/clothing/suit/armor/ngr, /obj/item/clothing/head/helmet/ngr) crate_name = "armor crate" diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/spacesuit.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/spacesuit.dm index 99ed88e1d835..757f86e9c42b 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/spacesuit.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/equipment/spacesuit.dm @@ -58,3 +58,11 @@ contains = list(/obj/item/clothing/suit/space/hardsuit/syndi/ngr) crate_name = "beige-red hardsuit crate" crate_type = /obj/structure/closet/crate/secure/gear + +/datum/supply_pack/faction/syndicate/spacesuit/bomb + name = "NGR EOD Hardsuit Crate" + desc = "Contains one EOD hardsuit, to provide safety with explosives." + cost = 2000 + contains = list(/obj/item/clothing/suit/space/hardsuit/bomb/ngr) + crate_name = "EOD hardsuit crate" + crate_type = /obj/structure/closet/crate/secure/science diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/medical.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/medical.dm index c64c87dfbe9f..4ea569fede20 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/medical.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/medical.dm @@ -1,60 +1,15 @@ +/* /datum/supply_pack/faction/syndicate/medical category = "Medical - Medical" -/datum/supply_pack/faction/syndicate/medical/painkillers - name = "Painkiller Supply" - desc = "Contains a supply of painkillers. Great for stopping headaches, feeling broken bones, and screaming people!" - cost = 1000 - contains = list( - /obj/item/reagent_containers/chem_pack/dimorlin, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/morphine, - /obj/item/reagent_containers/glass/bottle/tramal, - /obj/item/reagent_containers/glass/bottle/tramal,) - -/datum/supply_pack/faction/syndicate/medical/surgery - name = "Surgical Supplies" - desc = "Do you want to perform surgery, but don't have one of those fancy shmancy degrees? Just get started with this crate containing a medical case, Sterilizine spray and collapsible roller bed." - cost = 3000 - contains = list(/obj/item/storage/case/surgery, - /obj/item/reagent_containers/medigel/sterilizine, - /obj/item/roller) - crate_name = "surgical supplies crate" - -/datum/supply_pack/faction/syndicate/medical/anesthetic - name = "Anesthetics" - desc = "Contains a standard anesthetics tank, for standard surgical procedures." - cost = 500 - contains = list(/obj/item/clothing/mask/breath/medical, - /obj/item/tank/internals/anesthetic) - crate_name = "anesthetics crate" - /* Bundles and supplies */ -/datum/supply_pack/faction/syndicate/medical/bloodpacks - name = "Blood Pack Variety" - desc = "Contains several different blood packs for reintroducing blood to patients." - cost = 1000 - contains = list(/obj/item/reagent_containers/blood, - /obj/item/reagent_containers/blood, - /obj/item/reagent_containers/blood/APlus, - /obj/item/reagent_containers/blood/AMinus, - /obj/item/reagent_containers/blood/BPlus, - /obj/item/reagent_containers/blood/BMinus, - /obj/item/reagent_containers/blood/OPlus, - /obj/item/reagent_containers/blood/OMinus, - /obj/item/reagent_containers/blood/lizard, - /obj/item/reagent_containers/blood/elzuose, - /obj/item/reagent_containers/blood/synthetic) - crate_name = "blood freezer" - crate_type = /obj/structure/closet/crate/freezer - /datum/supply_pack/faction/syndicate/medical/surplus name = "Medical Surplus" desc = "Contains an assortment of medical supplies haphazardly pulled from storage. German doctor not included." - cost = 3000 + cost = 2000 contains = list(/obj/item/reagent_containers/glass/bottle/charcoal, /obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/reagent_containers/glass/bottle/morphine, @@ -203,3 +158,4 @@ /obj/item/reagent_containers/glass/bottle/vial/small/preloaded/chitosan ) crate_name = "chitosan vial crate" +*/ diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/gun.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/gun.dm index 70be8c4bd95f..8e62a6925142 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/gun.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/gun.dm @@ -108,7 +108,7 @@ hp /datum/supply_pack/faction/syndicate/gun/sidewinder name = "SMG - Sidewinder (5.7x39mm)" desc = "Contains a Sidewinder PDW produced by Scarborough Arms and chambered in 5.7x39mm for armor-piercing capabilities." - cost = 3000 + cost = 3750 contains = list(/obj/item/storage/guncase/sidewinder) crate_name = "SMG crate" /* MARK: 5.7x39mm @@ -166,13 +166,14 @@ bullet damage = 40 armour_penetration = 50 */ - +/* /datum/supply_pack/faction/syndicate/gun/taipan name = "Marksman - AMR-83 \"Taipan\" (.50 BMG)" desc = "Contains a monstrous semi-automatic anti-materiel rifle, surprisingly short for its class. Designed to destroy mechs, light vehicles, and equipment, but more than capable of obliterating regular personnel. Chambered in .50 BMG." cost = 18000 contains = list(/obj/item/storage/guncase/taipan) crate_name = "marksman rifle crate" +*/ /* MARK: .50 BMG bullet damage = 70 diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/magazines.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/magazines.dm index bb4f153f65c8..fc68710d5e8a 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/magazines.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/magazines.dm @@ -21,7 +21,7 @@ name = "Asp - Magazine (5.7x39mm)" desc = "Contains a 5.7x39mm magazine for the Asp pistol, with a capacity of 12 rounds." contains = list(/obj/item/ammo_box/magazine/m57_39_asp/empty) - cost = 250 + cost = 200 /datum/supply_pack/faction/syndicate/magazine/m10mm_mag name = "Ringneck - Magazine (10x22mm)" @@ -59,7 +59,7 @@ name = "SBR-80 DMR - Short Magazine (5.56x42mm)" desc = "Contains a 5.56x42mm made specially for the SBR-80 Designated Marksman Rifle, with a capacity of 20 rounds." contains = list(/obj/item/ammo_box/magazine/m556_42_hydra/small/empty) - cost = 400 + cost = 300 /datum/supply_pack/faction/syndicate/magazine/hydra_mag name = "SMR-80 - Rifle Magazine (5.56x42mm)" diff --git a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/sec_supply.dm b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/sec_supply.dm index 7dac6da12e18..83fdefbd8a3a 100644 --- a/mod_celadon/outpost_console/code/supply_pack/syndicate/security/sec_supply.dm +++ b/mod_celadon/outpost_console/code/supply_pack/syndicate/security/sec_supply.dm @@ -2,6 +2,41 @@ category = "Security - Supplies" crate_type = /obj/structure/closet/crate/secure/gear + +// MARK: MELEE + +/datum/supply_pack/faction/syndicate/sec_supply/sledgehammer + name = "Sledgehammer" + desc = "Contains a freshly fabricated Breaching Sledgehammer, capable of wrecking hull and flesh with ease." + cost = 1500 + crate_name = "sledgehammer crate" + +/datum/supply_pack/faction/syndicate/sec_supply/hardliner_flyssa + name = "Energy Flyssa" + desc = "Contains a lathed, verified, and readied Energy Flyssa. This is one of the assets you need to be careful to not lose." + cost = 1500 + contains = list(/obj/item/melee/energy/flyssa) + crate_name = "energy flyssa crate" + +/datum/supply_pack/faction/syndicate/sec_supply/suns_sabre + name = "SUNS Dueling Sabre" + desc = "Contains a single dueling sabre, intended for resolving conflicts among students." + cost = 750 + contains = list(/obj/item/storage/belt/sabre/suns) + crate_name = "student's sabre crate" + +/datum/supply_pack/faction/syndicate/sec_supply/suns_cmo_sabre + name = "SUNS Cane Sabre" + desc = "Contains a blade sheathed in a cane. " + cost = 800 + crate_name = "student's sabre crate" + +/datum/supply_pack/faction/syndicate/sec_supply/suns_telescopic_sabre + name = "SUNS Telescopic Sabre" + desc = "Contains a finely crafted telescopic sabre, ideal for those with discerning tastes" + cost = 600 + crate_name = "telescopic sabre crate" + /datum/supply_pack/faction/syndicate/sec_supply/saber name = "Double-Bladed Energy Sword" desc = "Contains one double-bladed energy sword, for when simply killing someone isn't enough." diff --git a/mod_celadon/structures/code/obj/vending.dm b/mod_celadon/structures/code/obj/vending.dm index fe1e8b73d3d0..c823f4d63b87 100644 --- a/mod_celadon/structures/code/obj/vending.dm +++ b/mod_celadon/structures/code/obj/vending.dm @@ -16,7 +16,10 @@ /obj/item/clothing/neck/cloak/nanotrasen/cape/captain = 2, /obj/item/clothing/head/nanotrasen/surgical/blue = 2, /obj/item/clothing/head/caphat/nt = 2, - /obj/item/clothing/head/hopcap/nt = 2) + /obj/item/clothing/head/hopcap/nt = 2, + /obj/item/clothing/head/nanotrasen/beret/security/command = 2, + /obj/item/clothing/suit/armor/nanotrasen/sec_director = 2, + ) premium = list( /obj/item/clothing/under/rank/security/warden/nt/skirt = 2, /obj/item/clothing/under/rank/command/nt = 2, @@ -30,7 +33,8 @@ /obj/item/clothing/head/beret/dominia/medical = 2, /obj/item/clothing/head/beret/dominia/priest = 2, /obj/item/clothing/head/beret/dominia/priest/red = 2, - /obj/item/clothing/head/nanotrasen/officer/fedora = 2) + /obj/item/clothing/head/nanotrasen/officer/fedora = 2, + ) refill_canister = /obj/item/vending_refill/clothing light_mask = "wardrobe-light-mask" light_color = LIGHT_COLOR_LIGHT_CYAN diff --git a/mod_celadon/weapons/code/guncases.dm b/mod_celadon/weapons/code/guncases.dm index 4b1c7fa81123..ca88d652f05b 100644 --- a/mod_celadon/weapons/code/guncases.dm +++ b/mod_celadon/weapons/code/guncases.dm @@ -28,6 +28,9 @@ MARK: Independent guncases gun_type = /obj/item/gun/ballistic/automatic/smg/skm_carbine mag_type = /obj/item/ammo_box/magazine/skm_46_30 +/obj/item/storage/guncase/f3 + gun_type = /obj/item/gun/ballistic/automatic/marksman/f4/indie + mag_type = /obj/item/ammo_box/magazine/f4_308 /* MARK: Solfed guncases */ diff --git a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm index dcc2434a1626..9527e4f95ed8 100644 --- a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm +++ b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/ammo_boxes.dm @@ -105,6 +105,23 @@ MARK: 5.56x45 max_ammo = 10 +// +// MARK: Two-bore +// +/obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/twobore + ammo_type = /obj/item/ammo_casing/shotgun/buckshot/twobore + max_ammo = 8 + +/obj/item/storage/box/ammo/twobore + name = "box of two-bore shells" + desc = "A box of a incredibly massive shotgun buckshot shells, incredibly devastating at close range." + icon_state = "12gbox-buckshot" + +/obj/item/storage/box/ammo/twobore/PopulateContents() + var/static/items_inside = list( + /obj/item/ammo_box/magazine/ammo_stack/prefilled/shotgun/twobore = 4) + generate_items_inside(items_inside,src) + // // MARK: 410x76 // diff --git a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/rifle.dm b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/rifle.dm index dd1d7d79fa87..c1f6fea9a15b 100644 --- a/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/rifle.dm +++ b/mod_celadon/weapons/code/modules/projectiles/boxes_magazines/external/rifle.dm @@ -150,3 +150,16 @@ caliber = "7.62x54R" w_class = WEIGHT_CLASS_NORMAL multiple_sprites = AMMO_BOX_FULL_EMPTY + +// MARK: Woodsman + +// возвращает десятник вудсману +/obj/item/ammo_box/magazine/m23/extended + name = "Model 23 Extended Magazine (8x50mmR)" + desc = "A 10-round magazine for the Model 23 \"Woodsman\". These rounds do high damage, with excellent armor penetration." + icon_state = "woodsman_extended-1" + base_icon_state = "woodsman_extended" + max_ammo = 10 + +/obj/item/ammo_box/magazine/m23/extended/empty + start_empty = TRUE