From c51ea5380e32bbc840a096e90053f9ee593d4e2c Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Sun, 8 Dec 2024 17:26:15 +1000 Subject: [PATCH 1/3] cost change and grande launcher can crafted --- code/modules/reqs/supplypacks/vehicles.dm | 12 ++++++++++ code/modules/reqtorio/assembly_crafts.dm | 28 +++++++++++++++-------- 2 files changed, 31 insertions(+), 9 deletions(-) diff --git a/code/modules/reqs/supplypacks/vehicles.dm b/code/modules/reqs/supplypacks/vehicles.dm index fdd194a6908..cba8fe4f129 100644 --- a/code/modules/reqs/supplypacks/vehicles.dm +++ b/code/modules/reqs/supplypacks/vehicles.dm @@ -31,6 +31,18 @@ cost = 10 containertype = /obj/structure/closet/crate/ammo +/datum/supply_packs/vehicles/tank_glauncher + name = "Tank granade laucnher magazine" + contains = list(/obj/item/ammo_magazine/tank/tank_glauncher) + cost = 10 + containertype = /obj/structure/closet/crate/ammo + +/datum/supply_packs/vehicles/tank_slauncher + name = "Tank granade laucnher smoke magazine" + contains = list(/obj/item/ammo_magazine/tank/tank_slauncher) + 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..7659d5b7766 100644 --- a/code/modules/reqtorio/assembly_crafts.dm +++ b/code/modules/reqtorio/assembly_crafts.dm @@ -308,25 +308,35 @@ 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 grande 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/gl_smoke_tank_ammo + name = "Tank grande launcher smoke magazine" + input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 1) + output = list(/obj/item/ammo_magazine/tank/tank_slauncher = 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 +- From 6f855c62dc8f31b477a5546b299eb575a867a258 Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Mon, 9 Dec 2024 01:58:24 +1000 Subject: [PATCH 2/3] review fix 1 --- code/modules/reqs/supplypacks/vehicles.dm | 4 ++-- code/modules/reqtorio/assembly_crafts.dm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/reqs/supplypacks/vehicles.dm b/code/modules/reqs/supplypacks/vehicles.dm index cba8fe4f129..dc0043a37ce 100644 --- a/code/modules/reqs/supplypacks/vehicles.dm +++ b/code/modules/reqs/supplypacks/vehicles.dm @@ -32,13 +32,13 @@ containertype = /obj/structure/closet/crate/ammo /datum/supply_packs/vehicles/tank_glauncher - name = "Tank granade laucnher magazine" + 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/tank_slauncher - name = "Tank granade laucnher smoke magazine" + name = "Tank grenade laucnher smoke magazine" contains = list(/obj/item/ammo_magazine/tank/tank_slauncher) cost = 10 containertype = /obj/structure/closet/crate/ammo diff --git a/code/modules/reqtorio/assembly_crafts.dm b/code/modules/reqtorio/assembly_crafts.dm index 7659d5b7766..9cf82494266 100644 --- a/code/modules/reqtorio/assembly_crafts.dm +++ b/code/modules/reqtorio/assembly_crafts.dm @@ -322,12 +322,12 @@ WEAPONS output = list(/obj/item/ammo_magazine/tank/towlauncher = 1) /datum/assembly_craft/weapons/gl_explosive_tank_ammo - name = "Tank grande launcher magazine" + 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/gl_smoke_tank_ammo - name = "Tank grande launcher smoke magazine" + name = "Tank grenade launcher smoke magazine" input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 1) output = list(/obj/item/ammo_magazine/tank/tank_slauncher = 1) From 404ae19f7c4e4e4b1cc253f7e5fde0c3eb5cb6fd Mon Sep 17 00:00:00 2001 From: MalorMorfin Date: Fri, 13 Dec 2024 03:23:48 +1000 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B2=D1=8B=D0=BF=D0=B5=D0=BB=20=D0=B3?= =?UTF-8?q?=D0=BE=D0=B2=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/modules/reqs/supplypacks/vehicles.dm | 6 ------ code/modules/reqtorio/assembly_crafts.dm | 5 ----- 2 files changed, 11 deletions(-) diff --git a/code/modules/reqs/supplypacks/vehicles.dm b/code/modules/reqs/supplypacks/vehicles.dm index dc0043a37ce..9fa5f8776af 100644 --- a/code/modules/reqs/supplypacks/vehicles.dm +++ b/code/modules/reqs/supplypacks/vehicles.dm @@ -37,12 +37,6 @@ cost = 10 containertype = /obj/structure/closet/crate/ammo -/datum/supply_packs/vehicles/tank_slauncher - name = "Tank grenade laucnher smoke magazine" - contains = list(/obj/item/ammo_magazine/tank/tank_slauncher) - 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 9cf82494266..dcc19278db3 100644 --- a/code/modules/reqtorio/assembly_crafts.dm +++ b/code/modules/reqtorio/assembly_crafts.dm @@ -326,11 +326,6 @@ WEAPONS 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/gl_smoke_tank_ammo - name = "Tank grenade launcher smoke magazine" - input = list(/obj/item/stack/sheet/jeweler_steel = 1, /obj/item/stack/gun_powder = 1) - output = list(/obj/item/ammo_magazine/tank/tank_slauncher = 1) - /datum/assembly_craft/weapons/heavy_isg_he 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