From 13622dec6543fa1b0b99f0d1e3959451e3985eb3 Mon Sep 17 00:00:00 2001 From: MalorMorfin <95427566+MalorMorfin@users.noreply.github.com> Date: Fri, 13 Dec 2024 03:33:14 +1000 Subject: [PATCH] Change FK88 ammo cost in factory and add granade launcher ammo (#786) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * cost change and grande launcher can crafted * review fix 1 * выпел говна --- code/modules/reqs/supplypacks/vehicles.dm | 6 ++++++ code/modules/reqtorio/assembly_crafts.dm | 23 ++++++++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/code/modules/reqs/supplypacks/vehicles.dm b/code/modules/reqs/supplypacks/vehicles.dm index fdd194a6908..9fa5f8776af 100644 --- a/code/modules/reqs/supplypacks/vehicles.dm +++ b/code/modules/reqs/supplypacks/vehicles.dm @@ -31,6 +31,12 @@ cost = 10 containertype = /obj/structure/closet/crate/ammo +/datum/supply_packs/vehicles/tank_glauncher + name = "Tank grenade laucnher magazine" + contains = list(/obj/item/ammo_magazine/tank/tank_glauncher) + cost = 10 + containertype = /obj/structure/closet/crate/ammo + /datum/supply_packs/vehicles/motorbike name = "All-Terrain Motorbike" cost = 400 diff --git a/code/modules/reqtorio/assembly_crafts.dm b/code/modules/reqtorio/assembly_crafts.dm index 3ce29de44dc..dcc19278db3 100644 --- a/code/modules/reqtorio/assembly_crafts.dm +++ b/code/modules/reqtorio/assembly_crafts.dm @@ -308,25 +308,30 @@ WEAPONS /datum/assembly_craft/weapons/ltb_shells name = "LTB tank shell" - input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 5) + input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 2) output = list(/obj/item/ammo_magazine/tank/ltb_cannon = 1) /datum/assembly_craft/weapons/ltb_cannon_apfds name = "LTB tank APFDS shell" - input = list(/obj/item/stack/sheet/jeweler_steel = 2, /obj/item/stack/gun_powder = 3) + input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 2) output = list(/obj/item/ammo_magazine/tank/ltb_cannon/apfds = 1) /datum/assembly_craft/weapons/ltb_cannon_TOW name = "TOW Launcher Magazine" - input = list(/obj/item/stack/sheet/jeweler_steel = 3, /obj/item/stack/gun_powder = 6) + input = list(/obj/item/stack/sheet/jeweler_steel = 2, /obj/item/stack/gun_powder = 1) output = list(/obj/item/ammo_magazine/tank/towlauncher = 1) +/datum/assembly_craft/weapons/gl_explosive_tank_ammo + name = "Tank grenade launcher magazine" + input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 1) + output = list(/obj/item/ammo_magazine/tank/tank_glauncher = 1) + /datum/assembly_craft/weapons/heavy_isg_he - name = "A 15cm HE shell for the FK-88 mounted flak gun." - input = list(/obj/item/stack/sheet/jeweler_steel = 25, /obj/item/stack/gun_powder = 30) - output = list(/obj/item/ammo_magazine/heavy_isg/he = 1) + name = "A 155mm HE shell for the FK-88 mounted flak gun." + input = list(/obj/item/stack/sheet/jeweler_steel = 5, /obj/item/stack/gun_powder = 6) // 35 + 48 points + output = list(/obj/item/ammo_magazine/heavy_isg/he = 1) // 83 points +- /datum/assembly_craft/weapons/heavy_isg_sabot - name = "A 15cm APFDS shell for the FK-88 mounted flak gun" - input = list(/obj/item/stack/sheet/jeweler_steel = 30, /obj/item/stack/gun_powder = 25) - output = list(/obj/item/ammo_magazine/heavy_isg/sabot = 1) + name = "A 155mm APFDS shell for the FK-88 mounted flak gun" + input = list(/obj/item/stack/sheet/jeweler_steel = 5, /obj/item/stack/gun_powder = 7) // 35 + 56 points + output = list(/obj/item/ammo_magazine/heavy_isg/sabot = 1) // 91 points +-