cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 20:48:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

tgui 4.0 (#52085)

Browse Source 
* tgui 4.0 hyper squash

* Upgrade dependencies
This commit is contained in:
Aleksej Komarov
2020-07-16 20:13:04 +02:00
committed by GitHub
parent 1f149b7023
commit 0cf00a2645
419 changed files with 5171 additions and 4029 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/hydroponics/biogenerator.dm
+7 -11
View File
@@ -7,8 +7,6 @@
use_power = IDLE_POWER_USE
idle_power_usage = 40
circuit = /obj/item/circuitboard/machine/biogenerator
ui_x = 550
ui_y = 380
var/processing = FALSE
var/obj/item/reagent_containers/glass/beaker = null
var/points = 0
@@ -259,17 +257,15 @@
return UI_CLOSE
return ..()
/obj/machinery/biogenerator/ui_base_html(html)
var/datum/asset/spritesheet/simple/assets = get_asset_datum(/datum/asset/spritesheet/research_designs)
. = replacetext(html, "<!--customheadhtml-->", assets.css_tag())
/obj/machinery/biogenerator/ui_assets(mob/user)
return list(
get_asset_datum(/datum/asset/spritesheet/research_designs),
)
/obj/machinery/biogenerator/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
/obj/machinery/biogenerator/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
var/datum/asset/assets = get_asset_datum(/datum/asset/spritesheet/research_designs)
assets.send(user)
ui = new(user, src, ui_key, "Biogenerator", name, ui_x, ui_y, master_ui, state)
ui = new(user, src, "Biogenerator", name)
ui.open()
/obj/machinery/biogenerator/ui_data(mob/user)
code/modules/hydroponics/seed_extractor.dm
+6 -6
View File
@@ -66,8 +66,6 @@
var/list/piles = list()
var/max_seeds = 1000
var/seed_multiplier = 1
ui_x = 1000
ui_y = 400
/obj/machinery/seed_extractor/RefreshParts()
for(var/obj/item/stock_parts/matter_bin/B in component_parts)
@@ -163,11 +161,13 @@
. = TRUE
/obj/machinery/seed_extractor/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.notcontained_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
/obj/machinery/seed_extractor/ui_state(mob/user)
return GLOB.notcontained_state
/obj/machinery/seed_extractor/ui_interact(mob/user, datum/tgui/ui)
ui = SStgui.try_update_ui(user, src, ui)
if(!ui)
ui = new(user, src, ui_key, "SeedExtractor", name, ui_x, ui_y, master_ui, state)
ui = new(user, src, "SeedExtractor", name)
ui.open()
/obj/machinery/seed_extractor/ui_data()