From 2002a273de4209ca631610e5e262744a3dc7bb95 Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:04:16 -0700 Subject: [PATCH 1/2] Makes empty internal tanks printable --- code/game/objects/items/tanks/tank_types.dm | 5 +- code/modules/research/designs/misc_designs.dm | 54 +++++++++++++++++++ .../techweb/nodes/engineering_nodes.dm | 8 +++ 3 files changed, 66 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 8f5303da8e..b4c8d8adf0 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -93,11 +93,13 @@ F.update_icon() else return ..() +//Makes empty oxygen tanks spawn without gas +/obj/item/tank/internals/plasma/empty/populate_gas() + return /obj/item/tank/internals/plasma/full/populate_gas() air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) - /* * Plasmaman Plasma Tank */ @@ -130,6 +132,7 @@ air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return +//makes empty plasma tanks spawn without gas. /obj/item/tank/internals/plasmaman/belt/empty/populate_gas() return diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index e9af465c8a..9b44264b07 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -707,3 +707,57 @@ build_path = /obj/item/clothing/gloves/tackler/rocket category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY + +///////////////////////////////////////// +/////////////Internal Tanks////////////// +///////////////////////////////////////// + +/datum/design/oxygen_tank + name = "Oxygen Tank" + desc = "An empty oxygen tank." + id = "oxygen_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_tank + name = "Plasma Tank" + desc = "An empty plasma tank." + id = "plasma_tank" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 2000) + build_path = /obj/item/tank/internals/plasma/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen + name = "Emergency Oxygen Tank" + desc = "A small emergency oxygen tank." + id = "emergency_oxygen" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/plasma_belt_tank + name = "Plasmaman Belt Tank" + desc = "A small tank of plasma for plasmamen." + id = "plasmaman_tank_belt" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/plasmaman/belt/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING + +/datum/design/emergency_oxygen_engi + name = "Engineering Emergency Oxygen Tank" + desc = "An emergency oxygen tank for engineers." + id = "emergency_oxygen_engi" + build_type = PROTOLATHE + materials = list(/datum/material/iron = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen/engi/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING \ No newline at end of file diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 2ab5458028..2fc6d6097e 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -42,6 +42,14 @@ design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor", "circulator", "teg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) +/datum/techweb_node/int_tank + id = "int_tank" + display_name = "Internal Tanks" + description = "How to compress air into smaller containers." + prereq_ids = list("engineering") + design_ids = list("oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") + research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) + /* /datum/techweb_node/basic_meteor_defense id = "basic_meteor_defense" From e80ec920e08b71d7cd4d3b6858777acba4047ebe Mon Sep 17 00:00:00 2001 From: shellspeed1 <46614774+shellspeed1@users.noreply.github.com> Date: Thu, 4 Jun 2020 16:42:10 -0700 Subject: [PATCH 2/2] Moved the tanks to industrial tech node. --- .../research/techweb/nodes/engineering_nodes.dm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/code/modules/research/techweb/nodes/engineering_nodes.dm b/code/modules/research/techweb/nodes/engineering_nodes.dm index 2fc6d6097e..eac8c2faf2 100644 --- a/code/modules/research/techweb/nodes/engineering_nodes.dm +++ b/code/modules/research/techweb/nodes/engineering_nodes.dm @@ -7,7 +7,8 @@ prereq_ids = list("base") design_ids = list("solarcontrol", "recharger", "powermonitor", "rped", "pacman", "adv_capacitor", "adv_scanning", "emitter", "high_cell", "adv_matter_bin", "atmosalerts", "atmos_control", "recycler", "autolathe", "autolathe_secure", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo") + "apc_control", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "rcd_ammo","oxygen_tank", + "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) /datum/techweb_node/adv_engi @@ -42,14 +43,6 @@ design_ids = list("smes", "super_cell", "hyper_cell", "super_capacitor", "superpacman", "mrspacman", "power_turbine", "power_turbine_console", "power_compressor", "circulator", "teg") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 3000) -/datum/techweb_node/int_tank - id = "int_tank" - display_name = "Internal Tanks" - description = "How to compress air into smaller containers." - prereq_ids = list("engineering") - design_ids = list("oxygen_tank", "plasma_tank", "emergency_oxygen", "emergency_oxygen_engi", "plasmaman_tank_belt") - research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500) - /* /datum/techweb_node/basic_meteor_defense id = "basic_meteor_defense"