Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bleeding-edge-freeze

code/modules/admin/verbs/adminpm.dm

@@ -72,7 +72,7 @@
 		if(!msg)	return
 
 	var/recieve_color = "purple"
-	var/send_pm_type = ""
+	var/send_pm_type = " "
 	var/recieve_pm_type = "Player"
 
 
@@ -84,7 +84,7 @@
 				recieve_color = "maroon"
 			else
 				recieve_color = "red"
-			send_pm_type = holder.rank
+			send_pm_type = holder.rank + " "
 			recieve_pm_type = holder.rank
 
 	else if(!C.holder)
@@ -111,7 +111,7 @@
 
 	recieve_message = "<font color='[recieve_color]'>[recieve_pm_type] PM from-<b>[key_name(src, C, C.holder ? 1 : 0)]</b>: [msg]</font>"
 	C << recieve_message
-	src << "<font color='blue'>[send_pm_type] PM to-<b>[key_name(C, src, holder ? 1 : 0)]</b>: [msg]</font>"
+	src << "<font color='blue'>[send_pm_type]PM to-<b>[key_name(C, src, holder ? 1 : 0)]</b>: [msg]</font>"
 
 	/*if(holder && !C.holder)
 		C.last_pm_recieved = world.time

code/modules/admin/verbs/debug.dm

@@ -553,6 +553,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		"blue wizard",
 		"red wizard",
 		"marisa wizard",
+		"emergency rescue team",
 		)
 	var/dresscode = input("Select dress for [M]", "Robust quick dress shop") as null|anything in dresspacks
 	if (isnull(dresscode))

code/modules/events/event_dynamic.dm

@@ -36,10 +36,21 @@
 
 	// Maps event names to event chances
 	// For each chance, 100 represents "normal likelihood", anything below 100 is "reduced likelihood", anything above 100 is "increased likelihood"
+	// Events have to be manually added to this proc to happen
 	var/list/possibleEvents = list()
 
-	// Check for additional possible events
-	possibleEvents[/datum/event/economic_event] = 100	//see Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm
+	//see:
+	// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events.dm
+	// Code/WorkInProgress/Cael_Aislinn/Economy/Economy_Events_Mundane.dm
+	possibleEvents[/datum/event/economic_event] = 200
+	possibleEvents[/datum/event/trivial_news] = 300
+	possibleEvents[/datum/event/mundane_news] = 200
+
+	possibleEvents[/datum/event/pda_spam] = max(min(25, player_list.len) * 4, 200)
+	possibleEvents[/datum/event/money_lotto] = max(min(5, player_list.len), 50)
+	if(account_hack_attempted)
+		possibleEvents[/datum/event/money_hacker] = max(min(25, player_list.len) * 4, 200)
+
 	possibleEvents[/datum/event/carp_migration] = 50 + 50 * active_with_role["Engineer"]
 	possibleEvents[/datum/event/brand_intelligence] = 50 + 25 * active_with_role["Janitor"]
 
@@ -167,7 +178,7 @@
 	active_with_role["Janitor"] = 0
 
 	for(var/mob/M in player_list)
-		if(!M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive
+		if(!M.mind || !M.client || M.client.inactivity > 10 * 10 * 60) // longer than 10 minutes AFK counts them as inactive
 			continue
 
 		if(istype(M, /mob/living/silicon/robot) && M:module && M:module.name == "engineering robot module")

code/modules/events/event_manager.dm

@@ -2,8 +2,8 @@ var/list/allEvents = typesof(/datum/event) - /datum/event
 var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event
 //var/list/potentialRandomEvents = typesof(/datum/event) - /datum/event - /datum/event/spider_infestation - /datum/event/alien_infestation
 
-var/eventTimeLower = 15000	//15 minutes
-var/eventTimeUpper = 30000	//30 minutes
+var/eventTimeLower = 10000	//15 minutes
+var/eventTimeUpper = 25000	//30 minutes
 var/scheduledEvent = null
 
 

code/modules/events/money_hacker.dm

@@ -0,0 +1,120 @@
+/var/global/account_hack_attempted = 0
+
+/datum/event/money_hacker
+	endWhen = 10000
+	var/time_duration = 0
+	var/time_start = 0
+	var/datum/money_account/affected_account
+	var/obj/machinery/account_database/affected_db
+
+/datum/event/money_hacker/setup()
+	for(var/obj/machinery/account_database/DB in world)
+		if( DB.z == 1 && !(DB.stat&NOPOWER) && DB.activated && DB.accounts.len)
+			affected_db = DB
+			break
+	if(affected_db)
+		affected_account = pick(affected_db.accounts)
+	else
+		kill()
+		return
+
+	time_start = world.time
+	time_duration = rand(3000, 18000)
+	endWhen = time_duration * 10	//a big enough buffer so that we should timeout before we run out of ticks
+	account_hack_attempted = 1
+
+/datum/event/money_hacker/start()
+	return
+
+/datum/event/money_hacker/announce()
+	var/message = "A brute force hack has been detected (in progress since [worldtime2text()]). The target of the attack is: Financial account #[affected_account.account_number], \
+	without intervention this attack will succeed in [time_duration / 600] minutes. Required intervention: complete shutdown of affected accounts databases until the attack has ceased. \
+	Notifications will be sent as updates occur.<br>"
+	var/my_department = "[station_name()] firewall subroutines"
+	var/sending = message + "<font color='blue'><b>Message dispatched by [my_department].</b></font>"
+
+	var/pass = 0
+	for(var/obj/machinery/message_server/MS in world)
+		if(!MS.active) continue
+		// /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
+		MS.send_rc_message("Engineering/Security/Bridge", my_department, message, "", "", 2)
+		pass = 1
+
+	if(pass)
+		var/keyed_dpt1 = ckey("Engineering")
+		var/keyed_dpt2 = ckey("Security")
+		var/keyed_dpt3 = ckey("Bridge")
+		for (var/obj/machinery/requests_console/Console in allConsoles)
+			var/keyed_department = ckey(Console.department)
+			if(keyed_department == keyed_dpt1 || keyed_department == keyed_dpt2 || keyed_department == keyed_dpt3)
+				if(Console.newmessagepriority < 2)
+					Console.newmessagepriority = 2
+					Console.icon_state = "req_comp2"
+				if(!Console.silent)
+					playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
+					for (var/mob/O in hearers(5, Console.loc))
+						O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [my_department]'"))
+				Console.messages += "<B><FONT color='red'>High Priority message from [my_department]</FONT></B><BR>[sending]"
+
+/datum/event/money_hacker/tick()
+	if(world.time > time_start + time_duration)
+		var/message
+		if(affected_account && affected_db && affected_db.activated && !(affected_db.stat & (NOPOWER|BROKEN)) )
+			//hacker wins
+			message = "The hack attempt has succeeded."
+
+			//subtract the money
+			var/lost = affected_account.money * 0.8 + (rand(2,4) - 2) / 10
+			affected_account.money -= lost
+
+			//create a taunting log entry
+			var/datum/transaction/T = new()
+			T.target_name = pick("","yo brotha from anotha motha","el Presidente","chieF smackDowN")
+			T.purpose = pick("Ne$ ---ount fu%ds init*&lisat@*n","PAY BACK YOUR MUM","Funds withdrawal","pWnAgE","l33t hax","liberationez")
+			T.amount = pick("","([rand(0,99999)])","alla money","9001$","HOLLA HOLLA GET DOLLA","([lost])")
+			var/date1 = "31 December, 1999"
+			var/date2 = "[num2text(rand(1,31))] [pick("January","February","March","April","May","June","July","August","September","October","November","December")], [rand(1000,3000)]"
+			T.date = pick("", current_date_string, date1, date2)
+			var/time1 = rand(0, 99999999)
+			var/time2 = "[round(time1 / 36000)+12]:[(time1 / 600 % 60) < 10 ? add_zero(time1 / 600 % 60, 1) : time1 / 600 % 60]"
+			T.time = pick("", worldtime2text(), time2)
+			T.source_terminal = pick("","[pick("Biesel","New Gibson")] GalaxyNet Terminal #[rand(111,999)]","your mums place","nantrasen high CommanD")
+
+			affected_account.transaction_log.Add(T)
+
+		else
+			//crew wins
+			message = "The attack has ceased, the affected databases can now be brought online."
+
+		var/my_department = "[station_name()] firewall subroutines"
+		var/sending = message + "<font color='blue'><b>Message dispatched by [my_department].</b></font>"
+
+		var/pass = 0
+		for(var/obj/machinery/message_server/MS in world)
+			if(!MS.active) continue
+			// /obj/machinery/message_server/proc/send_rc_message(var/recipient = "",var/sender = "",var/message = "",var/stamp = "", var/id_auth = "", var/priority = 1)
+			MS.send_rc_message("Engineering/Security/Bridge", my_department, message, "", "", 2)
+			pass = 1
+
+		if(pass)
+			var/keyed_dpt1 = ckey("Engineering")
+			var/keyed_dpt2 = ckey("Security")
+			var/keyed_dpt3 = ckey("Bridge")
+			for (var/obj/machinery/requests_console/Console in allConsoles)
+				var/keyed_department = ckey(Console.department)
+				if(keyed_department == keyed_dpt1 || keyed_department == keyed_dpt2 || keyed_department == keyed_dpt3)
+					if(Console.newmessagepriority < 2)
+						Console.newmessagepriority = 2
+						Console.icon_state = "req_comp2"
+					if(!Console.silent)
+						playsound(Console.loc, 'sound/machines/twobeep.ogg', 50, 1)
+						for (var/mob/O in hearers(5, Console.loc))
+							O.show_message(text("\icon[Console] *The Requests Console beeps: 'PRIORITY Alert in [my_department]'"))
+					Console.messages += "<B><FONT color='red'>High Priority message from [my_department]</FONT></B><BR>[sending]"
+
+		kill()
+
+//shouldn't ever hit this, but this is here just in case
+/datum/event/money_hacker/end()
+	if(affected_account && affected_db)
+		endWhen += time_duration

code/modules/events/money_lotto.dm

@@ -0,0 +1,40 @@
+/datum/event/money_lotto
+	endWhen = 301
+	announceWhen = 300
+	var/winner_name = "John Smith"
+	var/winner_sum = 0
+	var/deposit_success = 0
+
+/datum/event/money_lotto/start()
+	winner_sum = pick(5000, 10000, 50000, 100000, 500000, 1000000, 1500000)
+	if(centcomm_account_db.accounts.len)
+		var/datum/money_account/D = pick(centcomm_account_db.accounts)
+		D.money += winner_sum
+
+		var/datum/transaction/T = new()
+		T.target_name = "Tau Ceti Daily Grand Slam -Stellar- Lottery"
+		T.purpose = "Winner!"
+		T.amount = winner_sum
+		T.date = current_date_string
+		T.time = worldtime2text()
+		T.source_terminal = "Biesel TCD Terminal #[rand(111,333)]"
+		D.transaction_log.Add(T)
+	else
+		kill()
+
+/datum/event/money_lotto/announce()
+	var/datum/feed_message/newMsg = new /datum/feed_message
+	newMsg.author = "NanoTrasen Editor"
+	newMsg.is_admin_message = 1
+
+	newMsg.body = "TC Daily wishes to congratulate <b>[winner_name]</b> for recieving the Tau Ceti Stellar Slam Lottery, and receiving the out of this world sum of [winner_sum] credits!"
+	if(!deposit_success)
+		newMsg.body += "<br>Unfortunately, we were unable to verify the account details provided, so we were unable to transfer the money. Send a cheque containing the sum of $500 to TCD 'Stellar Slam' office on Biesel Prime containing updated details, and it'll be resent within the month."
+
+	for(var/datum/feed_channel/FC in news_network.network_channels)
+		if(FC.channel_name == "Tau Ceti Daily")
+			FC.messages += newMsg
+			break
+
+	for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+		NEWSCASTER.newsAlert("Tau Ceti Daily")

code/modules/events/money_spam.dm

@@ -0,0 +1,102 @@
+/datum/event/pda_spam
+	endWhen = 6000
+	var/time_failed = 0
+	var/obj/machinery/message_server/useMS
+
+/datum/event/pda_spam/setup()
+	time_failed = world.time
+	for (var/obj/machinery/message_server/MS in message_servers)
+		if(MS.active)
+			useMS = MS
+			break
+
+/datum/event/pda_spam/tick()
+	if(!useMS.active)
+		useMS = null
+	if(!useMS && message_servers)
+		for (var/obj/machinery/message_server/MS in message_servers)
+			if(MS.active)
+				useMS = MS
+				break
+	if(useMS)
+		time_failed = world.time
+		if(prob(2))
+			// /obj/machinery/message_server/proc/send_pda_message(var/recipient = "",var/sender = "",var/message = "")
+			var/obj/item/device/pda/P
+			var/list/viables = list()
+			for(var/obj/item/device/pda/check_pda in sortAtom(PDAs))
+				if (!check_pda.owner||check_pda.toff||check_pda == src||check_pda.hidden)
+					continue
+				viables.Add(check_pda)
+
+			if(!viables.len)
+				return
+			P = pick(viables)
+
+			var/sender
+			var/message
+			switch(pick(1,2,3,4,5))
+				if(1)
+					sender = pick("MaxBet","MaxBet Online Casino","There is no better time to register","I'm excited for you to join us")
+					message = pick("Triple deposits are waiting for you at MaxBet Online when you register to play with us.",\
+					"You can qualify for a 200% Welcome Bonus at MaxBet Online when you sign up today.",\
+					"Once you are a player with MaxBet, you will also receive lucrative weekly and monthly promotions.",\
+					"You will be able to enjoy over 450 top-flight casino games at MaxBet.")
+				if(2)
+					sender = pick(300;"QuickDatingSystem",200;"Find your russian bride",50;"Tajaran beauties are waiting",50;"Find your secret skrell crush",50;"Beautiful unathi brides")
+					message = pick("Your profile caught my attention and I wanted to write and say hello (QuickDating).",\
+					"If you will write to me on my email [pick(first_names_female)]@[pick(last_names)].[pick("ru","ck","tj","ur","nt")] I shall necessarily send you a photo (QuickDating).",\
+					"I want that we write each other and I hope, that you will like my profile and you will answer me (QuickDating).",\
+					"You have (1) new message!",\
+					"You have (2) new profile views!")
+				if(3)
+					sender = pick("Galactic Payments Association","Better Business Bureau","Tau Ceti E-Payments","NAnoTransen Finance Deparmtent","Luxury Replicas")
+					message = pick("Luxury watches for Blowout sale prices!",\
+					"Watches, Jewelry & Accessories, Bags & Wallets !",\
+					"Deposit 100$ and get 300$ totally free!",\
+					" 100K NT.|WOWGOLD õnly $89            <HOT>",\
+					"We have been filed with a complaint from one of your customers in respect of their business relations with you.",\
+					"We kindly ask you to open the COMPLAINT REPORT (attached) to reply on this complaint..")
+				if(4)
+					sender = pick("Buy Dr. Maxman","Having dysfuctional troubles?")
+					message = pick("DR MAXMAN: REAL Doctors, REAL Science, REAL Results!",\
+					"Dr. Maxman was created by George Acuilar, M.D, a CentComm Certified Urologist who has treated over 70,000 patients sector wide with 'male problems'.",\
+					"After seven years of research, Dr Acuilar and his team came up with this simple breakthrough male enhancement formula.",\
+					"Men of all species report AMAZING increases in length, width and stamina.")
+				if(5)
+					sender = pick("Dr","Crown prince","King Regent","Professor","Captain")
+					sender += " " + pick("Robert","Alfred","Josephat","Kingsley","Sehi","Zbahi")
+					sender += " " + pick("Mugawe","Nkem","Gbatokwia","Nchekwube","Ndim","Ndubisi")
+					message = pick("YOUR FUND HAS BEEN MOVED TO [pick("Salusa","Segunda","Cepheus","Andromeda","Gruis","Corona","Aquila","Asellus")] DEVELOPMENTARY BANK FOR ONWARD REMITTANCE.",\
+					"We are happy to inform you that due to the delay, we have been instructed to IMMEDIATELY deposit all funds into your account",\
+					"Dear fund beneficiary, We have please to inform you that overdue funds payment has finally been approved and released for payment",\
+					"Due to my lack of agents I require an off-world financial account to immediately deposit the sum of 1 POINT FIVE MILLION credits.",\
+					"Greetings sir, I regretfully to inform you that as I lay dying here due to my lack ofheirs I have chosen you to recieve the full sum of my lifetime savings of 1.5 billion credits")
+
+			useMS.send_pda_message("[P.owner]", sender, message)
+
+			if (prob(50)) //Give the AI an increased chance to intercept the message
+				for(var/mob/living/silicon/ai/ai in mob_list)
+					// Allows other AIs to intercept the message but the AI won't intercept their own message.
+					if(ai.aiPDA != P && ai.aiPDA != src)
+						ai.show_message("<i>Intercepted message from <b>[sender]</b></i> (Unknown / spam?) <i>to <b>[P:owner]</b>: [message]</i>")
+
+			P.tnote += "<i><b>&larr; From [sender] (Unknown / spam?):</b></i><br>[message]<br>"
+
+			if (!P.silent)
+				playsound(P.loc, 'sound/machines/twobeep.ogg', 50, 1)
+			for (var/mob/O in hearers(3, P.loc))
+				if(!P.silent) O.show_message(text("\icon[P] *[P.ttone]*"))
+			//Search for holder of the PDA.
+			var/mob/living/L = null
+			if(P.loc && isliving(P.loc))
+				L = P.loc
+			//Maybe they are a pAI!
+			else
+				L = get(P, /mob/living/silicon)
+
+			if(L)
+				L << "\icon[P] <b>Message from [sender] (Unknown / spam?), </b>\"[message]\" (Unable to Reply)"
+	else if(world.time > time_failed + 1200)
+		//if there's no server active for two minutes, give up
+		kill()

code/modules/mob/living/carbon/human/emote.dm

@@ -596,3 +596,10 @@
 	set category = "IC"
 
 	pose =  copytext(sanitize(input(usr, "This is [src]. \He is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)
+
+/mob/living/carbon/human/verb/set_flavor()
+	set name = "Set Flavour Text"
+	set desc = "Sets an extended description of your character's features."
+	set category = "IC"
+
+	flavor_text =  copytext(sanitize(input(usr, "Please enter your new flavour text.", "Flavour text", null)  as text), 1)

code/modules/mob/living/silicon/robot/examine.dm

@@ -32,5 +32,12 @@
 		if(DEAD)			msg += "<span class='deadsay'>It looks completely unsalvageable.</span>\n"
 	msg += "*---------*</span>"
 
+	if(print_flavor_text()) msg += "[print_flavor_text()]\n"
+
+	if (pose)
+		if( findtext(pose,".",lentext(pose)) == 0 && findtext(pose,"!",lentext(pose)) == 0 && findtext(pose,"?",lentext(pose)) == 0 )
+			pose = addtext(pose,".") //Makes sure all emotes end with a period.
+		msg += "\nIt is [pose]"
+
 	usr << msg
 	return

code/modules/mob/living/silicon/robot/robot.dm

@@ -54,13 +54,13 @@
 	var/speed = 0 //Cause sec borgs gotta go fast //No they dont!
 	var/scrambledcodes = 0 // Used to determine if a borg shows up on the robotics console.  Setting to one hides them.
 	var/braintype = "Cyborg"
+	var/pose
 
 /mob/living/silicon/robot/New(loc,var/syndie = 0)
 	spark_system = new /datum/effect/effect/system/spark_spread()
 	spark_system.set_up(5, 0, src)
 	spark_system.attach(src)
 
-
 	ident = rand(1, 999)
 	updatename("Default")
 	updateicon()
@@ -101,7 +101,6 @@
 
 	playsound(loc, 'sound/voice/liveagain.ogg', 75, 1)
 
-
 //If there's an MMI in the robot, have it ejected when the mob goes away. --NEO
 //Improved /N
 /mob/living/silicon/robot/Del()
@@ -208,6 +207,18 @@
 	real_name = changed_name
 	name = real_name
 
+/mob/living/silicon/robot/verb/Namepick()
+	if(custom_name)
+		return 0
+
+	var/newname
+	newname = input(src,"You are a robot. Enter a name, or leave blank for the default name.", "Name change","") as text
+	if (newname != "")
+		custom_name = newname
+
+	updatename("Default")
+	updateicon()
+
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
 	set category = "Robot Commands"
 	set name = "Show Alerts"
@@ -424,9 +435,23 @@
 
 	else if (istype(W, /obj/item/weapon/crowbar))	// crowbar means open or close the cover
 		if(opened)
-			user << "You close the cover."
-			opened = 0
-			updateicon()
+			if(cell)
+				user << "You close the cover."
+				opened = 0
+				updateicon()
+			else if(mmi && wiresexposed && isWireCut(1) && isWireCut(2) && isWireCut(3) && isWireCut(4) && isWireCut(5))
+				//Cell is out, wires are exposed, remove MMI, produce damaged chassis, baleet original mob.
+				user << "You jam the crowbar into the robot and begin levering [mmi]."
+				sleep(30)
+				user << "You damage some parts of the chassis, but eventually manage to rip out [mmi]!"
+				var/obj/item/robot_parts/robot_suit/C = new/obj/item/robot_parts/robot_suit(loc)
+				C.l_leg = new/obj/item/robot_parts/l_leg(C)
+				C.r_leg = new/obj/item/robot_parts/r_leg(C)
+				C.l_arm = new/obj/item/robot_parts/l_arm(C)
+				C.r_arm = new/obj/item/robot_parts/r_arm(C)
+				C.updateicon()
+				new/obj/item/robot_parts/chest(loc)
+				src.Del()
 		else
 			if(locked)
 				user << "The cover is locked and cannot be opened."
@@ -767,24 +792,8 @@
 	overlays.Cut()
 	if(stat == 0)
 		overlays += "eyes"
-		if(icon_state == "robot")
-			overlays.Cut()
-			overlays += "eyes-standard"
-		if(icon_state == "toiletbot")
-			overlays.Cut()
-			overlays += "eyes-toiletbot"
-		if(icon_state == "bloodhound")
-			overlays.Cut()
-			overlays += "eyes-bloodhound"
-		if(icon_state =="landmate")
-			overlays.Cut()
-			overlays += "eyes-landmate"
-		if(icon_state =="mopgearrex")
-			overlays.Cut()
-			overlays += "eyes-mopgearrex"
-		if(icon_state =="Miner" || icon_state =="Miner+j")
-			overlays.Cut()
-			overlays += "eyes-Miner"
+		overlays.Cut()
+		overlays += "eyes-[icon_state]"
 	else
 		overlays -= "eyes"
 
@@ -986,4 +995,17 @@
 		W.attack_self(src)
 
 	return
-
+
+/mob/living/silicon/robot/verb/pose()
+	set name = "Set Pose"
+	set desc = "Sets a description which will be shown when someone examines you."
+	set category = "IC"
+
+	pose =  copytext(sanitize(input(usr, "This is [src]. It is...", "Pose", null)  as text), 1, MAX_MESSAGE_LEN)
+
+/mob/living/silicon/robot/verb/set_flavor()
+	set name = "Set Flavour Text"
+	set desc = "Sets an extended description of your character's features."
+	set category = "IC"
+
+	flavor_text =  copytext(sanitize(input(usr, "Please enter your new flavour text.", "Flavour text", null)  as text), 1)

code/modules/mob/living/simple_animal/friendly/mouse.dm

@@ -34,12 +34,19 @@
 		for(var/mob/M in view())
 			M << 'sound/effects/mousesqueek.ogg'
 
-	if(prob(0.5) && stat == CONSCIOUS)
+	if(!ckey && stat == CONSCIOUS && prob(0.5))
 		stat = UNCONSCIOUS
 		icon_state = "mouse_[color]_sleep"
-	if(stat == UNCONSCIOUS && prob(1))
-		stat = CONSCIOUS
-		icon_state = "mouse_[color]"
+		wander = 0
+		speak_chance = 0
+		//snuffles
+	else if(stat == UNCONSCIOUS)
+		if(ckey || prob(1))
+			stat = CONSCIOUS
+			icon_state = "mouse_[color]"
+			wander = 1
+		else if(prob(5))
+			emote("snuffles")
 
 /mob/living/simple_animal/mouse/New()
 	..()

code/modules/mob/new_player/new_player.dm

@@ -196,15 +196,11 @@
 			new_player_panel()
 
 		if(href_list["showpoll"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			handle_player_polling()
 			return
 
 		if(href_list["pollid"])
-			usr << "\red DB usage has been disabled and that option should not have been available."
-			return
 
 			var/pollid = href_list["pollid"]
 			if(istext(pollid))

code/modules/mob/transform_procs.dm

@@ -170,6 +170,7 @@
 	O.mmi = new /obj/item/device/mmi(O)
 	O.mmi.transfer_identity(src)//Does not transfer key/client.
 
+	O.Namepick()
 
 	spawn(0)//To prevent the proc from returning null.
 		del(src)

code/modules/reagents/Chemistry-Reagents-Antidepressants.dm

@@ -31,8 +31,8 @@ Methylphenidate
 	result_amount = 3
 
 /datum/reagent/antidepressant/citalopram
-	name = "citalopram"
-	id = "Citalopram"
+	name = "Citalopram"
+	id = "citalopram"
 	description = "Stabilizes the mind a little."
 	reagent_state = LIQUID
 	color = "#C8A5DC"
@@ -60,8 +60,8 @@ Methylphenidate
 
 
 /datum/reagent/antidepressant/paroxetine
-	name = "paroxetine"
-	id = "Paroxetine"
+	name = "Paroxetine"
+	id = "paroxetine"
 	description = "Stabilizes the mind greatly, but has a chance of adverse effects."
 	reagent_state = LIQUID
 	color = "#C8A5DC"

code/modules/reagents/Chemistry-Reagents.dm

@@ -1979,21 +1979,21 @@ datum
 							return
 						else if ( mouth_covered )	// Reduced effects if partially protected
 							victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
-							victim.eye_blurry = max(M.eye_blurry, 3)
-							victim.eye_blind = max(M.eye_blind, 1)
+							victim.eye_blurry = max(M.eye_blurry, 15)
+							victim.eye_blind = max(M.eye_blind, 5)
 							victim.Paralyse(1)
 							victim.drop_item()
 							return
 						else if ( eyes_covered ) // Eye cover is better than mouth cover
 							victim << "\red Your [safe_thing] protects your eyes from the pepperspray!"
 							victim.emote("scream")
-							victim.eye_blurry = max(M.eye_blurry, 1)
+							victim.eye_blurry = max(M.eye_blurry, 5)
 							return
 						else // Oh dear :D
 							victim.emote("scream")
 							victim << "\red You're sprayed directly in the eyes with pepperspray!"
-							victim.eye_blurry = max(M.eye_blurry, 5)
-							victim.eye_blind = max(M.eye_blind, 2)
+							victim.eye_blurry = max(M.eye_blurry, 25)
+							victim.eye_blind = max(M.eye_blind, 10)
 							victim.Paralyse(1)
 							victim.drop_item()