mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 12:08:55 +01:00
Merge branch 'master' of https://github.com/tgstation/tgstation into upstream-sync
This commit is contained in:
@@ -35,10 +35,19 @@
|
||||
qdel(src)
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/cat
|
||||
theme_name = CAT_THEME_NAME
|
||||
theme_name = PDA_THEME_CAT_NAME
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/lightmode
|
||||
theme_name = LIGHT_THEME_NAME
|
||||
theme_name = PDA_THEME_LIGHT_MODE_NAME
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/spooky
|
||||
theme_name = ELDRITCH_THEME_NAME
|
||||
theme_name = PDA_THEME_SPOOKY_NAME
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/hacker
|
||||
theme_name = PDA_THEME_HACKERMAN_NAME
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/roulette
|
||||
theme_name = PDA_THEME_ROULETTE_NAME
|
||||
|
||||
/datum/computer_file/program/maintenance/theme/alien
|
||||
theme_name = PDA_THEME_ABDUCTOR_NAME
|
||||
|
||||
@@ -16,7 +16,7 @@
|
||||
var/list/data = list()
|
||||
|
||||
if(computer.obj_flags & EMAGGED)
|
||||
data["themes"] += list(list("theme_name" = SYNDICATE_THEME_NAME, "theme_ref" = GLOB.pda_name_to_theme[SYNDICATE_THEME_NAME]))
|
||||
data["themes"] += list(list("theme_name" = PDA_THEME_SYNDICATE_NAME, "theme_ref" = GLOB.pda_name_to_theme[PDA_THEME_SYNDICATE_NAME]))
|
||||
for(var/theme_key in GLOB.default_pda_themes + imported_themes)
|
||||
data["themes"] += list(list("theme_name" = theme_key, "theme_ref" = GLOB.pda_name_to_theme[theme_key]))
|
||||
|
||||
|
||||
Reference in New Issue
Block a user