diff --git a/code/ATMOSPHERICS/atmospherics.dm b/code/ATMOSPHERICS/atmospherics.dm index e3bec5596c4..d745a48d89d 100644 --- a/code/ATMOSPHERICS/atmospherics.dm +++ b/code/ATMOSPHERICS/atmospherics.dm @@ -37,22 +37,22 @@ obj/machinery/atmospherics/proc/build_network() return null -return_network(obj/machinery/atmospherics/reference) +obj/machinery/atmospherics/proc/return_network(obj/machinery/atmospherics/reference) // Returns pipe_network associated with connection to reference // Notes: should create network if necessary // Should never return null return null -reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network) +obj/machinery/atmospherics/proc/reassign_network(datum/pipe_network/old_network, datum/pipe_network/new_network) // Used when two pipe_networks are combining -return_network_air(datum/network/reference) +obj/machinery/atmospherics/proc/return_network_air(datum/network/reference) // Return a list of gas_mixture(s) in the object // associated with reference pipe_network for use in rebuilding the networks gases list // Is permitted to return null - disconnect(obj/machinery/atmospherics/reference) +obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference) -update_icon() +obj/machinery/atmospherics/update_icon() return null \ No newline at end of file diff --git a/code/modules/mob/new_player/preferences.dm b/code/modules/mob/new_player/preferences.dm index ef849813471..ff257e76988 100644 --- a/code/modules/mob/new_player/preferences.dm +++ b/code/modules/mob/new_player/preferences.dm @@ -128,6 +128,8 @@ datum/preferences // OOC Metadata: var/metadata = "" + var/sound_adminhelp = 0 + New() hair_style = new/datum/sprite_accessory/hair/short @@ -261,9 +263,13 @@ datum/preferences if(config.allow_Metadata) dat += "OOC Notes: Edit
" - if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5)) - dat += "
OOC
" - dat += "Change colour
__
" + if((user.client) && (user.client.holder) && (user.client.holder.rank)) + dat += "
Adminhelp sound: " + dat += "[(sound_adminhelp)?"On":"Off"] toggle" + + if(user.client.holder.level >= 5) + dat += "
OOC
" + dat += "Change color
__
" dat += "
Occupation Choices
" dat += "\tSet Preferences
" @@ -869,6 +875,9 @@ datum/preferences if(ooccolor) src.ooccolor = ooccolor + if(link_tags["toggleadminhelpsound"]) + src.sound_adminhelp = !src.sound_adminhelp + if(link_tags["f_style"]) if(species != "Human") //Non-humans don't have hair stuff yet. return @@ -1169,6 +1178,7 @@ datum/preferences proc/setup_client(var/client/C) if(C) + C.sound_adminhelp = src.sound_adminhelp C.midis = src.midis C.ooccolor = src.ooccolor C.be_alien = be_special & BE_ALIEN diff --git a/code/modules/mob/new_player/savefile.dm b/code/modules/mob/new_player/savefile.dm index f0c4c3a6bd6..4cc787486ed 100644 --- a/code/modules/mob/new_player/savefile.dm +++ b/code/modules/mob/new_player/savefile.dm @@ -159,6 +159,8 @@ datum/preferences/proc/savefile_save(mob/user, slot) F["OOC_Notes"] << src.metadata + F["sound_adminhelp"] << src.sound_adminhelp + return 1 // loads the savefile corresponding to the mob's ckey @@ -264,6 +266,8 @@ datum/preferences/proc/savefile_load(mob/user, slot) F["OOC_Notes"] >> src.metadata + F["sound_adminhelp"] >> src.sound_adminhelp + if(isnull(metadata)) metadata = ""