Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SDQL2 bugfixes & features #271

Merged
merged 1 commit into from
Jun 2, 2024
Merged

SDQL2 bugfixes & features #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@

# Zonespace

/code/modules/gear_presets/survivors.dm @zonespace27
/code/modules/admin/verbs/SDQL2/ @Zonespace27

# MULTIPLE OWNERS
12 changes: 9 additions & 3 deletions code/controllers/subsystem/statpanel.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,17 +212,23 @@ SUBSYSTEM_DEF(statpanels)

/// Sets the current tab to the SDQL tab
/datum/controller/subsystem/statpanels/proc/set_SDQL2_tab(client/target)
if(!target)
return

var/list/sdql2_initial = list()
//sdql2_initial[length(sdql2_initial)++] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj))
sdql2_initial[++sdql2_initial.len] = list("", "Access Global SDQL2 List", REF(GLOB.sdql2_vv_statobj))
var/list/sdql2_querydata = list()
//for(var/datum/sdql2_query/query as anything in GLOB.sdql2_queries)
//sdql2_querydata = query.generate_stat()
for(var/datum/sdql2_query/query as anything in GLOB.sdql2_queries)
sdql2_querydata += query.generate_stat()

sdql2_initial += sdql2_querydata
target.stat_panel.send_message("update_sdql2", sdql2_initial)

///immediately update the active statpanel tab of the target client
/datum/controller/subsystem/statpanels/proc/immediate_send_stat_data(client/target)
if(!target)
return FALSE

if(!target.stat_panel.is_ready())
return FALSE

Expand Down
1 change: 1 addition & 0 deletions code/game/objects/effects/effect.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/obj/effect
icon = 'icons/effects/effects.dmi'
blocks_emissive = EMISSIVE_BLOCK_GENERIC

/obj/effect/get_applying_acid_time()
return -1
Loading
Loading