From 3c147f7438b936c1775249e7d9ba0345a3517915 Mon Sep 17 00:00:00 2001 From: istrelok2107 Date: Mon, 2 Dec 2024 13:34:40 +0300 Subject: [PATCH] modified: code/modules/reqtorio/assembly_crafts.dm modified: code/modules/vehicles/armored/ammo_magazine.dm --- code/modules/reqtorio/assembly_crafts.dm | 25 +++++++++++++++++++ .../modules/vehicles/armored/ammo_magazine.dm | 20 +++++++-------- 2 files changed, 35 insertions(+), 10 deletions(-) diff --git a/code/modules/reqtorio/assembly_crafts.dm b/code/modules/reqtorio/assembly_crafts.dm index f57c6e362c8..9f767b87a05 100644 --- a/code/modules/reqtorio/assembly_crafts.dm +++ b/code/modules/reqtorio/assembly_crafts.dm @@ -305,3 +305,28 @@ WEAPONS name = "MLRS High Explosive rocket" input = list(/obj/item/stack/sheet/plasteel = 3, /obj/item/stack/gun_powder = 3) // 24 + 24 points output = list(/obj/item/storage/box/mlrs_rockets = 1) // 33 points from old factory + +/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) + 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) + output = list(/obj/item/ammo_magazine/tank/ltb_cannon/apfds = 1) + +/datum/assembly_craft/weapons/ltb_cannon_TOW + name = "LTB TOW magazine" + input = list(/obj/item/stack/sheet/jeweler_steel = 3, /obj/item/stack/gun_powder = 6) + output = list(/obj/item/ammo_magazine/tank/towlauncher = 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) + +/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) diff --git a/code/modules/vehicles/armored/ammo_magazine.dm b/code/modules/vehicles/armored/ammo_magazine.dm index 6968e6c6be2..dd963466585 100644 --- a/code/modules/vehicles/armored/ammo_magazine.dm +++ b/code/modules/vehicles/armored/ammo_magazine.dm @@ -22,6 +22,16 @@ icon_state = "ltb_apfds" default_ammo = /datum/ammo/bullet/tank_apfds +/obj/item/ammo_magazine/tank/towlauncher + name = "TOW Launcher Magazine" + desc = "A primary armament rocket magazine" + caliber = CALIBER_68MM + icon_state = "quad_rocket" + icon = 'icons/obj/items/ammo/rocket.dmi' + w_class = WEIGHT_CLASS_GIGANTIC + default_ammo = /datum/ammo/rocket/ap //Fun fact, AP rockets seem to be a straight downgrade from normal rockets. Maybe I'm missing something... + max_rounds = 5 + /obj/item/ammo_magazine/tank/ltaap_chaingun name = "\improper LTA-AP chaingun Magazine" desc = "A primary armament chaingun magazine." @@ -42,16 +52,6 @@ default_ammo = /datum/ammo/flamethrower/tank_flamer max_rounds = 120 -/obj/item/ammo_magazine/tank/towlauncher - name = "TOW Launcher Magazine" - desc = "A secondary armament rocket magazine" - caliber = CALIBER_68MM - icon_state = "quad_rocket" - icon = 'icons/obj/items/ammo/rocket.dmi' - w_class = WEIGHT_CLASS_GIGANTIC - default_ammo = /datum/ammo/rocket/ap //Fun fact, AP rockets seem to be a straight downgrade from normal rockets. Maybe I'm missing something... - max_rounds = 5 - /obj/item/ammo_magazine/tank/secondary_cupola name = "M56 Cupola Magazine" desc = "A secondary armament MG magazine"