cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

removes the test-merge only code from the combat mode commit (#56634)

Browse Source 
Co-authored-by: Mothblocks <35135081+Jared-Fogle@users.noreply.github.com>
This commit is contained in:
Qustinnus
2021-02-03 19:55:38 -08:00
committed by GitHub
co-authored by Mothblocks
parent 35fada74b2
commit 63399f90ee
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/melee/misc.dm
+1 -1
View File
@@ -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"
code/game/objects/items/stunbaton.dm
+2 -2
View File
@@ -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
code/modules/client/preferences.dm
-1
View File
@@ -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
code/modules/client/preferences_savefile.dm
+2 -6
View File
@@ -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]"
code/modules/mob/dead/new_player/login.dm
-3
View File
@@ -20,9 +20,6 @@
if(GLOB.admin_notice)
to_chat(src, "<span class='notice'><b>Admin Notice:</b>\n \t [GLOB.admin_notice]</span>")
to_chat(src, "<span class='notice'><b>Combat Mode Changes</b>\n \t</span>")
to_chat(src, "<span class='notice'><b>READ THIS PR BEFORE PLAYING TODAY:</b> https://github.com/tgstation/tgstation/pull/56601 \n \t</span>")
var/spc = CONFIG_GET(number/soft_popcap)
if(spc && living_player_count() >= spc)
to_chat(src, "<span class='notice'><b>Server Notice:</b>\n \t [CONFIG_GET(string/soft_popcap_message)]</span>")