mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-24 13:30:42 +01:00
Rock the UI Away - Removes VueUI and adds TGUI (#16509)
* tgui the beginning * binaries and the like * Bring in the last of it * Example radio UI * delete example * NTOS Main Menu, start on manifest, tgui states * tasks.json * gunnery ui pt 1 * okay * fix everything * scss update * oops * manifest gigablast * downloader part 1 * download prt 2 * NTOSDownloader final * mfw committing to_worlds * gunnery console pt2 * i cooked * targeting (finished) * one vueui down * voting ui almost done * MY MIND FEELS LIKE AN ARCH ENEMYYYY * voting ui down * photocopier * ntos config + download fixes * photocopier 2 * refactor define * NTOS client manager + fixes * fax machine final (it also uses toner now) * marching forwards... left behind... * ntnrc part 1 * canister * add quotes * portable pumps pt1 + more backgrounds * oops * finish the portable pump * freezers so I'll keep on pushing forward... you haven't seen the last of me... oooooooh... * doors ui pt1 * finish doors UI (forgive me wildkins it's a bit of shitcode) * vitals monitor, make things use labeled lists, new backgrounds * mais j'envoyé aucun mayday... * maglock pt1 * pour ça je me suis perdu... * infrared * fix that * prox sensor pt1 * prox sensor * signaler (this was actually pretty hard) * atmos control pt1 * atmos control pt1.1 * atmos pt 2 * fuel injector * multitool UI * jammer * list viewer * APC * portgen * targeting console updates + SMES ui * new themes, shield generator * supermatter * Add ore detector and (shitty) NTNet Relay * orderterminal pt1 * orderterminal pt2 * smartfridge * Add (air-)tank GUI update ore detector size * Adds Transfer Valves * Add AtmoScrubber * analyzer pt1 * weapons analyzer pt2 * bodyscanner pt1 * bodyscanner pt2 * fix this shitcode * seed storage * appearance changer * appearance changer final * sleeper pt1 * sleeper * gps * vehicles * chem dispenser * lily request * holopad * tgui modules pt1 * ppanel * damage menu * fixes * im here too now * follow menu, search bars * quikpay * quikpay fixes * circuit printer * ppanel * ppanel updates * pai * turret controls (i want to kill myself) * tweak * remove the boardgame * guntracker * implant tracker * penal mechs come close to me, come close to me * chem codex * pai radio * doorjack * pai directives * signaler removal, sensors * ghost spawner * spawnpoint * fixes * teleporter * one more to the chopping block * account database * remove divider * scanner, atmos * latejoin ui pt1 * latejoin * records pt1 * RECORDS UI DONE * delete interpreter & records * CHAT FUCKING CLIENT * data updates * fix some things * final UI, log * basic nanoui fix * antag panel * remove vueui * atm update * vending update * warrants, cameras * ntmonitor * time comes for all * preserve this legacy * bring that back (oops) * rcon, ui auto update for computer UIs, remove rcon computers * alarm monitoring (a bit broke and also todo: add custom alarm monitoring programs to a few consoles) * A LIKE SUPREME * a * power monitor * lights on * fuck this code, fuck nanoui modules, and fuck nanoui * LEAVE IT OH SO FAR BEHIND * fix alarm monitoring for synths * I SAW IN YOU WHAT LIFE WAS MISSING * comms console * idcard and record updates * turn the light on * arcade * pt2 * news browser * static * crusher * f * COULD I JUST SLEIGH THE GOLD FROM THE BALLS? I'M SO FRUSTRATED OH COULD YOU TELL? IF I HEAR ONE MORE VUEUI OR ONE NANOUI I'M GONNA LOSE IT SO LET ME GOOOOOOOOOOOOOOOOO * codeowners & suit sensors * html ui style removal * make lint happy * resist and disorder * i slowly get up and turn off the noise, already fed up... * pleaseeeeeeeeeeeeeee * THE CREDIT LARP IS NECESSARY * i hold the keys * RISE UP * fix that? * harry's suggestions xoxo * runtime fix pt2 * You are the only thing that I still care about * adds build workflow * Update update_tgui.yml * adds some needed steps * ATM * misc fixes and tweaks * fixes 2 * make newscasters usable and fix use power on freezers * turret control is clearer --------- Co-authored-by: John Wildkins <john.wildkins@gmail.com> Co-authored-by: Matt Atlas <liermattia@gmail.com> Co-authored-by: harryob <55142896+harryob@users.noreply.github.com> Co-authored-by: Werner <Arrow768@users.noreply.github.com> Co-authored-by: Geeves <ggrobler447@gmail.com> Co-authored-by: harryob <me@harryob.live>
This commit is contained in:
co-authored by
John Wildkins
Matt Atlas
harryob
Werner
Geeves
harryob
parent
4ce7ba118b
commit
31956c7eb0
@@ -63,7 +63,7 @@
|
||||
add_fingerprint(user)
|
||||
ui_interact(user)
|
||||
|
||||
/obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/topic_state/state = default_state)
|
||||
/obj/machinery/mineral/stacking_unit_console/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1, datum/ui_state/state = default_state)
|
||||
if(!setup_machine(user))
|
||||
return
|
||||
|
||||
|
||||
@@ -30,18 +30,15 @@
|
||||
icon_state = "ore_scanner[active ? "-active" : ""]"
|
||||
|
||||
/obj/item/ore_detector/attack_self(mob/user)
|
||||
if(!length(search_ores))
|
||||
to_chat(user, SPAN_WARNING("You haven't set an ore to search for yet!"))
|
||||
return
|
||||
active = !active
|
||||
var/msg = "You [active ? "activate" : "deactivate"] \the [src]."
|
||||
to_chat(user, SPAN_NOTICE(msg))
|
||||
if(active)
|
||||
activate(user)
|
||||
else
|
||||
deactivate()
|
||||
ui_interact(user)
|
||||
|
||||
/obj/item/ore_detector/AltClick(mob/user)
|
||||
/obj/item/ore_detector/ui_interact(mob/user, datum/tgui/ui)
|
||||
ui = SStgui.try_update_ui(user, src, ui)
|
||||
if(!ui)
|
||||
ui = new(user, src, "OreDetector", ui_x=400, ui_y=420)
|
||||
ui.open()
|
||||
|
||||
/obj/item/ore_detector/ui_data(mob/user)
|
||||
if(!length(ore_names))
|
||||
ore_names = list()
|
||||
for(var/ore_n in ore_data)
|
||||
@@ -50,31 +47,32 @@
|
||||
ore_names += ore_name
|
||||
ore_names += MINOR_ARTIFACTS
|
||||
ore_names += MAJOR_ARTIFACTS
|
||||
if(loc == user)
|
||||
var/datum/vueui/ui = SSvueui.get_open_ui(user, src)
|
||||
if(!ui)
|
||||
ui = new(user, src, "devices-oredetector", 320, 220, capitalize_first_letters(name))
|
||||
ui.open()
|
||||
else
|
||||
return ..()
|
||||
|
||||
/obj/item/ore_detector/vueui_data_change(var/list/data, var/mob/user, var/datum/vueui/ui)
|
||||
if(!data)
|
||||
data = list()
|
||||
var/list/data = list()
|
||||
data["ore_names"] = ore_names
|
||||
data["search_ores"] = search_ores
|
||||
data["enabled"] = active
|
||||
return data
|
||||
|
||||
VUEUI_SET_CHECK_LIST(data["ore_names"], ore_names, ., data)
|
||||
VUEUI_SET_CHECK_LIST(data["selected_ores"], search_ores, ., data)
|
||||
|
||||
/obj/item/ore_detector/Topic(href, href_list)
|
||||
..()
|
||||
|
||||
if(href_list["chosen_ore"])
|
||||
if(href_list["chosen_ore"] in search_ores)
|
||||
search_ores -= href_list["chosen_ore"]
|
||||
/obj/item/ore_detector/ui_act(action,params)
|
||||
. = ..()
|
||||
if(.)
|
||||
return
|
||||
if(action=="toggle")
|
||||
if(active)
|
||||
deactivate()
|
||||
else
|
||||
search_ores += href_list["chosen_ore"]
|
||||
|
||||
SSvueui.check_uis_for_change(src)
|
||||
activate(usr)
|
||||
. = TRUE
|
||||
update_icon()
|
||||
if(action=="select_ore")
|
||||
if(params["ore_name"] in search_ores)
|
||||
search_ores -= params["ore_name"]
|
||||
else
|
||||
search_ores += params["ore_name"]
|
||||
if(!length(search_ores))
|
||||
deactivate()
|
||||
. = TRUE
|
||||
|
||||
/obj/item/ore_detector/process()
|
||||
if(last_ping + ping_rate > world.time)
|
||||
@@ -105,9 +103,11 @@
|
||||
return
|
||||
START_PROCESSING(SSprocessing, src)
|
||||
our_user = WEAKREF(user)
|
||||
active=TRUE
|
||||
update_icon()
|
||||
|
||||
/obj/item/ore_detector/proc/deactivate()
|
||||
active=FALSE
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
our_user = null
|
||||
update_icon()
|
||||
|
||||
Reference in New Issue
Block a user