From f3ae9b6251977da9a9bfb627b56c8a8373911ca4 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 26 Mar 2016 06:41:55 +0200 Subject: [PATCH 1/8] Fixes #238 --- code/modules/admin/admin_verbs.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index cb35bd0de5c..2cc351424aa 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -9,6 +9,7 @@ var/list/admin_verbs_default = list( /client/proc/cmd_mentor_check_new_players ) var/list/admin_verbs_admin = list( + /client/proc/debug_variables, /*allows us to -see- the variables of any instance in the game.*/ /client/proc/player_panel_new, /*shows an interface for all players, with links to various panels*/ /client/proc/invisimin, /*allows our mob to go invisible/visible*/ // /datum/admins/proc/show_traitor_panel, /*interface which shows a mob's mind*/ -Removed due to rare practical use. Moved to debug verbs ~Errorage From 11dbb71978c52da7c27c6d5fe096a5c318548b2e Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 27 Mar 2016 16:35:14 +0300 Subject: [PATCH 2/8] Fixes #241 Stop coding at 3AM, kids. --- code/game/machinery/adv_med.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/machinery/adv_med.dm b/code/game/machinery/adv_med.dm index 69e061bfde7..851150f0c5d 100644 --- a/code/game/machinery/adv_med.dm +++ b/code/game/machinery/adv_med.dm @@ -7,7 +7,7 @@ name = "Body Scanner" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scanner_0" - density = 0 + density = 1 anchored = 1 use_power = 1 @@ -200,7 +200,7 @@ name = "Body Scanner Console" icon = 'icons/obj/Cryogenic2.dmi' icon_state = "body_scannerconsole" - density = 1 + density = 0 anchored = 1 From a04676eddcd4fea9e23b55ccc5497335ed8cf93f Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 2 Apr 2016 22:14:36 +0300 Subject: [PATCH 3/8] Fixes Two Nar'sies No more spawning 2 Nar'sies in one go by accident. --- code/game/gamemodes/cult/runes.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 3b2345c1be7..2eb1bb72b34 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -200,6 +200,9 @@ var/list/sacrificed = list() if(cultists.len >= 9) log_and_message_admins_many(cultists, "summoned Nar-sie.") new /obj/singularity/narsie/large(src.loc) + + // Can't summon a singular entity twice. + cult.allow_narsie = 0 return else return fizzle() From 61744e18e8161955c83f0f8781ed80f36fbeb106 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 2 Apr 2016 22:30:45 +0300 Subject: [PATCH 4/8] Aghost requires R_MOD or R_ADMIN --- code/modules/mob/dead/observer/observer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 0008640c9f6..41ed12bcc6d 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -169,7 +169,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp announce_ghost_joinleave(ghostize(1)) else var/response - if(src.client && src.client.holder) + if(check_rights((R_MOD|R_ADMIN), 0)) response = alert(src, "You have the ability to Admin-Ghost. The regular Ghost verb will announce your presence to dead chat. Both variants will allow you to return to your body using 'aghost'.\n\nWhat do you wish to do?", "Are you sure you want to ghost?", "Ghost", "Admin Ghost", "Stay in body") if(response == "Admin Ghost") if(!src.client) From 7d21c400cf0ee8d0ec36f8a172c66b2216b9a877 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sat, 2 Apr 2016 23:38:18 +0300 Subject: [PATCH 5/8] Fix World Status Now displays fun things. --- code/world.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/world.dm b/code/world.dm index 6148324b93b..cadea22a796 100644 --- a/code/world.dm +++ b/code/world.dm @@ -589,9 +589,9 @@ var/world_topic_spam_protect_time = world.timeofday s += "[station_name()]"; s += " (" - s += "" //Change this to wherever you want the hub to link to. + s += "" //Change this to wherever you want the hub to link to. // s += "[game_version]" - s += "Default" //Replace this with something else. Or ever better, delete it and uncomment the game version. + s += "Forums" //Replace this with something else. Or ever better, delete it and uncomment the game version. s += "" s += ")" From fb8d293b429af426fd54440205e65799388494df Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 3 Apr 2016 01:45:26 +0300 Subject: [PATCH 6/8] Sec records cabinets no longer emit light Fixes #248 --- code/game/machinery/computer/security.dm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 92e03f01851..819d0020ce2 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -614,3 +614,6 @@ What a mess.*/ /obj/machinery/computer/secure_data/detective_computer icon = 'icons/obj/computer.dmi' icon_state = "messyfiles" + + light_range_on = 0 + light_power_on = 0 From c01a919316dea16ba98a3af9ab7067c53fd3da2f Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 3 Apr 2016 16:02:55 +0300 Subject: [PATCH 7/8] Cryopod timer halved --- code/game/machinery/cryopod.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index 2da0496848f..f250f350f21 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -181,7 +181,7 @@ var/mob/occupant = null // Person waiting to be despawned. var/orient_right = null // Flips the sprite. - var/time_till_despawn = 18000 // 30 minutes-ish safe period before being despawned. + var/time_till_despawn = 9000 // 15 minutes-ish safe period before being despawned. var/time_entered = 0 // Used to keep track of the safe period. var/obj/item/device/radio/intercom/announce // From 3f1c460632dbec7066a8322fb5b601acd2724689 Mon Sep 17 00:00:00 2001 From: skull132 Date: Sun, 3 Apr 2016 20:03:32 +0300 Subject: [PATCH 8/8] Fix dbcon.IsConnected() runtimes Passes an empty DBConnection object whenever no config exists. This way, you don't need the config to be defined to run the server without runtime spam. --- code/world.dm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/code/world.dm b/code/world.dm index cadea22a796..587e6bb49de 100644 --- a/code/world.dm +++ b/code/world.dm @@ -654,11 +654,17 @@ var/world_topic_spam_protect_time = world.timeofday /proc/initialize_database_object(var/filename) if (!filename) - return 0 + // The code is written in a manner that is spasses out whenever dbcon = null, so we just make a dummy DB object. + return new/DBConnection() var/list/data = list("address", "port", "database", "login", "password") var/list/Lines = file2list(filename) + + if (!Lines) + // Return dummy object for safety. + return new/DBConnection() + for (var/t in Lines) if (!t) continue @@ -684,11 +690,6 @@ var/world_topic_spam_protect_time = world.timeofday else log_misc("Unknown setting while setting up database connection. Filename: '[filename]', value: '[value]'.") - //Validate the data before proceeding. - for (var/d in data) - if (!data[d] || data[d] == null) - return 0 - return new/DBConnection(data["address"], data["port"], data["database"], data["login"], data["password"]) /proc/setup_database_connection(var/DBConnection/con)