Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Commit 619b273

Browse files
AnturKoptimumtact
AnturK
authored and
optimumtact
committed
html_interface removal and crew monitoring console refactor. (#35431)
Quick changes list: html_interface gone unused card interface gone minimap gone from crew console(subsystem not disabled in case something else wants to use it) ui_host() now takes user parameter Some assets moved around. Fixes #22124
1 parent e07eb53 commit 619b273

43 files changed

Lines changed: 301 additions & 2449 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎_maps/RandomRuins/SpaceRuins/oldstation.dmm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
"aL" = (
197197
/obj/effect/decal/cleanable/dirt,
198198
/obj/structure/table,
199-
/obj/item/deck,
199+
/obj/item/toy/cards/deck,
200200
/obj/item/folder/blue,
201201
/obj/item/pen,
202202
/turf/open/floor/plasteel/floorgrime,

‎code/_onclick/hud/ai.dm‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
if(..())
5555
return
5656
var/mob/living/silicon/ai/AI = usr
57-
GLOB.crewmonitor.show(AI)
57+
GLOB.crewmonitor.show(AI,AI)
5858

5959
/obj/screen/ai/crew_manifest
6060
name = "Crew Manifest"

‎code/datums/cinematic.dm‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,6 @@ GLOBAL_LIST_EMPTY(cinematics)
5757

5858
//Close all open windows if global
5959
if(is_global)
60-
for (var/datum/html_interface/hi in GLOB.html_interfaces)
61-
hi.closeAll()
6260
SStgui.close_all_uis()
6361

6462

‎code/game/data_huds.dm‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@
143143
var/datum/atom_hud/data/human/medical/basic/B = GLOB.huds[DATA_HUD_MEDICAL_BASIC]
144144
B.update_suit_sensors(src)
145145

146-
var/turf/T = get_turf(src)
147-
if (T)
148-
GLOB.crewmonitor.queueUpdate(T.z)
149-
150146
//called when a living mob changes health
151147
/mob/living/proc/med_hud_set_health()
152148
var/image/holder = hud_list[HEALTH_HUD]
@@ -158,10 +154,6 @@
158154
/mob/living/carbon/med_hud_set_health()
159155
..()
160156

161-
var/turf/T = get_turf(src)
162-
if(T)
163-
GLOB.crewmonitor.queueUpdate(T.z)
164-
165157
//called when a carbon changes stat, virus or XENO_HOST
166158
/mob/living/proc/med_hud_set_status()
167159
var/image/holder = hud_list[STATUS_HUD]
@@ -216,10 +208,6 @@
216208
holder.icon_state = "hud[ckey(wear_id.GetJobName())]"
217209
sec_hud_set_security_status()
218210

219-
var/turf/T = get_turf(src)
220-
if (T)
221-
GLOB.crewmonitor.queueUpdate(T.z)
222-
223211
/mob/living/carbon/human/proc/sec_hud_set_implants()
224212
var/image/holder
225213
for(var/i in list(IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD))

‎code/game/machinery/_machinery.dm‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -456,21 +456,6 @@ Class Procs:
456456
/obj/machinery/proc/on_deconstruction()
457457
return
458458

459-
// Hook for html_interface module to prevent updates to clients who don't have this as their active machine.
460-
/obj/machinery/proc/hiIsValidClient(datum/html_interface_client/hclient, datum/html_interface/hi)
461-
if (hclient.client.mob && (hclient.client.mob.stat == 0 || IsAdminGhost(hclient.client.mob)))
462-
if (isAI(hclient.client.mob) || IsAdminGhost(hclient.client.mob))
463-
return TRUE
464-
else
465-
return hclient.client.mob.machine == src && Adjacent(hclient.client.mob)
466-
else
467-
return FALSE
468-
469-
// Hook for html_interface module to unset the active machine when the window is closed by the player.
470-
/obj/machinery/proc/hiOnHide(datum/html_interface_client/hclient)
471-
if (hclient.client.mob && hclient.client.mob.machine == src)
472-
hclient.client.mob.unset_machine()
473-
474459
/obj/machinery/proc/can_be_overridden()
475460
. = 1
476461

‎code/game/machinery/camera/tracking.dm‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,14 @@
2020
switchCamera(cameras[camera])
2121

2222
/datum/trackable
23+
var/initialized = FALSE
2324
var/list/names = list()
2425
var/list/namecounts = list()
2526
var/list/humans = list()
2627
var/list/others = list()
2728

2829
/mob/living/silicon/ai/proc/trackable_mobs()
29-
30+
track.initialized = TRUE
3031
track.names.Cut()
3132
track.namecounts.Cut()
3233
track.humans.Cut()
@@ -63,6 +64,9 @@
6364
if(!target_name)
6465
return
6566

67+
if(!track.initialized)
68+
trackable_mobs()
69+
6670
var/mob/target = (isnull(track.humans[target_name]) ? track.others[target_name] : track.humans[target_name])
6771

6872
ai_actual_track(target)

‎code/game/machinery/computer/crew.css‎

Lines changed: 0 additions & 154 deletions
This file was deleted.

0 commit comments

Comments
 (0)