From b10850562961666c956254b6acc26139e4493ee1 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 31 Mar 2019 19:28:40 -0400 Subject: [PATCH 1/5] Update chem_dispenser.dm --- .../chemistry/machinery/chem_dispenser.dm | 69 +++++++++++++++---- 1 file changed, 55 insertions(+), 14 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 8cb5f6254c..3f15467f40 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -49,12 +49,27 @@ "bromine", "stable_plasma" ) +//these become available once upgraded. + var/list/upgrade_reagents = list( + "oil", + "ammonia" + ) + + var/list/upgrade_reagents2 = list( + "acetone", + "phenol", + "diethylamine" + ) + + var/list/upgrade_reagents3 = list( + "omnizine" + ) + var/list/emagged_reagents = list( - "space_drugs", - "morphine", + "sulfonal", + "frostoil", "carpotoxin", - "mine_salve", - "toxin" + "histamine" ) var/list/saved_recipes = list() @@ -74,7 +89,17 @@ ..() if(panel_open) to_chat(user, "[src]'s maintenance hatch is open!") - + if(in_range(user, src) || isobserver(user)) + to_chat(user, "The status display reads:
Recharging [recharge_amount] power units per interval.
Power efficiency increased by [(powerefficiency*1000)-100]%.") + switch(macrotier) + if(1) + to_chat(user, "Macro granularity at 5u.") + if(2) + to_chat(user, "Macro granularity at 3u.") + if(3) + to_chat(user, "Macro granularity at 2u.") + if(4) + to_chat(user, "Macro granularity at 1u.") /obj/machinery/chem_dispenser/process() if (recharge_counter >= 4) if(!is_operational()) @@ -346,6 +371,12 @@ for(var/obj/item/stock_parts/manipulator/M in component_parts) if (M.rating > macrotier) macrotier = M.rating + if (M.rating > 1) + dispensable_reagents |= upgrade_reagents + if (M.rating > 2) + dispensable_reagents |= upgrade_reagents2 + if (M.rating > 3) + dispensable_reagents |= upgrade_reagents3 powerefficiency = round(newpowereff, 0.01) @@ -447,14 +478,17 @@ "tomatojuice", "lemonjuice", "menthol" - ) + ) //prevents the soda machine from obtaining chemical upgrades. . + upgrade_reagents = null + upgrade_reagents2 = null + upgrade_reagents3 = null emagged_reagents = list( "thirteenloko", - "whiskeycola", - "mindbreaker", - "tirizene" + "morphine", + "uranium" ) + /obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged desc = "Contains a large reservoir of soft drinks. This model has had its safeties shorted out." obj_flags = CAN_BE_HIT | EMAGGED @@ -497,13 +531,15 @@ "creme_de_cacao", "triple_sec", "sake" - ) + )//prevents the booze machine from obtaining chemical upgrades. + upgrade_reagents = null + upgrade_reagents2 = null + upgrade_reagents3 = null emagged_reagents = list( - "ethanol", "iron", + "clownstears", "minttoxin", - "atomicbomb", - "fernet" + "slimejelly" ) /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged @@ -528,6 +564,7 @@ name = "mutagen dispenser" desc = "Creates and dispenses mutagen." dispensable_reagents = list("mutagen") + upgrade_reagents = null emagged_reagents = list("plasma") @@ -550,7 +587,11 @@ "ammonia", "ash", "diethylamine") - + //same as above. + upgrade_reagents = null + upgrade_reagents2 = null + upgrade_reagents3 = null + /obj/machinery/chem_dispenser/mutagensaltpeter/Initialize() . = ..() component_parts = list() From 5883b53a87a5e23057c628cd0b64b15904568313 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 31 Mar 2019 19:33:13 -0400 Subject: [PATCH 2/5] Update chem_dispenser.dm --- .../chemistry/machinery/chem_dispenser.dm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 3f15467f40..f7e5e7b0ea 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -69,7 +69,9 @@ "sulfonal", "frostoil", "carpotoxin", - "histamine" + "histamine", + "space_drugs", + "morphine" ) var/list/saved_recipes = list() @@ -485,7 +487,10 @@ emagged_reagents = list( "thirteenloko", "morphine", - "uranium" + "uranium", + "whiskeycola", + "mindbreaker", + "tirizene" ) @@ -536,10 +541,15 @@ upgrade_reagents2 = null upgrade_reagents3 = null emagged_reagents = list( + "ethanol", "iron", "clownstears", "minttoxin", - "slimejelly" + "atomicbomb", + "fernet", + "slimejelly", + "aphro", + "aphro+" ) /obj/machinery/chem_dispenser/drinks/beer/fullupgrade //fully ugpraded stock parts, emagged From 1b1786800a29781ea6f8241acc947ed62406a387 Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 31 Mar 2019 20:29:07 -0400 Subject: [PATCH 3/5] Update chem_dispenser.dm --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index f7e5e7b0ea..10023406c9 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -66,11 +66,11 @@ ) var/list/emagged_reagents = list( + "space_drugs", "sulfonal", "frostoil", "carpotoxin", "histamine", - "space_drugs", "morphine" ) From de7398b1edbb7bc7aea71ef418e03236b49c307b Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Sun, 31 Mar 2019 23:48:10 -0400 Subject: [PATCH 4/5] Update chem_dispenser.dm --- code/modules/reagents/chemistry/machinery/chem_dispenser.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index 10023406c9..ad6b7dee51 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -62,7 +62,8 @@ ) var/list/upgrade_reagents3 = list( - "omnizine" + "omnizine", + "glycerol" ) var/list/emagged_reagents = list( From a1c8155ec8421c6be10b7e5eac976adeeea1030f Mon Sep 17 00:00:00 2001 From: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com> Date: Tue, 2 Apr 2019 15:42:18 -0400 Subject: [PATCH 5/5] Update chem_dispenser.dm --- .../reagents/chemistry/machinery/chem_dispenser.dm | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm index ad6b7dee51..7339f850d8 100644 --- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm +++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm @@ -62,13 +62,14 @@ ) var/list/upgrade_reagents3 = list( - "omnizine", - "glycerol" + "glycerol", + "mine_salve", + "toxin" ) var/list/emagged_reagents = list( "space_drugs", - "sulfonal", + "plasma", "frostoil", "carpotoxin", "histamine", @@ -139,7 +140,6 @@ add_overlay(beaker_overlay) - /obj/machinery/chem_dispenser/emag_act(mob/user) if(obj_flags & EMAGGED) to_chat(user, "[src] has no functional safeties to emag.") @@ -487,8 +487,7 @@ upgrade_reagents3 = null emagged_reagents = list( "thirteenloko", - "morphine", - "uranium", + "changelingsting", "whiskeycola", "mindbreaker", "tirizene" @@ -544,11 +543,11 @@ emagged_reagents = list( "ethanol", "iron", + "alexander", "clownstears", "minttoxin", "atomicbomb", "fernet", - "slimejelly", "aphro", "aphro+" )