Merge branch 'master' of https://github.com/Baystation12/Baystation12

code/modules/mining/mine_items.dm

@@ -266,7 +266,8 @@ proc/move_mining_shuttle()
 /*****************************Shovel********************************/
 
 /obj/item/weapon/shovel
-	name = "Shovel"
+	name = "shovel"
+	desc = "A large tool for digging and moving dirt."
 	icon = 'items.dmi'
 	icon_state = "shovel"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -278,11 +279,14 @@ proc/move_mining_shuttle()
 	m_amt = 50
 	origin_tech = "materials=1;engineering=1"
 
-
-
-
-
-
+/obj/item/weapon/shovel/spade
+	name = "spade"
+	desc = "A small tool for digging and moving dirt."
+	icon_state = "spade"
+	item_state = "spade"
+	force = 5.0
+	throwforce = 7.0
+	w_class = 2.0
 
 
 /**********************Mining car (Crate like thing, not the rail car)**************************/

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 += "<b>OOC Notes:</b> <a href='byond://?src=\ref[user];preferences=1;OOC=input'> Edit </a><br>"
 
-		if((user.client) && (user.client.holder) && (user.client.holder.rank) && (user.client.holder.level >= 5))
-			dat += "<hr><b>OOC</b><br>"
-			dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change colour</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font>"
+		if((user.client) && (user.client.holder) && (user.client.holder.rank))
+			dat += "<hr><b>Adminhelp sound</b>: "
+			dat += "[(sound_adminhelp)?"On":"Off"] <a href='byond://?src=\ref[user];preferences=1;toggleadminhelpsound=1'>toggle</a>"
+
+			if(user.client.holder.level >= 5)
+				dat += "<hr><b>OOC</b><br>"
+				dat += "<a href='byond://?src=\ref[user];preferences=1;ooccolor=input'>Change color</a> <font face=\"fixedsys\" size=\"3\" color=\"[ooccolor]\"><table style='display:inline;'  bgcolor=\"[ooccolor]\"><tr><td>__</td></tr></table></font>"
 
 		dat += "<hr><b>Occupation Choices</b><br>"
 		dat += "\t<a href=\"byond://?src=\ref[user];preferences=1;occ=1\"><b>Set Preferences</b></a><br>"
@@ -875,6 +881,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
@@ -1175,6 +1184,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

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 = ""