cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-20 02:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub

Browse Source
This commit is contained in:
Crazylemon64
2017-01-06 05:01:43 -08:00
parent ac612d4924 b402225c7a
commit ec0f13d41e
158 changed files with 4150 additions and 1040 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+1 -1
View File
@@ -121,7 +121,7 @@
// open the new ui window
ui.open()
/obj/machinery/chem_dispenser/ui_data(mob/user, datum/topic_state/state = default_state)
/obj/machinery/chem_dispenser/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
var/data[0]
data["amount"] = amount
code/modules/reagents/chemistry/machinery/chem_heater.dm
+1 -1
View File
@@ -136,7 +136,7 @@
ui = new(user, src, ui_key, "chem_heater.tmpl", "ChemHeater", 350, 270)
ui.open()
/obj/machinery/chem_heater/ui_data(mob/user, datum/topic_state/state = default_state)
/obj/machinery/chem_heater/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
var/data[0]
data["targetTemp"] = desired_temp
code/modules/reagents/chemistry/machinery/chem_master.dm
+1 -1
View File
@@ -328,7 +328,7 @@
ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 400)
ui.open()
/obj/machinery/chem_master/ui_data(mob/user, datum/topic_state/state = default_state)
/obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state)
var/data[0]
data["condi"] = condi