diff --git a/code/game/machinery/autolathe/autolathe_datums.dm b/code/game/machinery/autolathe/autolathe_datums.dm index 81eb3aa301e..c065891c784 100644 --- a/code/game/machinery/autolathe/autolathe_datums.dm +++ b/code/game/machinery/autolathe/autolathe_datums.dm @@ -599,3 +599,13 @@ path = /obj/item/clothing/gloves/brassknuckles hidden = 1 category = "General" + +/datum/autolathe/recipe/grenade + name = "grenade casing" + path = /obj/item/grenade/chem_grenade + category = "Arms and Ammunition" + +/datum/autolathe/recipe/grenade/large + name = "large grenade casing" + path = /obj/item/grenade/chem_grenade/large + hidden = TRUE diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm index a78ff5b2842..116e195294a 100644 --- a/code/game/objects/items/weapons/grenades/chem_grenade.dm +++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm @@ -15,6 +15,8 @@ var/list/allowed_containers = list(/obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle) var/affected_area = 3 + matter = list(DEFAULT_WALL_MATERIAL = 700, MATERIAL_GLASS = 300) + /obj/item/grenade/chem_grenade/Initialize() . = ..() create_reagents(1000) @@ -190,6 +192,8 @@ origin_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 3) affected_area = 4 + matter = list(DEFAULT_WALL_MATERIAL = 1000, MATERIAL_GLASS = 500) + /obj/item/grenade/chem_grenade/metalfoam name = "metal-foam grenade" desc = "Used for emergency sealing of air breaches." diff --git a/code/modules/research/designs/protolathe/weapon_designs.dm b/code/modules/research/designs/protolathe/weapon_designs.dm index effcd7ec077..edf2b4d6167 100644 --- a/code/modules/research/designs/protolathe/weapon_designs.dm +++ b/code/modules/research/designs/protolathe/weapon_designs.dm @@ -40,11 +40,6 @@ materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 500, MATERIAL_SILVER = 3000) build_path = /obj/item/gun/energy/temperature -/datum/design/item/weapon/large_grenade - req_tech = list(TECH_COMBAT = 3, TECH_MATERIAL = 2) - materials = list(DEFAULT_WALL_MATERIAL = 3000) - build_path = /obj/item/grenade/chem_grenade/large - /datum/design/item/weapon/eglaive req_tech = list(TECH_COMBAT = 6, TECH_PHORON = 4, TECH_MATERIAL = 7, TECH_ILLEGAL = 4, TECH_POWER = 4) materials = list(DEFAULT_WALL_MATERIAL = 10000, MATERIAL_GLASS = 18750, MATERIAL_PHORON = 3000, MATERIAL_SILVER = 7500) @@ -66,4 +61,4 @@ desc = "This nifty gun disables the gravity in the area you shoot at. Use with caution." req_tech = list(TECH_COMBAT = 5, TECH_BLUESPACE = 5) materials = list(DEFAULT_WALL_MATERIAL = 5000, MATERIAL_GLASS = 5000, MATERIAL_SILVER = 3000, MATERIAL_GOLD = 3000, MATERIAL_PHORON = 500) - build_path = /obj/item/gun/energy/gravity_gun \ No newline at end of file + build_path = /obj/item/gun/energy/gravity_gun diff --git a/html/changelogs/geeves-large_grenades.yml b/html/changelogs/geeves-large_grenades.yml new file mode 100644 index 00000000000..7471b09e367 --- /dev/null +++ b/html/changelogs/geeves-large_grenades.yml @@ -0,0 +1,7 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Added grenade and large grenade casings to the Autolathe, under the Arms and Ammunition section. Large casings are only available in hacked lathes." + - rscdel: "Removed the option to print large grenade casings from Protolathes."