From 63399f90eefe4bde6bf870fc571b80d60cdda9d0 Mon Sep 17 00:00:00 2001 From: Qustinnus Date: Thu, 4 Feb 2021 04:55:38 +0100 Subject: [PATCH] removes the test-merge only code from the combat mode commit (#56634) Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com> --- code/game/objects/items/melee/misc.dm | 2 +- code/game/objects/items/stunbaton.dm | 4 ++-- code/modules/client/preferences.dm | 1 - code/modules/client/preferences_savefile.dm | 8 ++------ code/modules/mob/dead/new_player/login.dm | 3 --- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index a90379987ae..0357d439e41 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -173,7 +173,7 @@ /obj/item/melee/classic_baton name = "police baton" - desc = "A wooden truncheon for beating criminal scum." + desc = "A wooden truncheon for beating criminal scum. Left click to stun, right click to harm." icon = 'icons/obj/items_and_weapons.dmi' icon_state = "classic_baton" inhand_icon_state = "classic_baton" diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm index 018142bb62c..47dfad099f2 100644 --- a/code/game/objects/items/stunbaton.dm +++ b/code/game/objects/items/stunbaton.dm @@ -1,6 +1,6 @@ /obj/item/melee/baton name = "stun baton" - desc = "A stun baton for incapacitating people with. Left click to harm, right click to stun." + desc = "A stun baton for incapacitating people with. Left click to stun, right click to harm." icon_state = "stunbaton" inhand_icon_state = "baton" @@ -279,7 +279,7 @@ //Makeshift stun baton. Replacement for stun gloves. /obj/item/melee/baton/cattleprod name = "stunprod" - desc = "An improvised stun baton. Left click to harm, right click to stun." + desc = "An improvised stun baton. Left click to stun, right click to harm." icon_state = "stunprod" inhand_icon_state = "prod" worn_icon_state = null diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 7832ecf37b1..a8fbede4466 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -4,7 +4,6 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/client/parent //doohickeys for savefiles var/path - var/save_path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used var/max_save_slots = 3 diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm index d2ef18a8362..67bc9520345 100644 --- a/code/modules/client/preferences_savefile.dm +++ b/code/modules/client/preferences_savefile.dm @@ -137,11 +137,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car /datum/preferences/proc/load_path(ckey,filename="preferences.sav") if(!ckey) return - if(fexists("data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]")) - path = "data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]" - return path = "data/player_saves/[ckey[1]]/[ckey]/[filename]" - save_path = "data/player_saves/combat_test/[ckey[1]]/[ckey]/[filename]" /datum/preferences/proc/load_preferences() if(!path) @@ -281,7 +277,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car /datum/preferences/proc/save_preferences() if(!path) return FALSE - var/savefile/S = new /savefile() + var/savefile/S = new /savefile(path) if(!S) return FALSE S.cd = "/" @@ -503,7 +499,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car /datum/preferences/proc/save_character() if(!path) return FALSE - var/savefile/S = new /savefile(save_path) + var/savefile/S = new /savefile(path) if(!S) return FALSE S.cd = "/character[default_slot]" diff --git a/code/modules/mob/dead/new_player/login.dm b/code/modules/mob/dead/new_player/login.dm index 35c509c6f74..19aa1525057 100644 --- a/code/modules/mob/dead/new_player/login.dm +++ b/code/modules/mob/dead/new_player/login.dm @@ -20,9 +20,6 @@ if(GLOB.admin_notice) to_chat(src, "Admin Notice:\n \t [GLOB.admin_notice]") - to_chat(src, "Combat Mode Changes\n \t") - to_chat(src, "READ THIS PR BEFORE PLAYING TODAY: https://github.com/tgstation/tgstation/pull/56601 \n \t") - var/spc = CONFIG_GET(number/soft_popcap) if(spc && living_player_count() >= spc) to_chat(src, "Server Notice:\n \t [CONFIG_GET(string/soft_popcap_message)]")