From 461e66991dd80daebd6941fb79a3942571b89b58 Mon Sep 17 00:00:00 2001 From: aKromatopzia <94389683+aKromatopzia@users.noreply.github.com> Date: Mon, 23 Dec 2024 15:10:54 +0800 Subject: [PATCH] Adds nitrogen and anesthetic tanks to printers (#2683) ## About The Pull Request title. surprised this hasnt been done ## Proof Of Testing it runs? it runs ![image](https://github.com/user-attachments/assets/f0a30413-6c8a-4818-a957-11b1329faa21) ![Screenshot_6](https://github.com/user-attachments/assets/7cb08fba-d26c-4273-b3b6-c96959a488cb) ## Changelog :cl: add: Anesthetic and nitrogen tanks appear in relevant departmental lathes /:cl: --- .../game/objects/items/tanks/tank_types.dm | 8 ++++ .../modules/research/designs/misc_designs.dm | 38 +++++++++++++++++++ .../modules/research/techweb/all_nodes.dm | 9 +++++ tgstation.dme | 1 + 4 files changed, 56 insertions(+) create mode 100644 modular_zubbers/code/game/objects/items/tanks/tank_types.dm diff --git a/modular_zubbers/code/game/objects/items/tanks/tank_types.dm b/modular_zubbers/code/game/objects/items/tanks/tank_types.dm new file mode 100644 index 00000000000..32d54cf3ea9 --- /dev/null +++ b/modular_zubbers/code/game/objects/items/tanks/tank_types.dm @@ -0,0 +1,8 @@ +/obj/item/tank/internals/anesthetic/empty/populate_gas() + return + +/obj/item/tank/internals/nitrogen/empty/populate_gas() + return + +/obj/item/tank/internals/nitrogen/belt/empty/populate_gas() + return diff --git a/modular_zubbers/code/modules/research/designs/misc_designs.dm b/modular_zubbers/code/modules/research/designs/misc_designs.dm index 6d0ca821046..93c2c4eeb58 100644 --- a/modular_zubbers/code/modules/research/designs/misc_designs.dm +++ b/modular_zubbers/code/modules/research/designs/misc_designs.dm @@ -7,3 +7,41 @@ build_path = /obj/item/disk/plantgene category = list("Electronics") departmental_flags = DEPARTMENT_BITFLAG_SERVICE + +/datum/design/nitrogen_tank + name = "Nitrogen Tank" + desc = "An empty nitrogen tank." + id = "nitrogen_tank" + build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) + build_path = /obj/item/tank/internals/nitrogen/empty + category = list(RND_CATEGORY_INITIAL, + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS, + ) + departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO + +/* Uncomment in case nitrogen internal tanks get refactored to no longer be 25L +* /datum/design/nitrogen_tank_belt +* name = "Nitrogen Internals Tank" +* desc = "An empty nitrogen tank." +* id = "nitrogen_tank_belt" +* build_type = AUTOLATHE | PROTOLATHE | AWAY_LATHE +* materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) +* build_path = /obj/item/tank/internals/nitrogen/belt/empty +* category = list(RND_CATEGORY_INITIAL, +* RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS, +* ) +* departmental_flags = DEPARTMENT_BITFLAG_ENGINEERING | DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_CARGO +*/ + +/datum/design/anesthetic_tank + name = "Anesthetic Tank" + desc = "An empty tank designed specifically for use with anesthetics." + id = "anesthetic_tank" + build_type = PROTOLATHE | AWAY_LATHE + materials = list(/datum/material/iron =SHEET_MATERIAL_AMOUNT) + build_path = /obj/item/tank/internals/anesthetic/empty + category = list(RND_CATEGORY_INITIAL, + RND_CATEGORY_EQUIPMENT + RND_SUBCATEGORY_EQUIPMENT_GAS_TANKS, + ) + departmental_flags = DEPARTMENT_BITFLAG_SCIENCE | DEPARTMENT_BITFLAG_MEDICAL diff --git a/modular_zubbers/code/modules/research/techweb/all_nodes.dm b/modular_zubbers/code/modules/research/techweb/all_nodes.dm index d31e765e2b7..641e132c642 100644 --- a/modular_zubbers/code/modules/research/techweb/all_nodes.dm +++ b/modular_zubbers/code/modules/research/techweb/all_nodes.dm @@ -41,6 +41,15 @@ "limbdesign_tajaran", ) +//ENGINEERING +/datum/techweb_node/atmos/New() + . = ..() + design_ids += list( + "nitrogen_tank", + //"nitrogen_tank_belt", | Uncomment in case nitrogen internal tanks get refactored to no longer be 25L + "anesthetic_tank", + ) + // TOOLS /datum/techweb_node/mining/New() diff --git a/tgstation.dme b/tgstation.dme index 9e91e58e8ee..05993a037eb 100644 --- a/tgstation.dme +++ b/tgstation.dme @@ -8824,6 +8824,7 @@ #include "modular_zubbers\code\game\objects\items\storage\boxes.dm" #include "modular_zubbers\code\game\objects\items\storage\briefcase.dm" #include "modular_zubbers\code\game\objects\items\storage\garment.dm" +#include "modular_zubbers\code\game\objects\items\tanks\tank_types.dm" #include "modular_zubbers\code\game\objects\structures\aliens.dm" #include "modular_zubbers\code\game\objects\structures\chalkboard.dm" #include "modular_zubbers\code\game\objects\structures\ore_vent.dm"