From e02c458a75277d0924807b112d0d1c09a9166c9b Mon Sep 17 00:00:00 2001 From: Toast Date: Sat, 9 Nov 2019 20:14:54 -0500 Subject: [PATCH 1/3] Update .gitignore --- .gitignore | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/.gitignore b/.gitignore index df7a79e3..752bd440 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,42 @@ tgstation.int +data/player_saves/b/bigfatanimetiddies/vore/character1.json +data/npc_saves/Poly.json +tmp/iconCache.sav +data/npc_saves/Punpun.json +data/npc_saves/Runtime.json +data/player_saves/b/bigfatanimetiddies/preferences.sav +data/npc_saves/Ian.json +data/logs/2019/11/09/round-18.31.37/supermatter.html +data/logs/2019/11/09/round-18.31.37/telecomms.log +data/logs/2019/11/09/round-18.31.37/singulo.html +data/logs/2019/11/09/round-18.31.37/radiation.html +data/logs/2019/11/09/round-18.31.37/qdel.log +data/logs/2019/11/09/round-18.31.37/runtime.log +data/logs/2019/11/09/round-18.31.37/pda.log +data/logs/2019/11/09/round-18.31.37/manifest.log +data/logs/2019/11/09/round-18.31.37/job_debug.log +data/logs/2019/11/09/round-18.31.37/hallucinations.html +data/logs/2019/11/09/round-18.31.37/gravity.html +data/logs/2019/11/09/round-18.31.37/hrefs.log +data/logs/2019/11/09/round-18.31.37/game.log +data/logs/2019/11/09/round-18.31.37/config_error.log +data/logs/2019/11/09/round-18.31.37/cargo.html +data/logs/2019/11/09/round-18.31.37/atmos.html +data/logs/2019/11/09/round-18.20.59/supermatter.html +data/logs/2019/11/09/round-18.20.59/runtime.log +data/logs/2019/11/09/round-18.20.59/pda.log +data/logs/2019/11/09/round-18.20.59/manifest.log +data/logs/2019/11/09/round-18.20.59/qdel.log +data/logs/2019/11/09/round-18.20.59/singulo.html +data/logs/2019/11/09/round-18.20.59/telecomms.log +data/logs/2019/11/09/round-18.31.37/attack.log +data/logs/2019/11/09/round-18.20.59/job_debug.log +data/logs/2019/11/09/round-18.20.59/hrefs.log +data/logs/2019/11/09/round-18.20.59/game.log +data/logs/2019/11/09/round-18.20.59/gravity.html +data/logs/2019/11/09/round-18.20.59/config_error.log +data/logs/2019/11/09/round-18.20.59/cargo.html +data/logs/2019/11/09/round-18.20.59/attack.log +data/banlist.bdb +cfg/admin.txt From 54250038a7f2a46427425869638cd15f2a8766c5 Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 10 Nov 2019 02:06:20 -0500 Subject: [PATCH 2/3] GASES --- code/game/objects/items/tanks/tank_types.dm | 18 ++++++++ code/modules/research/designs/misc_designs.dm | 44 +++++++++++++++++++ code/modules/research/techweb/all_nodes.dm | 4 +- 3 files changed, 64 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm index 0e6dfaa1..fee5e70a 100644 --- a/code/game/objects/items/tanks/tank_types.dm +++ b/code/game/objects/items/tanks/tank_types.dm @@ -35,6 +35,10 @@ icon_state = "oxygen_fr" dog_fashion = null +/obj/item/tank/internals/oxygen/empty/New() + ..() + air_contents.gases[/datum/gas/oxygen] = (0*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + return /* * Anesthetic @@ -105,6 +109,10 @@ air_contents.gases[/datum/gas/plasma] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return +/obj/item/tank/internals/plasma/empty/New() + ..() + air_contents.gases[/datum/gas/plasma] = (0*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + return /* * Plasmaman Plasma Tank @@ -164,6 +172,11 @@ air_contents.gases[/datum/gas/oxygen] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) return +/obj/item/tank/internals/emergency_oxygen/empty/New() + ..() + air_contents.gases[/datum/gas/oxygen] = (0*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + return + /obj/item/tank/internals/emergency_oxygen/engi name = "extended-capacity emergency oxygen tank" icon_state = "emergency_engi" @@ -173,3 +186,8 @@ name = "double emergency oxygen tank" icon_state = "emergency_double" volume = 10 + +/obj/item/tank/internals/emergency_oxygen/double/empty/New() + ..() + air_contents.gases[/datum/gas/oxygen] = (0*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) + return diff --git a/code/modules/research/designs/misc_designs.dm b/code/modules/research/designs/misc_designs.dm index 4a6f9625..634dc7af 100644 --- a/code/modules/research/designs/misc_designs.dm +++ b/code/modules/research/designs/misc_designs.dm @@ -276,6 +276,50 @@ category = list("Equipment") departmental_flags = DEPARTMENTAL_FLAG_SECURITY +///////////////////////////////////////// +//////////////Atmos Tanks//////////////// +///////////////////////////////////////// + +/datum/design/emergency_oxygen + name = "Emergency Oxygen Tank" + desc = "An empty emergency oxygen tank. Used for emergencies." + id = "emergency_oxygen" + build_type = PROTOLATHE + materials = list(MAT_METAL = 1000) + build_path = /obj/item/tank/internals/emergency_oxygen + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ALL + +/datum/design/emergency_oxygen_double + name = "Double Emergency Oxygen Tank" + desc = "An double emergency oxygen tank." + id = "double_emergency_oxygen" + build_type = PROTOLATHE + materials = list(MAT_METAL = 1500, MAT_SILVER = 200) + build_path = /obj/item/tank/internals/emergency_oxygen/double/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_CARGO + +/datum/design/oxygen_tank + name = "Oxygen Tank" + desc = "An empty oxygen tank." + id = "oxygen_tank" + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000) + build_path = /obj/item/tank/internals/oxygen/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + +/datum/design/plasma_tank + name = "Plasma Tank" + desc = "An empty plasma tank." + id = "plasma_tank" + build_type = PROTOLATHE + materials = list(MAT_METAL = 2000) + build_path = /obj/item/tank/internals/plasma/empty + category = list("Equipment") + departmental_flags = DEPARTMENTAL_FLAG_ENGINEERING | DEPARTMENTAL_FLAG_SCIENCE + ///////////////////////////////////////// ////////////Janitor Designs////////////// ///////////////////////////////////////// diff --git a/code/modules/research/techweb/all_nodes.dm b/code/modules/research/techweb/all_nodes.dm index 1349fd23..2f51b33e 100644 --- a/code/modules/research/techweb/all_nodes.dm +++ b/code/modules/research/techweb/all_nodes.dm @@ -163,7 +163,7 @@ 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", "high_micro_laser", "nano_mani", "mesons", "thermomachine", "rad_collector", "tesla_coil", "grounding_rod", - "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine") + "apc_control", "cell_charger", "power control", "airlock_board", "firelock_board", "airalarm_electronics", "firealarm_electronics", "cell_charger", "stack_console", "stack_machine", "emergency_oxygen", "oxygen_tank", "plasma_tank") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 6000) export_price = 5000 @@ -172,7 +172,7 @@ display_name = "Advanced Engineering" description = "Pushing the boundaries of physics, one chainsaw-fist at a time." prereq_ids = list("engineering", "emp_basic") - design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription") + design_ids = list("engine_goggles", "magboots", "forcefield_projector", "weldingmask", "tray_goggles_prescription", "engine_goggles_prescription", "mesons_prescription", "double_emergency_oxygen") research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 4000) export_price = 5000 From 8ea6f19e1f49f0956a0fc7f85b30f059db443e86 Mon Sep 17 00:00:00 2001 From: Toast Date: Sun, 10 Nov 2019 02:07:59 -0500 Subject: [PATCH 3/3] Revert "Update .gitignore" This reverts commit e02c458a75277d0924807b112d0d1c09a9166c9b. --- .gitignore | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/.gitignore b/.gitignore index 752bd440..df7a79e3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,42 +1,2 @@ tgstation.int -data/player_saves/b/bigfatanimetiddies/vore/character1.json -data/npc_saves/Poly.json -tmp/iconCache.sav -data/npc_saves/Punpun.json -data/npc_saves/Runtime.json -data/player_saves/b/bigfatanimetiddies/preferences.sav -data/npc_saves/Ian.json -data/logs/2019/11/09/round-18.31.37/supermatter.html -data/logs/2019/11/09/round-18.31.37/telecomms.log -data/logs/2019/11/09/round-18.31.37/singulo.html -data/logs/2019/11/09/round-18.31.37/radiation.html -data/logs/2019/11/09/round-18.31.37/qdel.log -data/logs/2019/11/09/round-18.31.37/runtime.log -data/logs/2019/11/09/round-18.31.37/pda.log -data/logs/2019/11/09/round-18.31.37/manifest.log -data/logs/2019/11/09/round-18.31.37/job_debug.log -data/logs/2019/11/09/round-18.31.37/hallucinations.html -data/logs/2019/11/09/round-18.31.37/gravity.html -data/logs/2019/11/09/round-18.31.37/hrefs.log -data/logs/2019/11/09/round-18.31.37/game.log -data/logs/2019/11/09/round-18.31.37/config_error.log -data/logs/2019/11/09/round-18.31.37/cargo.html -data/logs/2019/11/09/round-18.31.37/atmos.html -data/logs/2019/11/09/round-18.20.59/supermatter.html -data/logs/2019/11/09/round-18.20.59/runtime.log -data/logs/2019/11/09/round-18.20.59/pda.log -data/logs/2019/11/09/round-18.20.59/manifest.log -data/logs/2019/11/09/round-18.20.59/qdel.log -data/logs/2019/11/09/round-18.20.59/singulo.html -data/logs/2019/11/09/round-18.20.59/telecomms.log -data/logs/2019/11/09/round-18.31.37/attack.log -data/logs/2019/11/09/round-18.20.59/job_debug.log -data/logs/2019/11/09/round-18.20.59/hrefs.log -data/logs/2019/11/09/round-18.20.59/game.log -data/logs/2019/11/09/round-18.20.59/gravity.html -data/logs/2019/11/09/round-18.20.59/config_error.log -data/logs/2019/11/09/round-18.20.59/cargo.html -data/logs/2019/11/09/round-18.20.59/attack.log -data/banlist.bdb -cfg/admin.txt