rej cleanup
This commit is contained in:
LetterJay
@@ -1,10 +0,0 @@
|
||||
diff a/code/controllers/configuration.dm b/code/controllers/configuration.dm (rejected hunks)
|
||||
@@ -777,7 +767,7 @@
|
||||
if("mice_roundstart")
|
||||
mice_roundstart = text2num(value)
|
||||
else
|
||||
- GLOB.diary << "Unknown setting in configuration: '[name]'"
|
||||
+ GLOB.world_game_log << "Unknown setting in configuration: '[name]'"
|
||||
|
||||
fps = round(fps)
|
||||
if(fps <= 0)
|
||||
@@ -1,10 +0,0 @@
|
||||
diff a/code/controllers/subsystem/blackbox.dm b/code/controllers/subsystem/blackbox.dm (rejected hunks)
|
||||
@@ -41,7 +41,7 @@ SUBSYSTEM_DEF(blackbox)
|
||||
msg_service = SSblackbox.msg_service
|
||||
msg_cargo = SSblackbox.msg_cargo
|
||||
msg_other = SSblackbox.msg_other
|
||||
-
|
||||
+
|
||||
feedback = SSblackbox.feedback
|
||||
|
||||
//no touchie
|
||||
@@ -1,62 +0,0 @@
|
||||
diff a/code/modules/admin/admin_investigate.dm b/code/modules/admin/admin_investigate.dm (rejected hunks)
|
||||
@@ -1,50 +1,20 @@
|
||||
-//By Carnwennan
|
||||
-
|
||||
-//This system was made as an alternative to all the in-game lists and variables used to log stuff in-game.
|
||||
-//lists and variables are great. However, they have several major flaws:
|
||||
-//Firstly, they use memory. TGstation has one of the highest memory usage of all the ss13 branches.
|
||||
-//Secondly, they are usually stored in an object. This means that they aren't centralised. It also means that
|
||||
-//the data is lost when the object is deleted! This is especially annoying for things like the singulo engine!
|
||||
-#define INVESTIGATE_DIR "data/investigate/"
|
||||
-
|
||||
-//SYSTEM
|
||||
-/proc/investigate_subject2file(subject)
|
||||
- return file("[INVESTIGATE_DIR][subject].html")
|
||||
-
|
||||
-/proc/investigate_reset()
|
||||
- if(fdel(INVESTIGATE_DIR))
|
||||
- return 1
|
||||
- return 0
|
||||
-
|
||||
-/atom/proc/investigate_log(message, subject)
|
||||
- if(!message)
|
||||
- return
|
||||
- var/F = investigate_subject2file(subject)
|
||||
- if(!F)
|
||||
+atom/proc/investigate_log(message, subject)
|
||||
+ if(!message || !subject)
|
||||
return
|
||||
+ var/F = file("[GLOB.log_directory]/[subject].html")
|
||||
F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
|
||||
|
||||
-//ADMINVERBS
|
||||
/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "kudzu") )
|
||||
set name = "Investigate"
|
||||
set category = "Admin"
|
||||
if(!holder)
|
||||
return
|
||||
switch(subject)
|
||||
- if("singulo", "wires", "telesci", "gravity", "records", "cargo", "supermatter", "atmos", "botany") //general one-round-only stuff
|
||||
- var/F = investigate_subject2file(subject)
|
||||
- if(!F)
|
||||
- to_chat(src, "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>")
|
||||
- return
|
||||
- src << browse(F,"window=investigate[subject];size=800x300")
|
||||
- if("hrefs") //persistent logs and stuff
|
||||
- if(GLOB.href_logfile)
|
||||
- src << browse(GLOB.href_logfile,"window=investigate[subject];size=800x300")
|
||||
- else if(!config.log_hrefs)
|
||||
- to_chat(src, "<span class='danger'>Href logging is off and no logfile was found.</span>")
|
||||
- return
|
||||
- else
|
||||
- to_chat(src, "<span class='danger'>No href logfile was found.</span>")
|
||||
- return
|
||||
if("notes, memos, watchlist")
|
||||
browse_messages()
|
||||
+ else
|
||||
+ var/F = file("[GLOB.log_directory]/[subject].html")
|
||||
+ if(!fexists(F))
|
||||
+ to_chat(src, "<span class='danger'>No [subject] logfile was found.</span>")
|
||||
+ return
|
||||
+ src << browse(F,"window=investigate[subject];size=800x300")
|
||||
\ No newline at end of file
|
||||
@@ -1,20 +0,0 @@
|
||||
diff a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm (rejected hunks)
|
||||
@@ -4,18 +4,12 @@ GLOBAL_PROTECT(admin_verbs_default)
|
||||
GLOBAL_LIST_INIT(admin_verbs_default, world.AVerbsDefault())
|
||||
/world/proc/AVerbsDefault()
|
||||
return list(
|
||||
- /client/proc/toggleadminhelpsound, /*toggles whether we hear a sound when adminhelps/PMs are used*/
|
||||
- /client/proc/toggleannouncelogin, /*toggles if an admin's login is announced during a round*/
|
||||
/client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/
|
||||
/client/proc/cmd_admin_say, /*admin-only ooc chat*/
|
||||
/client/proc/hide_verbs, /*hides all our adminverbs*/
|
||||
/client/proc/hide_most_verbs, /*hides all our hideable adminverbs*/
|
||||
/client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game. +VAREDIT needed to modify*/
|
||||
- /client/proc/deadchat, /*toggles deadchat on/off*/
|
||||
/client/proc/dsay, /*talk in deadchat using our ckey/fakekey*/
|
||||
- /client/proc/toggleprayers, /*toggles prayers on/off*/
|
||||
- /client/verb/toggleprayersounds, /*Toggles prayer sounds (HALLELUJAH!)*/
|
||||
- /client/proc/toggle_hear_radio, /*toggles whether we hear the radio*/
|
||||
/client/proc/investigate_show, /*various admintools for investigation. Such as a singulo grief-log*/
|
||||
/client/proc/secrets,
|
||||
/client/proc/reload_admins,
|
||||
@@ -1,28 +0,0 @@
|
||||
diff a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm (rejected hunks)
|
||||
@@ -328,6 +328,26 @@ GLOBAL_LIST(external_rsc_urls)
|
||||
if(!tooltips)
|
||||
tooltips = new /datum/tooltip(src)
|
||||
|
||||
+ var/list/topmenus = GLOB.menulist[/datum/menu]
|
||||
+ for (var/thing in topmenus)
|
||||
+ var/datum/menu/topmenu = thing
|
||||
+ var/topmenuname = "[topmenu]"
|
||||
+ if (topmenuname == "[topmenu.type]")
|
||||
+ var/list/tree = splittext(topmenuname, "/")
|
||||
+ topmenuname = tree[tree.len]
|
||||
+ winset(src, "[topmenu.type]", "parent=menu;name=[url_encode(topmenuname)]")
|
||||
+ var/list/entries = topmenu.Generate_list(src)
|
||||
+ for (var/child in entries)
|
||||
+ winset(src, "[url_encode(child)]", "[entries[child]]")
|
||||
+ if (!ispath(child, /datum/menu))
|
||||
+ var/atom/verb/verbpath = child
|
||||
+ if (copytext(verbpath.name,1,2) != "@")
|
||||
+ new child(src)
|
||||
+
|
||||
+ for (var/thing in prefs.menuoptions)
|
||||
+ var/datum/menu/menuitem = GLOB.menulist[thing]
|
||||
+ if (menuitem)
|
||||
+ menuitem.Load_checked(src)
|
||||
|
||||
//////////////
|
||||
//DISCONNECT//
|
||||
@@ -1,18 +0,0 @@
|
||||
diff a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm (rejected hunks)
|
||||
@@ -102,6 +102,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
|
||||
var/uplink_spawn_loc = UPLINK_PDA
|
||||
|
||||
+ var/list/menuoptions
|
||||
+
|
||||
/datum/preferences/New(client/C)
|
||||
parent = C
|
||||
custom_names["ai"] = pick(GLOB.ai_names)
|
||||
@@ -124,6 +126,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
|
||||
if(!loaded_preferences_successfully)
|
||||
save_preferences()
|
||||
save_character() //let's save this new random character so it doesn't keep generating new ones.
|
||||
+ menuoptions = list()
|
||||
return
|
||||
|
||||
|
||||
@@ -1,38 +0,0 @@
|
||||
diff a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm (rejected hunks)
|
||||
@@ -1,5 +1,5 @@
|
||||
//This is the lowest supported version, anything below this is completely obsolete and the entire savefile will be wiped.
|
||||
-#define SAVEFILE_VERSION_MIN 10
|
||||
+#define SAVEFILE_VERSION_MIN 15
|
||||
|
||||
//This is the current version, anything below this will attempt to update (if it's not obsolete)
|
||||
#define SAVEFILE_VERSION_MAX 17
|
||||
@@ -156,12 +137,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["tgui_fancy"] >> tgui_fancy
|
||||
S["tgui_lock"] >> tgui_lock
|
||||
S["windowflash"] >> windowflashing
|
||||
+ S["be_special"] >> be_special
|
||||
|
||||
- if(islist(S["be_special"]))
|
||||
- S["be_special"] >> be_special
|
||||
- else //force update and store the old bitflag version of be_special
|
||||
- needs_update = 11
|
||||
- S["be_special"] >> old_be_special
|
||||
|
||||
S["default_slot"] >> default_slot
|
||||
S["chat_toggles"] >> chat_toggles
|
||||
@@ -177,6 +154,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["uses_glasses_colour"]>> uses_glasses_colour
|
||||
S["clientfps"] >> clientfps
|
||||
S["parallax"] >> parallax
|
||||
+ S["menuoptions"] >> menuoptions
|
||||
|
||||
//try to fix any outdated data if necessary
|
||||
if(needs_update >= 0)
|
||||
@@ -235,6 +216,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
|
||||
S["uses_glasses_colour"]<< uses_glasses_colour
|
||||
S["clientfps"] << clientfps
|
||||
S["parallax"] << parallax
|
||||
+ S["menuoptions"] << menuoptions
|
||||
|
||||
return 1
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
diff a/code/world.dm b/code/world.dm (rejected hunks)
|
||||
@@ -346,7 +346,3 @@
|
||||
|
||||
/world/proc/has_round_started()
|
||||
return SSticker.HasRoundStarted()
|
||||
-
|
||||
-/world/proc/load_menu()
|
||||
- for (var/typepath in (typesof(/datum/menu)-/datum/menu))
|
||||
- new typepath()
|
||||
Reference in New Issue
Block a user