cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 03:55:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Crystallizer Hotfix (mistakes were made) (#3724)

Browse Source 
* fex (#57256)

Fixed crystallizer, now working properly, the GUI was broken when i changed name of a var, now the gui works again, also the internal gasmixture wasn't initialized anymore for some reason

Zaukerite and SM shard cost a bit less now (was intended to be changed in the main PR but i forgot)

* Crystallizer Hotfix (mistakes were made)

Co-authored-by: Ghilker <42839747+Ghilker@users.noreply.github.com>
This commit is contained in:
SkyratBot
2021-03-01 00:47:38 +01:00
committed by GitHub
parent fe98c7323e
commit 3dc5cff82d
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/atmospherics/machinery/components/gas_recipe_machines/atmos_machines_recipes.dm
+2 -2
View File
@@ -96,7 +96,7 @@ GLOBAL_LIST_INIT(gas_recipe_meta, gas_recipes_list())
reaction_type = EXOTHERMIC_REACTION
energy_release = 1500000
dangerous = TRUE
requirements = list(/datum/gas/hypernoblium = 1500, /datum/gas/antinoblium = 1500, /datum/gas/bz = 2000, /datum/gas/plasma = 5000, /datum/gas/oxygen = 4500)
requirements = list(/datum/gas/hypernoblium = 250, /datum/gas/antinoblium = 250, /datum/gas/bz = 200, /datum/gas/plasma = 5000, /datum/gas/oxygen = 4500)
products = list(/obj/machinery/power/supermatter_crystal/shard = 1)
/datum/gas_recipe/crystallizer/n2o_crystal
@@ -146,5 +146,5 @@ GLOBAL_LIST_INIT(gas_recipe_meta, gas_recipes_list())
max_temp = 20
reaction_type = EXOTHERMIC_REACTION
energy_release = 29000
requirements = list(/datum/gas/antinoblium = 100, /datum/gas/zauker = 500, /datum/gas/bz = 75)
requirements = list(/datum/gas/antinoblium = 5, /datum/gas/zauker = 20, /datum/gas/bz = 7.5)
products = list(/obj/item/stack/sheet/mineral/zaukerite = 2)
code/modules/atmospherics/machinery/components/gas_recipe_machines/crystallizer.dm
+8 -4
View File
@@ -30,6 +30,10 @@
///Stores the total amount of moles needed for the current recipe
var/total_recipe_moles = 0
/obj/machinery/atmospherics/components/binary/crystallizer/Initialize()
. = ..()
internal = new
/obj/machinery/atmospherics/components/binary/crystallizer/attackby(obj/item/I, mob/user, params)
if(!on)
if(default_deconstruction_screwdriver(user, "[base_icon]-open", "[base_icon]-off", I))
@@ -256,9 +260,9 @@
data["on"] = on
if(selected_recipe)
data["selected_recipe"] = selected_recipe.id
data["selected"] = selected_recipe.id
else
data["selected_recipe"] = null
data["selected"] = null
var/list/internal_gas_data = list()
if(internal.total_moles())
@@ -315,12 +319,12 @@
dump_gases()
quality_loss = 0
progress_bar = 0
if(selected_recipe)
if(recipe)
selected_recipe = recipe
recipe_name = recipe.name
update_parents() //prevent the machine from stopping because of the recipe change and the pipenet not updating
moles_calculations()
investigate_log("was set to recipe [recipe_name] by [key_name(usr)]", INVESTIGATE_ATMOS)
investigate_log("was set to recipe [recipe_name ? recipe_name : "null"] by [key_name(usr)]", INVESTIGATE_ATMOS)
. = TRUE
if("gas_input")
var/_gas_input = params["gas_input"]