Merge remote-tracking branch 'upstream/dev' into APC

code/modules/admin/admin.dm

@@ -281,7 +281,7 @@ var/global/floorIsLava = 0
 				I.rank = "N/A"
 				update_file = 1
 			dat += "<font color=#008800>[I.content]</font> <i>by [I.author] ([I.rank])</i> on <i><font color=blue>[I.timestamp]</i></font> "
-			if(I.author == usr.key || I.author == "Adminbot")
+			if(I.author == usr.key || I.author == "Adminbot" || ishost(usr))
 				dat += "<A href='?src=\ref[src];remove_player_info=[key];remove_index=[i]'>Remove</A>"
 			dat += "<br><br>"
 		if(update_file) info << infos
@@ -1141,9 +1141,25 @@ var/global/floorIsLava = 0
 		if(2)
 			var/ref_mob = "\ref[M]"
 			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=holder;adminmoreinfo=[ref_mob]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=[ref_mob]'>PP</A>) (<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=[ref_mob]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>) (<A HREF='?_src_=holder;check_antagonist=1'>CA</A>)</b>"
+		if(3)
+			var/ref_mob = "\ref[M]"
+			return "<b>[key_name(C, link, name, highlight_special)](<A HREF='?_src_=vars;Vars=[ref_mob]'>VV</A>)(<A HREF='?_src_=holder;adminplayerobservejump=[ref_mob]'>JMP</A>)</b>"
 
 
-
+/proc/ishost(whom)
+	if(!whom)
+		return 0
+	var/client/C
+	var/mob/M
+	if(istype(whom, /client))
+		C = whom
+	if(istype(whom, /mob))
+		M = whom
+		C = M.client
+	if(R_HOST & C.holder.rights)
+		return 1
+	else
+		return 0
 //
 //
 //ALL DONE

code/modules/admin/admin_ranks.dm

@@ -37,7 +37,7 @@ var/list/admin_ranks = list()								//list of all ranks with associated rights
 				if("stealth")					rights |= R_STEALTH
 				if("rejuv","rejuvinate")		rights |= R_REJUVINATE
 				if("varedit")					rights |= R_VAREDIT
-				if("everything","host","all")	rights |= R_HOST
+				if("everything","host","all")	rights |= (R_HOST | R_BUILDMODE | R_ADMIN | R_BAN | R_FUN | R_SERVER | R_DEBUG | R_PERMISSIONS | R_POSSESS | R_STEALTH | R_REJUVINATE | R_VAREDIT | R_SOUNDS | R_SPAWN | R_MOD| R_MENTOR)
 				if("sound","sounds")			rights |= R_SOUNDS
 				if("spawn","create")			rights |= R_SPAWN
 				if("mod")						rights |= R_MOD

code/modules/admin/verbs/adminhelp.dm

@@ -3,7 +3,7 @@
 //This is a list of words which are ignored by the parser when comparing message contents for names. MUST BE IN LOWER CASE!
 var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","alien","as")
 
-/client/verb/adminhelp(msg as text)
+/client/verb/adminhelp()
 	set category = "Admin"
 	set name = "Adminhelp"
 
@@ -15,8 +15,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(prefs.muted & MUTE_ADMINHELP)
 		src << "<font color='red'>Error: Admin-PM: You cannot send adminhelps (Muted).</font>"
 		return
-	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
-		return
+
 
 	adminhelped = 1 //Determines if they get the message to reply by clicking the name.
 
@@ -26,6 +25,17 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps
 		src.verbs += /client/verb/adminhelp	// 2 minute cool-down for adminhelps//Go to hell
 	**/
+	var/msg
+	var/list/type = list ("Gameplay/Roleplay question", "Rule/Gameplay issue", "Bug report")
+	var/selected_type = input("Pick a category.", "Admin Help", null, null) as null|anything in type
+	if(selected_type)
+		msg = input("Please enter your message:", "Admin Help", null, null) as text
+
+	var/selected_upper = uppertext(selected_type)
+
+	if(src.handle_spam_prevention(msg,MUTE_ADMINHELP))
+		return
+
 
 	//clean the input msg
 	if(!msg)	return
@@ -33,7 +43,7 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(!msg)	return
 	var/original_msg = msg
 
-	
+
 
 	//explode the input msg into a list
 	var/list/msglist = text2list(msg, " ")
@@ -91,11 +101,68 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 	if(!mob)	return						//this doesn't happen
 
 	var/ref_mob = "\ref[mob]"
-	var/mentor_msg = "\blue <b><font color=red>HELP: </font>[get_options_bar(mob, 2, 1, 1, 0)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
-	msg = "\blue <b><font color=red>HELP: </font>[get_options_bar(mob, 2, 1, 1)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
-	//send this msg to all admins
+	var/mentor_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 0, 0, 1, 0)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
+	var/dev_msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 3, 0, 1, 0)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
+	msg = "\blue <b><font color=red>[selected_upper]: </font>[get_options_bar(mob, 2, 1, 1)][ai_found ? " (<A HREF='?_src_=holder;adminchecklaws=[ref_mob]'>CL</A>)" : ""]:</b> [msg]"
+
+
+
 	var/admin_number_afk = 0
+
+	var/list/mentorholders = list()
+	var/list/debugholders = list()
+	var/list/adminholders = list()
 	for(var/client/X in admins)
+		if(R_MENTOR & X.holder.rights && !(R_ADMIN & X.holder.rights)) // we don't want to count admins twice. This list should be JUST mentors
+			mentorholders += X
+			if(X.is_afk())
+				admin_number_afk++
+		if(R_DEBUG & X.holder.rights) // Looking for anyone with +Debug which will be admins, developers, and developer mentors
+			debugholders += X
+			if(!(R_ADMIN & X.holder.rights))
+				if(X.is_afk())
+					admin_number_afk++
+		if(R_ADMIN & X.holder.rights) // just admins here please
+			adminholders += X
+			if(X.is_afk())
+				admin_number_afk++
+
+	switch(selected_type)
+		if("Gameplay/Roleplay question")
+			if(mentorholders.len)
+				for(var/client/X in mentorholders) // Mentors get a message without buttons and no character name
+					if(X.prefs.toggles & SOUND_ADMINHELP)
+						X << 'sound/effects/adminhelp.ogg'
+					X << mentor_msg
+			if(adminholders.len)
+				for(var/client/X in adminholders) // Admins get the full monty
+					if(X.prefs.toggles & SOUND_ADMINHELP)
+						X << 'sound/effects/adminhelp.ogg'
+					X << msg
+		if("Rule/Gameplay issue")
+			if(adminholders.len)
+				for(var/client/X in adminholders) // Admins of course get everything in their helps
+					if(X.prefs.toggles & SOUND_ADMINHELP)
+						X << 'sound/effects/adminhelp.ogg'
+					X << msg
+		if("Bug report")
+			if(debugholders.len)
+				for(var/client/X in debugholders)
+					if(R_ADMIN & X.holder.rights) // Admins get every button & special highlights in theirs
+						if(X.prefs.toggles & SOUND_ADMINHELP)
+							X << 'sound/effects/adminhelp.ogg'
+						X << msg
+					else
+						if (R_DEBUG & X.holder.rights) // Just devs or devmentors get non-highlighted names, but they do get JMP and VV for their bug reports.
+							if(X.prefs.toggles & SOUND_ADMINHELP)
+								X << 'sound/effects/adminhelp.ogg'
+						X << dev_msg
+
+
+
+
+
+	/*for(var/client/X in admins)
 		if((R_ADMIN|R_MOD|R_MENTOR) & X.holder.rights)
 			if(X.is_afk())
 				admin_number_afk++
@@ -104,19 +171,19 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
 			if(X.holder.rights == R_MENTOR)
 				X << mentor_msg		// Mentors won't see coloring of names on people with special_roles (Antags, etc.)
 			else
-				X << msg
+				X << msg*/
 
 	//show it to the person adminhelping too
-	src << "<font color='blue'>PM to-<b>Admins</b>: [original_msg]</font>"
+	src << "<font color='blue'>PM to-<b>Staff ([selected_type])</b>: [original_msg]</font>"
 
 	var/admin_number_present = admins.len - admin_number_afk
 	log_admin("HELP: [key_name(src)]: [original_msg] - heard by [admin_number_present] non-AFK admins.")
 	if(admin_number_present <= 0)
 		if(!admin_number_afk)
-			send2adminirc("ADMINHELP from [key_name(src)]: [html_decode(original_msg)] - !!No admins online!!")
+			send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)] - !!No admins online!!")
 		else
-			send2adminirc("ADMINHELP from [key_name(src)]: [html_decode(original_msg)] - !!All admins AFK ([admin_number_afk])!!")
+			send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)] - !!All admins AFK ([admin_number_afk])!!")
 	else
-		send2adminirc("ADMINHELP from [key_name(src)]: [html_decode(original_msg)]")
+		send2adminirc("[selected_upper] from [key_name(src)]: [html_decode(original_msg)]")
 	feedback_add_details("admin_verb","AH") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 	return

code/modules/admin/verbs/adminpm.dm

@@ -43,7 +43,7 @@
 
 	if(!istype(C,/client))
 		if(holder)	src << "<font color='red'>Error: Private-Message: Client not found.</font>"
-		else		adminhelp(msg)	//admin we are replying to left. adminhelp instead
+		else		src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
 		return
 
 	//get message text, limit it's length.and clean/escape html
@@ -53,7 +53,7 @@
 		if(!msg)	return
 		if(!C)
 			if(holder)	src << "<font color='red'>Error: Admin-PM: Client not found.</font>"
-			else		adminhelp(msg)	//admin we are replying to has vanished, adminhelp instead
+			else		src << "<font color='red'>Error: Private-Message: Client not found. They may have lost connection, so try using an adminhelp!</font>"
 			return
 
 	if (src.handle_spam_prevention(msg,MUTE_ADMINHELP))
@@ -78,7 +78,7 @@
 			else
 				recieve_color = "maroon"
 			send_pm_type = holder.rank + " "
-			if(!C.holder && holder && holder.fakekey) 
+			if(!C.holder && holder && holder.fakekey)
 				recieve_pm_type = "Admin"
 			else
 				recieve_pm_type = holder.rank

code/modules/admin/verbs/adminsay.dm

@@ -9,8 +9,12 @@
 
 	log_admin("[key_name(src)] : [msg]")
 
+	var/color = "adminsay"
+	if(ishost(usr))
+		color = "headminsay"
+
 	if(check_rights(R_ADMIN,0))
-		msg = "<span class='adminsay'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> (<a href='?_src_=holder;adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
+		msg = "<span class='[color]'><span class='prefix'>ADMIN:</span> <EM>[key_name(usr, 1)]</EM> (<a href='?_src_=holder;adminplayerobservejump=\ref[mob]'>JMP</A>): <span class='message'>[msg]</span></span>"
 		for(var/client/C in admins)
 			if(R_ADMIN & C.holder.rights)
 				C << msg

code/modules/admin/verbs/atmosdebug.dm

@@ -6,7 +6,7 @@
 		src << "Only administrators may use this command."
 		return
 	feedback_add_details("admin_verb","CP") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-	
+
 	if(alert("WARNING: This command should not be run on a live server. Do you want to continue?", "Check Piping", "No", "Yes") == "No")
 		return
 
@@ -30,11 +30,12 @@
 	next_turf:
 		for(var/turf/T in world)
 			for(var/dir in cardinal)
-				var/check = 0
+				var/list/connect_types = list(1 = 0, 2 = 0, 3 = 0)
 				for(var/obj/machinery/atmospherics/pipe in T)
 					if(dir & pipe.initialize_directions)
-						check++
-						if(check > 1)
+						for(var/connect_type in pipe.connect_types)
+							connect_types[connect_type] += 1
+						if(connect_types[1] > 1 || connect_types[2] > 1 || connect_types[3] > 1)
 							usr << "Overlapping pipe ([pipe.name]) located at [T.x],[T.y],[T.z] ([get_area(T)])"
 							continue next_turf
 	usr << "Done"

code/modules/admin/verbs/pray.dm

@@ -20,8 +20,9 @@
 	msg = "\blue \icon[cross] <b><font color=purple>PRAY: </font>[key_name(src, 1)] (<A HREF='?_src_=holder;adminmoreinfo=\ref[src]'>?</A>) (<A HREF='?_src_=holder;adminplayeropts=\ref[src]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[src]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[src]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[src]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;adminspawncookie=\ref[src]'>SC</a>):</b> [msg]"
 
 	for(var/client/C in admins)
-		if(C.prefs.toggles & CHAT_PRAYER)
-			C << msg
+		if(R_ADMIN & C.holder.rights)
+			if(C.prefs.toggles & CHAT_PRAYER)
+				C << msg
 	usr << "Your prayers have been received by the gods."
 
 	feedback_add_details("admin_verb","PR") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
@@ -30,9 +31,13 @@
 /proc/Centcomm_announce(var/text , var/mob/Sender , var/iamessage)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	msg = "\blue <b><font color=orange>CENTCOMM[iamessage ? " IA" : ""]:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
-	admins << msg
+	for(var/client/C in admins)
+		if(R_ADMIN & C.holder.rights)
+			C << msg
 
 /proc/Syndicate_announce(var/text , var/mob/Sender)
 	var/msg = copytext(sanitize(text), 1, MAX_MESSAGE_LEN)
 	msg = "\blue <b><font color=crimson>ILLEGAL:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) (<A HREF='?_src_=holder;adminplayerobservejump=\ref[Sender]'>JMP</A>) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
-	admins << msg
+	for(var/client/C in admins)
+		if(R_ADMIN & C.holder.rights)
+			C << msg

code/modules/customitems/item_defines.dm

@@ -358,7 +358,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/large/fluff/nashida_bishara_1 //rukral:Nashida Bisha'ra
 	name = "Nashida's Etched Beaker"
-	desc = "The message: 'Please do not be removing this beaker from the chemistry lab. If lost, return to Nashida Bisha'ra' can be seen etched into the side of this 100 unit beaker."
+	desc = "The message: 'Please do not be removing this beaker from the chemistry lab. If lost, return to Nashida Bisha'ra' can be seen etched into the side of this large beaker."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beakerlarge"
 	matter = list("glass" = 5000)
@@ -1412,3 +1412,86 @@
 	 desc = "This cane seems to have 'Ryals' engraved on its handle."
 	 icon_state = "cane"
 	 item_state = "stick"
+
+////////////////////////////// Foxler - Erstatz Vryroxes /////////////////////////////////////////////////
+
+/obj/item/weapon/holder/cat/fluff/bones
+	name = "Bones"
+	desc = "It's Bones! Meow."
+	gender = MALE
+	icon_state = "cat3"
+
+//Use this subtype for spawning in the custom item.
+/obj/item/weapon/holder/cat/fluff/bones/custom_item
+
+/obj/item/weapon/holder/cat/fluff/bones/custom_item/New()
+	if (!contents.len)
+		new/mob/living/simple_animal/cat/fluff/bones (src)
+	..()
+
+/mob/living/simple_animal/cat/fluff/bones
+	name = "Bones"
+	desc = "That's Bones the cat. He's a laid back, black cat. Meow."
+	gender = MALE
+	icon_state = "cat3"
+	icon_living = "cat3"
+	icon_dead = "cat3_dead"
+	holder_type = /obj/item/weapon/holder/cat/fluff/bones
+	bff_name = "Erstatz Vryroxes"
+
+/mob/living/simple_animal/cat/fluff
+	var/bff_name
+	var/mob/living/carbon/human/bff
+
+/mob/living/simple_animal/cat/fluff/handle_movement_target()
+	if (!bff)
+		for (var/mob/living/carbon/human/M in player_list)
+			if (M.real_name == bff_name)
+				bff = M
+				break
+
+	if (bff)
+		var/follow_dist = 5
+		if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit) //danger
+			follow_dist = 1
+		else if (bff.stat || bff.health <= 50) //danger or just sleeping
+			follow_dist = 2
+		var/near_dist = max(follow_dist - 3, 1)
+		var/current_dist = get_dist(src, bff)
+		
+		if (movement_target != bff)
+			if (current_dist > follow_dist && !istype(movement_target, /mob/living/simple_animal/mouse) && (bff in oview(src)))
+				//stop existing movement
+				walk_to(src,0)
+				turns_since_scan = 0
+
+				//walk to bff
+				stop_automated_movement = 1
+				movement_target = bff
+				walk_to(src, movement_target, near_dist, 4)
+		
+		//already following and close enough, stop
+		else if (current_dist <= near_dist)
+			walk_to(src,0)
+			movement_target = null
+			stop_automated_movement = 0
+
+	if (!(bff && movement_target == bff))
+		..()
+
+/mob/living/simple_animal/cat/fluff/Life()
+	..()
+	if (stat || !bff) 
+		return
+	if (get_dist(src, bff) <= 1)
+		if (bff.stat >= DEAD || bff.health <= config.health_threshold_softcrit)
+			if (prob((bff.stat < DEAD)? 50 : 15)) 
+				audible_emote(pick("meows in distress.", "meows anxiously."))
+		else
+			if (prob(5)) 
+				visible_emote(pick("nuzzles [bff].", 
+								   "brushes against [bff].",
+								   "rubs against [bff].",
+								   "purrs."))
+	else if (bff.health <= 50)
+		if (prob(10)) audible_emote("meows anxiously.")

code/modules/mob/emote.dm

@@ -1,4 +1,6 @@
 // All mobs should have custom emote, really..
+//m_type == 1 --> visual.
+//m_type == 2 --> audible
 /mob/proc/custom_emote(var/m_type=1,var/message = null)
 
 	if(stat || !use_me && usr == src)

code/modules/mob/hear_say.dm

@@ -8,7 +8,19 @@
 			//Does the speaker have a client?  It's either random stuff that observers won't care about (Experiment 97B says, 'EHEHEHEHEHEHEHE')
 			//Or someone snoring.  So we make it where they won't hear it.
 		return
-
+	
+	//make sure the air can transmit speech - hearer's side
+	var/turf/T = get_turf(src)
+	if (T)
+		var/datum/gas_mixture/environment = T.return_air()
+		var/pressure = (environment)? environment.return_pressure() : 0
+		if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)
+			return
+			
+		if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
+			italics = 1
+			sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact
+	
 	if(sleeping || stat == 1)
 		hear_sleep(message)
 		return

code/modules/mob/language.dm

@@ -230,7 +230,7 @@
 		if(drone_only && !istype(S,/mob/living/silicon/robot/drone))
 			continue
 		else if(istype(S , /mob/living/silicon/ai))
-			message_start = "<i><span class='game say'>[name], <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src];trackname=[html_encode(speaker.name)]'><span class='name'>[speaker.name]</span></a>"
+			message_start = "<i><span class='game say'>[name], <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[speaker];trackname=[html_encode(speaker.name)]'><span class='name'>[speaker.name]</span></a>"
 		else if (!S.binarycheck())
 			continue
 

code/modules/mob/living/carbon/alien/diona/diona.dm

@@ -19,6 +19,7 @@
 /mob/living/carbon/alien/diona/New()
 
 	..()
+	species = all_species["Diona"]
 	verbs += /mob/living/carbon/proc/eat_weeds
 	verbs += /mob/living/carbon/proc/fertilize_plant
 	verbs += /mob/living/carbon/alien/diona/proc/steal_blood

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

@@ -499,7 +499,8 @@
 			if (!( AM.anchored ))
 				var/t = get_dir(src, AM)
 				if (istype(AM, /obj/structure/window))
-					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+					var/obj/structure/window/W = AM
+					if(W.is_full_window())
 						for(var/obj/structure/window/win in get_step(AM,t))
 							now_pushing = 0
 							return

code/modules/mob/living/carbon/carbon_defines.dm

@@ -1,5 +1,6 @@
 /mob/living/carbon/
 	gender = MALE
+	var/datum/species/species //Contains icon generation and language information, set during New().
 	var/list/stomach_contents = list()
 	var/list/datum/disease2/disease/virus2 = list()
 	var/antibodies = 0

code/modules/mob/living/carbon/carbon_powers.dm

@@ -72,7 +72,12 @@
 
 	if(B.host_brain.ckey)
 		src << "\red <B>You send a punishing spike of psychic agony lancing into your host's brain.</B>"
-		B.host_brain << "\red <B><FONT size=3>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT></B>"
+
+		if (species && (species.flags & NO_PAIN))
+			B.host_brain << "\red You feel a strange sensation as a foreign influence prods your mind."
+			src << "\red <B>It doesn't seem to be as effective as you hoped.</B>"
+		else
+			B.host_brain << "\red <B><FONT size=3>Horrific, burning agony lances through you, ripping a soundless scream from your trapped mind!</FONT></B>"
 
 /mob/living/carbon/proc/spawn_larvae()
 	set category = "Abilities"

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

@@ -6,7 +6,6 @@
 	icon_state = "body_m_s"
 
 	var/list/hud_list[9]
-	var/datum/species/species //Contains icon generation and language information, set during New().
 	var/embedded_flag	  //To check if we've need to roll for damage on movement while an item is imbedded in us.
 
 /mob/living/carbon/human/New(var/new_loc, var/new_species = null)

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

@@ -351,7 +351,7 @@ This function restores all organs.
 
 	//Handle other types of damage
 	if((damagetype != BRUTE) && (damagetype != BURN))
-		if(damagetype == HALLOSS)
+		if(damagetype == HALLOSS && !(species && (species.flags & NO_PAIN)))
 			if ((damage > 25 && prob(20)) || (damage > 50 && prob(60)))
 				emote("scream")
 

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

@@ -17,7 +17,8 @@
 	var/health_deficiency = (100 - health)
 	if(health_deficiency >= 40) tally += (health_deficiency / 25)
 
-	if(halloss >= 10) tally += (halloss / 10)
+	if (!(species && (species.flags & NO_PAIN)))
+		if(halloss >= 10) tally += (halloss / 10) //halloss shouldn't slow you down if you can't even feel it
 
 	var/hungry = (500 - nutrition)/5 // So overeat would be 100 and default level would be 80
 	if (hungry >= 70) tally += hungry/50
@@ -55,8 +56,7 @@
 	if (bodytemperature < 283.222)
 		tally += (283.222 - bodytemperature) / 10 * 1.75
 
-	if(can_stand <= 1)
-		tally += 5 //hopping around on one foot is slow
+	tally += 2*stance_damage //damaged/missing feet or legs is slow
 
 	if(mRun in mutations)
 		tally = 0

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -147,7 +147,8 @@
 		if (!( AM.anchored ))
 			var/t = get_dir(src, AM)
 			if (istype(AM, /obj/structure/window))
-				if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+				var/obj/structure/window/W = AM
+				if(W.is_full_window())
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return

code/modules/mob/living/carbon/metroid/powers.dm

@@ -61,13 +61,15 @@
 			loc = M.loc
 
 			if(prob(15) && M.client && istype(M, /mob/living/carbon))
-				M << "<span class='danger'>[pick("You can feel your body becoming weak!", \
-				"You feel like you're about to die!", \
-				"You feel every part of your body screaming in agony!", \
-				"A low, rolling pain passes through your body!", \
-				"Your body feels as if it's falling apart!", \
-				"You feel extremely weak!", \
-				"A sharp, deep pain bathes every inch of your body!")]</span>"
+				var/mob/living/carbon/C = M
+				if (!(C.species && (C.species.flags & NO_PAIN)))
+					M << "<span class='danger'>[pick("You can feel your body becoming weak!", \
+					"You feel like you're about to die!", \
+					"You feel every part of your body screaming in agony!", \
+					"A low, rolling pain passes through your body!", \
+					"Your body feels as if it's falling apart!", \
+					"You feel extremely weak!", \
+					"A sharp, deep pain bathes every inch of your body!")]</span>"
 
 			if(istype(M, /mob/living/carbon))
 				Victim.adjustCloneLoss(rand(5,6))

code/modules/mob/living/carbon/monkey/monkey.dm

@@ -41,6 +41,9 @@
 	reagents = R
 	R.my_atom = src
 
+	species = all_species[greaterform]
+	add_language(species.language)
+
 	if(name == initial(name)) //To stop Pun-Pun becoming generic.
 		name = "[name] ([rand(1, 1000)])"
 		real_name = name
@@ -78,24 +81,22 @@
 
 /mob/living/carbon/monkey/unathi/New()
 
-	..()
 	dna.mutantrace = "lizard"
 	greaterform = "Unathi"
-	add_language("Sinta'unathi")
+	..()
 
 /mob/living/carbon/monkey/skrell/New()
 
-	..()
+	
 	dna.mutantrace = "skrell"
 	greaterform = "Skrell"
-	add_language("Skrellian")
+	..()
 
 /mob/living/carbon/monkey/tajara/New()
 
-	..()
 	dna.mutantrace = "tajaran"
 	greaterform = "Tajara"
-	add_language("Siik'tajr")
+	..()
 
 /mob/living/carbon/monkey/movement_delay()
 	var/tally = 0
@@ -287,4 +288,4 @@
 
         message = capitalize(trim_left(message))
 
-        ..(message, speaking, verb, alt_name, italics, message_range, used_radios)
+        ..(message, speaking, verb, alt_name, italics, message_range, used_radios)

code/modules/mob/living/living.dm

@@ -436,7 +436,8 @@
 				else
 					if (pulling)
 						if (istype(pulling, /obj/structure/window))
-							if(pulling:ini_dir == NORTHWEST || pulling:ini_dir == NORTHEAST || pulling:ini_dir == SOUTHWEST || pulling:ini_dir == SOUTHEAST)
+							var/obj/structure/window/W = pulling
+							if(W.is_full_window())
 								for(var/obj/structure/window/win in get_step(pulling,get_dir(pulling.loc, T)))
 									stop_pulling()
 					if (pulling)

code/modules/mob/living/say.dm

@@ -91,22 +91,21 @@ proc/get_radio_key_from_channel(var/channel)
 
 		if (speaking.flags & SIGNLANG)
 			return say_signlang(message, pick(speaking.signlang_verb), speaking)
-
-	//make sure the air can transmit speech
-	var/datum/gas_mixture/environment = T.return_air()
-	if(environment)
-		var/pressure = environment.return_pressure()
-		if(pressure < SOUND_MINIMUM_PRESSURE)
-			italics = 1
-			message_range = 1
-
-			if (speech_sound)
-				sound_vol *= 0.5	//muffle the sound a bit, so it's like we're actually talking through contact
-
+	
 	var/list/listening = list()
 	var/list/listening_obj = list()
 
 	if(T)
+		//make sure the air can transmit speech - speaker's side
+		var/datum/gas_mixture/environment = T.return_air()
+		var/pressure = (environment)? environment.return_pressure() : 0
+		if(pressure < SOUND_MINIMUM_PRESSURE)
+			message_range = 1
+		
+		if (pressure < ONE_ATMOSPHERE*0.4) //sound distortion pressure, to help clue people in that the air is thin, even if it isn't a vacuum yet
+			italics = 1
+			sound_vol *= 0.5 //muffle the sound a bit, so it's like we're actually talking through contact
+	
 		var/list/hear = hear(message_range, T)
 		var/list/hearturfs = list()
 

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

@@ -506,24 +506,7 @@ var/list/ai_verbs_default = list(
 		else
 			src << "\red System error. Cannot locate [html_decode(href_list["trackname"])]."
 		return
-
-	else if (href_list["faketrack"])
-		var/mob/target = locate(href_list["track"]) in mob_list
-		var/mob/living/silicon/ai/A = locate(href_list["track2"]) in mob_list
-		if(A && target)
-
-			A.cameraFollow = target
-			A << text("Now tracking [] on camera.", target.name)
-			if (usr.machine == null)
-				usr.machine = usr
-
-			while (src.cameraFollow == target)
-				usr << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
-				sleep(40)
-				continue
-
-		return
-
+		
 	return
 
 /mob/living/silicon/ai/meteorhit(obj/O as obj)

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

@@ -27,18 +27,22 @@
 	laws.clear_supplied_laws()
 
 /mob/living/silicon/proc/statelaws() // -- TLE
-	if(stating_laws)
-		src << "<span class='notice'>You are currently stating laws.</span>"
-		return
-	stating_laws = 1
-
 	var/prefix = ""
 	switch(lawchannel)
-		if(MAIN_CHANNEL) prefix = ";"	// Apparently defines are not constant expressions?
+		if(MAIN_CHANNEL) prefix = ";"
 		if("Binary") prefix = ":b "
 		else
 			prefix = get_radio_key_from_channel(lawchannel == "Holopad" ? "department" : lawchannel) + " "
 
+	dostatelaws(lawchannel, prefix)
+
+/mob/living/silicon/proc/dostatelaws(var/method, var/prefix)
+	if(stating_laws[prefix])
+		src << "<span class='notice'>[method]: Already stating laws using this communication method.</span>"
+		return
+
+	stating_laws[prefix] = 1
+
 	var/can_state = statelaw("[prefix]Current Active Laws:")
 
 	//src.laws_sanity_check()
@@ -71,9 +75,8 @@
 				number++
 
 	if(!can_state)
-		src << "<span class='danger'>Unable to state laws. Communication method unavailable.</span>"
-
-	stating_laws = 0
+		src << "<span class='danger'>[method]: Unable to state laws. Communication method unavailable.</span>"
+	stating_laws[prefix] = 0
 
 /mob/living/silicon/proc/statelaw(var/law)
 	if(src.say(law))
@@ -93,10 +96,7 @@
 
 	for (var/index = 1, index <= src.laws.ion.len, index++)
 		var/law = src.laws.ion[index]
-
 		if (length(law) > 0)
-
-
 			if (!src.ioncheck[index])
 				src.ioncheck[index] = "Yes"
 			list += {"<A href='byond://?src=\ref[src];lawi=[index]'>[src.ioncheck[index]] [ionnum()]:</A> [law]<BR>"}
@@ -105,10 +105,8 @@
 	var/number = 1
 	for (var/index = 1, index <= src.laws.inherent.len, index++)
 		var/law = src.laws.inherent[index]
-
 		if (length(law) > 0)
 			src.lawcheck.len += 1
-
 			if (!src.lawcheck[number+1])
 				src.lawcheck[number+1] = "Yes"
 			list += {"<A href='byond://?src=\ref[src];lawc=[number]'>[src.lawcheck[number+1]] [number]:</A> [law]<BR>"}

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

@@ -594,7 +594,8 @@ var/list/robot_verbs_default = list(
 			if (!AM.anchored)
 				var/t = get_dir(src, AM)
 				if (istype(AM, /obj/structure/window))
-					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+					var/obj/structure/window/W = AM
+					if(W.is_full_window())
 						for(var/obj/structure/window/win in get_step(AM,t))
 							now_pushing = 0
 							return

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

@@ -167,7 +167,7 @@
 	stacktypes = list(
 		/obj/item/stack/sheet/metal = 50,
 		/obj/item/stack/sheet/plasteel = 10,
-		/obj/item/stack/sheet/rglass = 50,
+		/obj/item/stack/sheet/glass/reinforced = 50,
 		/obj/item/stack/rods = 50
 		)
 
@@ -188,7 +188,7 @@
 	stacktypes = list(
 		/obj/item/stack/sheet/metal = 50,
 		/obj/item/stack/sheet/glass = 50,
-		/obj/item/stack/sheet/rglass = 50,
+		/obj/item/stack/sheet/glass/reinforced = 50,
 		/obj/item/stack/cable_coil = 50,
 		/obj/item/stack/rods = 15,
 		/obj/item/stack/tile/plasteel = 15
@@ -217,7 +217,7 @@
 		M.amount = 50
 		src.modules += M
 
-		var/obj/item/stack/sheet/rglass/cyborg/R = new /obj/item/stack/sheet/rglass/cyborg(src)
+		var/obj/item/stack/sheet/glass/reinforced/cyborg/R = new (src)
 		R.amount = 50
 		src.modules += R
 
@@ -400,7 +400,7 @@
 	stacktypes = list(
 		/obj/item/stack/sheet/wood = 1,
 		/obj/item/stack/sheet/mineral/plastic = 1,
-		/obj/item/stack/sheet/rglass = 5,
+		/obj/item/stack/sheet/glass/reinforced = 5,
 		/obj/item/stack/tile/wood = 5,
 		/obj/item/stack/rods = 15,
 		/obj/item/stack/tile/plasteel = 15,

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

@@ -6,9 +6,9 @@
 	var/list/additional_law_channels = list("State")
 	var/const/MAIN_CHANNEL = "Main Frequency"
 	var/lawchannel = MAIN_CHANNEL // Default channel on which to state laws
+	var/list/stating_laws = list()// Channels laws are currently being stated on
 	var/lawcheck[1]
 	var/ioncheck[1]
-	var/stating_laws = 0
 	var/obj/item/device/radio/common_radio
 
 	immune_to_ssd = 1

code/modules/mob/living/simple_animal/borer/borer.dm

@@ -7,8 +7,8 @@
 	speak_emote = list("chirrups")
 	emote_hear = list("chirrups")
 	response_help  = "pokes"
-	response_disarm = "prods the"
-	response_harm   = "stomps on the"
+	response_disarm = "prods"
+	response_harm   = "stomps on"
 	icon_state = "brainslug"
 	icon_living = "brainslug"
 	icon_dead = "brainslug_dead"

code/modules/mob/living/simple_animal/constructs.dm

@@ -79,7 +79,8 @@
 		if (!( AM.anchored ))
 			var/t = get_dir(src, AM)
 			if (istype(AM, /obj/structure/window))
-				if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+				var/obj/structure/window/W = AM
+				if(W.is_full_window())
 					for(var/obj/structure/window/win in get_step(AM,t))
 						now_pushing = 0
 						return

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

@@ -8,14 +8,14 @@
 	speak = list("Meow!","Esp!","Purr!","HSSSSS")
 	speak_emote = list("purrs", "meows")
 	emote_hear = list("meows","mews")
-	emote_see = list("shakes its head", "shivers")
+	emote_see = list("shakes their head", "shivers")
 	speak_chance = 1
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	var/turns_since_scan = 0
 	var/mob/living/simple_animal/mouse/movement_target
 	min_oxy = 16 //Require atleast 16kPA oxygen
@@ -27,40 +27,45 @@
 	//MICE!
 	if((src.loc) && isturf(src.loc))
 		if(!stat && !resting && !buckled)
-			for(var/mob/living/simple_animal/mouse/M in view(1,src))
+			for(var/mob/living/simple_animal/mouse/M in loc)
 				if(!M.stat)
 					M.splat()
-					emote(pick("\red splats the [M]!","\red toys with the [M]","worries the [M]"))
+					visible_emote(pick("bites \the [M]!","toys with \the [M].","chomps on \the [M]!"))
 					movement_target = null
 					stop_automated_movement = 0
 					break
 
 	..()
 
-	for(var/mob/living/simple_animal/mouse/snack in oview(src, 3))
-		if(prob(15))
-			emote(pick("hisses and spits!","mrowls fiercely!","eyes [snack] hungrily."))
+	for(var/mob/living/simple_animal/mouse/snack in oview(src,5))
+		if(snack.stat < DEAD && prob(15))
+			audible_emote(pick("hisses and spits!","mrowls fiercely!","eyes [snack] hungrily."))
 		break
 
 	if(!stat && !resting && !buckled)
-		turns_since_scan++
-		if(turns_since_scan > 5)
-			walk_to(src,0)
-			turns_since_scan = 0
-			if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
-				movement_target = null
-				stop_automated_movement = 0
-			if( !movement_target || !(movement_target.loc in oview(src, 3)) )
-				movement_target = null
-				stop_automated_movement = 0
-				for(var/mob/living/simple_animal/mouse/snack in oview(src,3))
-					if(isturf(snack.loc) && !snack.stat)
-						movement_target = snack
-						break
-			if(movement_target)
-				stop_automated_movement = 1
-				walk_to(src,movement_target,0,3)
+		handle_movement_target()
 
+/mob/living/simple_animal/cat/proc/handle_movement_target()
+	turns_since_scan++
+	if(turns_since_scan > 5)
+		walk_to(src,0)
+		turns_since_scan = 0
+		
+		if((movement_target) && !(isturf(movement_target.loc) || ishuman(movement_target.loc) ))
+			movement_target = null
+			stop_automated_movement = 0
+		if( !movement_target || !(movement_target.loc in oview(src, 4)) )
+			movement_target = null
+			stop_automated_movement = 0
+			for(var/mob/living/simple_animal/mouse/snack in oview(src))
+				if(isturf(snack.loc) && !snack.stat)
+					movement_target = snack
+					world << "[src]: mouse located."
+					break
+		if(movement_target)
+			world << "[src]: locking on [movement_target]"
+			stop_automated_movement = 1
+			walk_to(src,movement_target,0,3)
 
 /mob/living/simple_animal/cat/MouseDrop(atom/over_object)
 
@@ -73,10 +78,16 @@
 	else
 		return ..()
 
+/mob/living/simple_animal/cat/get_scooped(var/mob/living/carbon/grabber)
+	if (stat >= DEAD)
+		return //since the holder icon looks like a living cat
+	..()
+
 //RUNTIME IS ALIVE! SQUEEEEEEEE~
 /mob/living/simple_animal/cat/Runtime
 	name = "Runtime"
 	desc = "Her fur has the look and feel of velvet, and her tail quivers occasionally."
+	gender = FEMALE
 	icon_state = "cat"
 	icon_living = "cat"
 	icon_dead = "cat_dead"

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

@@ -14,9 +14,9 @@
 	turns_per_move = 10
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/corgi
 	meat_amount = 3
-	response_help  = "pets the"
-	response_disarm = "bops the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "bops"
+	response_harm   = "kicks"
 	see_in_dark = 5
 	var/obj/item/inventory_head
 	var/obj/item/inventory_back
@@ -58,7 +58,7 @@
 				for (var/mob/M in viewers(src, null))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
 			if(prob(15))
-				emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
+				visible_emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
 			return
 	..()
 
@@ -310,10 +310,10 @@
 					if(isturf(movement_target.loc) )
 						UnarmedAttack(movement_target)
 					else if(ishuman(movement_target.loc) && prob(20))
-						custom_emote(1,"stares at the [movement_target] that [movement_target.loc] has with sad puppy eyes.")
+						visible_emote("stares at the [movement_target] that [movement_target.loc] has with sad puppy eyes.")
 
 		if(prob(1))
-			emote(pick("dances around","chases its tail"))
+			visible_emote(pick("dances around","chases their tail"))
 			spawn(0)
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					dir = i
@@ -350,7 +350,8 @@
 			if (!( AM.anchored ))
 				var/t = get_dir(src, AM)
 				if (istype(AM, /obj/structure/window))
-					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+					var/obj/structure/window/W = AM
+					if(W.is_full_window())
 						for(var/obj/structure/window/win in get_step(AM,t))
 							now_pushing = 0
 							return
@@ -467,7 +468,7 @@
 
 
 		if(prob(1))
-			emote(pick("dances around","chases her tail"))
+			visible_emote(pick("dances around","chases her tail"))
 			spawn(0)
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					dir = i

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

@@ -12,9 +12,9 @@
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "stomps the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stomps"
 	stop_automated_movement = 1
 	friendly = "pinches"
 	var/obj/item/inventory_head

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

@@ -14,9 +14,9 @@
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	meat_amount = 4
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	faction = "goat"
 	attacktext = "kicked"
 	health = 40
@@ -99,9 +99,9 @@
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	meat_amount = 6
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	attacktext = "kicked"
 	health = 50
 	var/datum/reagents/udder = null
@@ -160,9 +160,9 @@
 	turns_per_move = 2
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	meat_amount = 1
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	attacktext = "kicked"
 	health = 1
 	var/amount_grown = 0
@@ -201,9 +201,9 @@ var/global/chicken_count = 0
 	turns_per_move = 3
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
 	meat_amount = 2
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	attacktext = "kicked"
 	health = 10
 	var/eggsleft = 0

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

@@ -1,7 +1,7 @@
 /mob/living/simple_animal/mouse
 	name = "mouse"
 	real_name = "mouse"
-	desc = "It's a small, disease-ridden rodent."
+	desc = "It's a small rodent."
 	icon_state = "mouse_gray"
 	icon_living = "mouse_gray"
 	icon_dead = "mouse_gray_dead"
@@ -17,9 +17,9 @@
 	maxHealth = 5
 	health = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "stamps on the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "stamps on"
 	density = 0
 	var/body_color //brown, gray and white, leave blank for random
 	layer = MOB_LAYER
@@ -47,7 +47,7 @@
 			icon_state = "mouse_[body_color]"
 			wander = 1
 		else if(prob(5))
-			emote("snuffles")
+			audible_emote("snuffles.")
 
 /mob/living/simple_animal/mouse/New()
 	..()
@@ -110,9 +110,6 @@
 /mob/living/simple_animal/mouse/brown/Tom
 	name = "Tom"
 	desc = "Jerry the cat is not amused."
-	response_help  = "pets"
-	response_disarm = "gently pushes aside"
-	response_harm   = "splats"
 
 /mob/living/simple_animal/mouse/can_use_vents()
 	return

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

@@ -10,7 +10,7 @@
 	maxHealth = 5
 	health = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "whacks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "whacks"
 	harm_intent_damage = 5

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

@@ -41,7 +41,8 @@
 			if (!( AM.anchored ))
 				var/t = get_dir(src, AM)
 				if (istype(AM, /obj/structure/window))
-					if(AM:ini_dir == NORTHWEST || AM:ini_dir == NORTHEAST || AM:ini_dir == SOUTHWEST || AM:ini_dir == SOUTHEAST)
+					var/obj/structure/window/W = AM
+					if(W.is_full_window())
 						for(var/obj/structure/window/win in get_step(AM,t))
 							now_pushing = 0
 							return

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

@@ -9,7 +9,7 @@
 	maxHealth = 15
 	health = 15
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/tomatomeat
-	response_help  = "prods the"
-	response_disarm = "pushes aside the"
-	response_harm   = "smacks the"
+	response_help  = "prods"
+	response_disarm = "pushes aside"
+	response_harm   = "smacks"
 	harm_intent_damage = 5

code/modules/mob/living/simple_animal/head.dm

@@ -12,9 +12,9 @@
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "punches the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "punches"
 	var/list/insults = list(
 	"Man you suck",
 	"You look like the most retarded douche around",

code/modules/mob/living/simple_animal/hostile/alien.dm

@@ -6,9 +6,9 @@
 	icon_living = "alienh_running"
 	icon_dead = "alien_l"
 	icon_gib = "syndicate_gib"
-	response_help = "pokes the"
-	response_disarm = "shoves the"
-	response_harm = "hits the"
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "hits"
 	speed = -1
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/xenomeat
 	maxHealth = 100

code/modules/mob/living/simple_animal/hostile/bear.dm

@@ -14,9 +14,9 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "pokes the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "pokes"
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 60
 	health = 60
@@ -90,7 +90,7 @@
 
 		if(HOSTILE_STANCE_ATTACKING)
 			if(stance_step >= 20)	//attacks for 20 ticks, then it gets tired and needs to rest
-				custom_emote(1, "is worn out and needs to rest" )
+				custom_emote(1, "is worn out and needs to rest." )
 				stance = HOSTILE_STANCE_TIRED
 				stance_step = 0
 				walk(src, 0) //This stops the bear's walking

code/modules/mob/living/simple_animal/hostile/faithless.dm

@@ -6,9 +6,9 @@
 	icon_dead = "faithless_dead"
 	speak_chance = 0
 	turns_per_move = 5
-	response_help = "passes through the"
+	response_help = "passes through"
 	response_disarm = "shoves"
-	response_harm = "hits the"
+	response_harm = "hits"
 	speed = -1
 	maxHealth = 80
 	health = 80
@@ -38,7 +38,7 @@
 /mob/living/simple_animal/hostile/faithless/FindTarget()
 	. = ..()
 	if(.)
-		emote("wails at [.]")
+		audible_emote("wails at [.]")
 
 /mob/living/simple_animal/hostile/faithless/AttackingTarget()
 	. =..()

code/modules/mob/living/simple_animal/hostile/giant_spider.dm

@@ -17,9 +17,9 @@
 	turns_per_move = 5
 	see_in_dark = 10
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/bearmeat
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "pokes the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "pokes"
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 200
 	health = 200

code/modules/mob/living/simple_animal/hostile/mimic.dm

@@ -10,9 +10,9 @@
 	icon_living = "crate"
 
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
-	response_help = "touches the"
-	response_disarm = "pushes the"
-	response_harm = "hits the"
+	response_help = "touches"
+	response_disarm = "pushes"
+	response_harm = "hits"
 	speed = 4
 	maxHealth = 250
 	health = 250
@@ -39,7 +39,7 @@
 /mob/living/simple_animal/hostile/mimic/FindTarget()
 	. = ..()
 	if(.)
-		emote("growls at [.]")
+		audible_emote("growls at [.]")
 
 /mob/living/simple_animal/hostile/mimic/death()
 	..()

code/modules/mob/living/simple_animal/hostile/pirate.dm

@@ -6,9 +6,9 @@
 	icon_dead = "piratemelee_dead"
 	speak_chance = 0
 	turns_per_move = 5
-	response_help = "pushes the"
+	response_help = "pushes"
 	response_disarm = "shoves"
-	response_harm = "hits the"
+	response_harm = "hits"
 	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100

code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm

@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/retaliate/clown
-	name = "Clown"
+	name = "clown"
 	desc = "A denizen of clown planet"
 	icon_state = "clown"
 	icon_living = "clown"
@@ -7,9 +7,9 @@
 	icon_gib = "clown_gib"
 	speak_chance = 0
 	turns_per_move = 5
-	response_help = "pokes the"
-	response_disarm = "gently pushes aside the"
-	response_harm = "hits the"
+	response_help = "pokes"
+	response_disarm = "gently pushes aside"
+	response_harm = "hits"
 	speak = list("HONK", "Honk!", "Welcome to clown planet!")
 	emote_see = list("honks")
 	speak_chance = 1

code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm

@@ -10,9 +10,9 @@
 	rapid = 1
 	speak_chance = 5
 	turns_per_move = 3
-	response_help = "pokes the"
-	response_disarm = "gently pushes aside the"
-	response_harm = "hits the"
+	response_help = "pokes"
+	response_disarm = "gently pushes aside"
+	response_harm = "hits"
 	speak = list("ALERT.","Hostile-ile-ile entities dee-twhoooo-wected.","Threat parameterszzzz- szzet.","Bring sub-sub-sub-systems uuuup to combat alert alpha-a-a.")
 	emote_see = list("beeps menacingly","whirrs threateningly","scans its immediate vicinity")
 	a_intent = "harm"

code/modules/mob/living/simple_animal/hostile/russian.dm

@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/russian
-	name = "Russian"
+	name = "russian"
 	desc = "For the Motherland!"
 	icon_state = "russianmelee"
 	icon_living = "russianmelee"
@@ -7,9 +7,9 @@
 	icon_gib = "syndicate_gib"
 	speak_chance = 0
 	turns_per_move = 5
-	response_help = "pokes the"
-	response_disarm = "shoves the"
-	response_harm = "hits the"
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "hits"
 	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100

code/modules/mob/living/simple_animal/hostile/syndicate.dm

@@ -1,5 +1,5 @@
 /mob/living/simple_animal/hostile/syndicate
-	name = "Syndicate Operative"
+	name = "\improper Syndicate operative"
 	desc = "Death to Nanotrasen."
 	icon_state = "syndicate"
 	icon_living = "syndicate"
@@ -7,9 +7,9 @@
 	icon_gib = "syndicate_gib"
 	speak_chance = 0
 	turns_per_move = 5
-	response_help = "pokes the"
-	response_disarm = "shoves the"
-	response_harm = "hits the"
+	response_help = "pokes"
+	response_disarm = "shoves"
+	response_harm = "hits"
 	speed = 4
 	stop_automated_movement_when_pulled = 0
 	maxHealth = 100

code/modules/mob/living/simple_animal/hostile/tree.dm

@@ -9,9 +9,9 @@
 	speak_chance = 0
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/carpmeat
-	response_help = "brushes the"
-	response_disarm = "pushes the"
-	response_harm = "hits the"
+	response_help = "brushes"
+	response_disarm = "pushes"
+	response_harm = "hits"
 	speed = -1
 	maxHealth = 250
 	health = 250
@@ -40,7 +40,7 @@
 /mob/living/simple_animal/hostile/tree/FindTarget()
 	. = ..()
 	if(.)
-		emote("growls at [.]")
+		audible_emote("growls at [.]")
 
 /mob/living/simple_animal/hostile/tree/AttackingTarget()
 	. =..()

code/modules/mob/living/simple_animal/kobold.dm

@@ -14,9 +14,9 @@
 	turns_per_move = 5
 	see_in_dark = 6
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat/monkey
-	response_help  = "pets the"
-	response_disarm = "gently pushes aside the"
-	response_harm   = "kicks the"
+	response_help  = "pets"
+	response_disarm = "gently pushes aside"
+	response_harm   = "kicks"
 	minbodytemp = 250
 	min_oxy = 16 //Require atleast 16kPA oxygen
 	minbodytemp = 223		//Below -50 Degrees Celcius

code/modules/mob/living/simple_animal/parrot.dm

@@ -44,9 +44,9 @@
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/cracker/
 
-	response_help  = "pets the"
-	response_disarm = "gently moves aside the"
-	response_harm   = "swats the"
+	response_help  = "pets"
+	response_disarm = "gently moves aside"
+	response_harm   = "swats"
 	stop_automated_movement = 1
 	universal_speak = 1
 
@@ -342,7 +342,7 @@
 			//Search for item to steal
 			parrot_interest = search_for_item()
 			if(parrot_interest)
-				emote("looks in [parrot_interest]'s direction and takes flight")
+				visible_emote("looks in [parrot_interest]'s direction and takes flight")
 				parrot_state = PARROT_SWOOP | PARROT_STEAL
 				icon_state = "parrot_fly"
 			return
@@ -364,7 +364,7 @@
 			if(AM)
 				if(istype(AM, /obj/item) || isliving(AM))	//If stealable item
 					parrot_interest = AM
-					emote("turns and flies towards [parrot_interest]")
+					visible_emote("turns and flies towards [parrot_interest]")
 					parrot_state = PARROT_SWOOP | PARROT_STEAL
 					return
 				else	//Else it's a perch
@@ -478,11 +478,11 @@
 				var/datum/organ/external/affecting = H.get_organ(ran_zone(pick(parrot_dam_zone)))
 
 				H.apply_damage(damage, BRUTE, affecting, H.run_armor_check(affecting, "melee"), sharp=1)
-				emote(pick("pecks [H]'s [affecting]", "cuts [H]'s [affecting] with its talons"))
+				visible_emote(pick("pecks [H]'s [affecting].", "cuts [H]'s [affecting] with its talons."))
 
 			else
 				L.adjustBruteLoss(damage)
-				emote(pick("pecks at [L]", "claws [L]"))
+				visible_emote(pick("pecks at [L].", "claws [L]."))
 			return
 
 		//Otherwise, fly towards the mob!

code/modules/mob/living/simple_animal/shade.dm

@@ -13,7 +13,7 @@
 	emote_hear = list("wails","screeches")
 	response_help  = "puts their hand through"
 	response_disarm = "flails at"
-	response_harm   = "punches the"
+	response_harm   = "punches"
 	melee_damage_lower = 5
 	melee_damage_upper = 15
 	attacktext = "drained the life from"

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

@@ -114,23 +114,23 @@
 					else
 						randomValue -= speak.len
 						if(emote_see && randomValue <= emote_see.len)
-							emote(pick(emote_see),1)
+							visible_emote("[pick(emote_see)].")
 						else
-							emote(pick(emote_hear),2)
+							audible_emote("[pick(emote_hear)].")
 				else
 					say(pick(speak))
 			else
 				if(!(emote_hear && emote_hear.len) && (emote_see && emote_see.len))
-					emote(pick(emote_see),1)
+					visible_emote("[pick(emote_see)].")
 				if((emote_hear && emote_hear.len) && !(emote_see && emote_see.len))
-					emote(pick(emote_hear),2)
+					audible_emote("[pick(emote_hear)].")
 				if((emote_hear && emote_hear.len) && (emote_see && emote_see.len))
 					var/length = emote_hear.len + emote_see.len
 					var/pick = rand(1,length)
 					if(pick <= emote_see.len)
-						emote(pick(emote_see),1)
+						visible_emote("[pick(emote_see)].")
 					else
-						emote(pick(emote_hear),2)
+						audible_emote("[pick(emote_hear)].")
 
 
 	//Atmos
@@ -207,9 +207,14 @@
 
 /mob/living/simple_animal/emote(var/act, var/type, var/desc)
 	if(act)
-		if(act == "scream")	act = "whimper" //ugly hack to stop animals screaming when crushed :P
 		..(act, type, desc)
 
+/mob/living/simple_animal/proc/visible_emote(var/act_desc)
+	custom_emote(1, act_desc)
+
+/mob/living/simple_animal/proc/audible_emote(var/act_desc)
+	custom_emote(2, act_desc)
+
 /mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
 	if(!Proj || Proj.nodamage)
 		return
@@ -224,9 +229,11 @@
 
 		if("help")
 			if (health > 0)
-				for(var/mob/O in viewers(src, null))
-					if ((O.client && !( O.blinded )))
-						O.show_message("\blue [M] [response_help] [src]")
+				M.visible_message("\blue [M] [response_help] \the [src]")
+		
+		if("disarm")
+			M.visible_message("\blue [M] [response_disarm] \the [src]")
+			//TODO: Push the mob away or something
 
 		if("grab")
 			if (M == src)
@@ -242,15 +249,11 @@
 			G.affecting = src
 			LAssailant = M
 
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message(text("\red [] has grabbed [] passively!", M, src), 1)
+			M.visible_message("\red [M] has grabbed [src] passively!")
 
-		if("hurt", "disarm")
+		if("hurt")
 			adjustBruteLoss(harm_intent_damage)
-			for(var/mob/O in viewers(src, null))
-				if ((O.client && !( O.blinded )))
-					O.show_message("\red [M] [response_harm] [src]")
+			M.visible_message("\red [M] [response_harm] \the [src]")
 
 	return
 

code/modules/mob/mob_defines.dm

@@ -213,7 +213,7 @@
 	var/universal_speak = 0 // Set to 1 to enable the mob to speak to everyone -- TLE
 	var/universal_understand = 0 // Set to 1 to enable the mob to understand everyone, not necessarily speak
 
-	var/can_stand = 2 //Whether this mob have ability to stand
+	var/stance_damage = 0 //Whether this mob's ability to stand has been affected
 
 	var/immune_to_ssd = 0
 

code/modules/organs/organ.dm

@@ -104,16 +104,20 @@
 							W.germ_level += 1
 
 /mob/living/carbon/human/proc/handle_stance()
-	can_stand = 2
+	if (lying || resting)
+		return // don't need to process any of this if they aren't standing anyways
+	
+	stance_damage = 0
 	for (var/organ in list("l_leg","l_foot","r_leg","r_foot"))
 		var/datum/organ/external/E = organs_by_name[organ]
-		if ((E.status & ORGAN_DESTROYED) || E.is_malfunctioning() || (E.is_broken() && !(E.status & ORGAN_SPLINTED)) || !E.is_usable())
-			can_stand--			// let it fail even if just foot&leg
+		if (E.status & ORGAN_DESTROYED)
+			stance_damage += 2 // let it fail even if just foot&leg
+		else if (E.is_malfunctioning() || (E.is_broken() && !(E.status & ORGAN_SPLINTED)) || !E.is_usable())
+			stance_damage += 1
 
 	// standing is poor
-	if(can_stand <= 0)
-		Weaken(10)
-		if (!(lying || resting))
-			if(species && !(species.flags & NO_PAIN))
-				emote("scream")
-			emote("collapse")
+	if(stance_damage >= 4 || (stance_damage >= 2 && prob(5)))
+		Weaken(5)
+		if(species && !(species.flags & NO_PAIN))
+			emote("scream")
+		emote("collapse")

code/modules/organs/organ_external.dm

@@ -98,7 +98,8 @@
 		brute -= brute / 2
 
 	if(status & ORGAN_BROKEN && prob(40) && brute)
-		owner.emote("scream")	//getting hit on broken hand hurts
+		if (!(owner.species && (owner.species.flags & NO_PAIN)))
+			owner.emote("scream")	//getting hit on broken hand hurts
 	if(used_weapon)
 		add_autopsy_data("[used_weapon]", brute + burn)
 
@@ -648,7 +649,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 		if(status & ORGAN_ROBOT && !no_explode && sabotaged)
 			owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\
 			"\red <b>Your [display_name] explodes!</b>",\
-			"You hear an explosion followed by a scream!")
+			"You hear an explosion!")
 			explosion(get_turf(owner),-1,-1,2,3)
 			var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 			spark_system.set_up(5, 0, owner)

code/modules/power/solar.dm

@@ -50,7 +50,7 @@ var/list/solars_list = list()
 		S.glass_type = /obj/item/stack/sheet/glass
 		S.anchored = 1
 	S.loc = src
-	if(S.glass_type == /obj/item/stack/sheet/rglass) //if the panel is in reinforced glass
+	if(S.glass_type == /obj/item/stack/sheet/glass/reinforced) //if the panel is in reinforced glass
 		health *= 2 								 //this need to be placed here, because panels already on the map don't have an assembly linked to
 	update_icon()
 
@@ -248,7 +248,7 @@ var/list/solars_list = list()
 			playsound(src.loc, 'sound/items/Ratchet.ogg', 75, 1)
 			return 1
 
-		if(istype(W, /obj/item/stack/sheet/glass) || istype(W, /obj/item/stack/sheet/rglass))
+		if(istype(W, /obj/item/stack/sheet/glass))
 			var/obj/item/stack/sheet/S = W
 			if(S.use(2))
 				glass_type = W.type
@@ -558,4 +558,4 @@ var/list/solars_list = list()
 	var/href = "<A href='?src=\ref[S];rate control=1;[V]"
 	var/rate = "[href]=-[Max]'>-</A>[href]=-[Min]'>-</A> [(C?C : 0)] [href]=[Min]'>+</A>[href]=[Max]'>+</A>"
 	if(Limit) return "[href]=-[Limit]'>-</A>"+rate+"[href]=[Limit]'>+</A>"
-	return rate
+	return rate

code/modules/reagents/Chemistry-Reagents.dm

@@ -1984,7 +1984,8 @@ datum
 								if(affecting.take_damage(4*toxpwr, 2*toxpwr))
 									H.UpdateDamageIcon()
 								if(prob(meltprob)) //Applies disfigurement
-									H.emote("scream")
+									if (!(H.species && (H.species.flags & NO_PAIN)))
+										H.emote("scream")
 									H.status_flags |= DISFIGURED
 						else
 							M.take_organ_damage(min(6*toxpwr, volume * toxpwr)) // uses min() and volume to make sure they aren't being sprayed in trace amounts (1 unit != insta rape) -- Doohl
@@ -2146,7 +2147,7 @@ datum
 						if ( eyes_covered && mouth_covered )
 							victim << "\red Your [safe_thing] protects you from the pepperspray!"
 							return
-						else if ( mouth_covered )	// Reduced effects if partially protected
+						else if ( eyes_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, 15)
 							victim.eye_blind = max(M.eye_blind, 5)
@@ -2155,13 +2156,15 @@ datum
 							//victim.Paralyse(10)
 							//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")
+						else if ( mouth_covered ) // Mouth cover is better than eye cover
+							victim << "\red Your [safe_thing] protects your face from the pepperspray!"
+							if (!(victim.species && (victim.species.flags & NO_PAIN)))
+								victim.emote("scream")
 							victim.eye_blurry = max(M.eye_blurry, 5)
 							return
 						else // Oh dear :D
-							victim.emote("scream")
+							if (!(victim.species && (victim.species.flags & NO_PAIN)))
+								victim.emote("scream")
 							victim << "\red You're sprayed directly in the eyes with pepperspray!"
 							victim.eye_blurry = max(M.eye_blurry, 25)
 							victim.eye_blind = max(M.eye_blind, 10)

code/modules/reagents/reagent_containers/food/snacks.dm

@@ -194,8 +194,8 @@
 			del(src)
 			return
 
-/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
-	return (slices_num <= 0 || !slices_num || !slice_path)
+/obj/item/weapon/reagent_containers/food/snacks/proc/is_sliceable()
+	return (slices_num && slice_path && slices_num > 0)
 
 /obj/item/weapon/reagent_containers/food/snacks/Del()
 	if(contents)

code/modules/reagents/reagent_containers/glass.dm

@@ -156,12 +156,16 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker
 	name = "beaker"
-	desc = "A beaker. Can hold up to 50 units."
+	desc = "A beaker."
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker"
 	item_state = "beaker"
 	matter = list("glass" = 500)
 
+	New()
+		..()
+		desc += " Can hold up to [volume] units."
+
 	on_reagent_change()
 		update_icon()
 
@@ -202,7 +206,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/large
 	name = "large beaker"
-	desc = "A large beaker. Can hold up to 100 units."
+	desc = "A large beaker."
 	icon_state = "beakerlarge"
 	matter = list("glass" = 5000)
 	volume = 120
@@ -212,7 +216,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/noreact
 	name = "cryostasis beaker"
-	desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 60 units."
+	desc = "A cryostasis beaker that allows for chemical storage without reactions."
 	icon_state = "beakernoreact"
 	matter = list("glass" = 500)
 	volume = 60
@@ -221,7 +225,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/bluespace
 	name = "bluespace beaker"
-	desc = "A bluespace beaker, powered by experimental bluespace technology. Can hold up to 300 units."
+	desc = "A bluespace beaker, powered by experimental bluespace technology."
 	icon_state = "beakerbluespace"
 	matter = list("glass" = 5000)
 	volume = 300
@@ -232,7 +236,7 @@
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial
 	name = "vial"
-	desc = "A small glass vial. Can hold up to 25 units."
+	desc = "A small glass vial."
 	icon_state = "vial"
 	matter = list("glass" = 250)
 	volume = 30

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -235,7 +235,7 @@
 			possible_spawns += /obj/item/stack/sheet/metal
 			possible_spawns += /obj/item/stack/sheet/plasteel
 			possible_spawns += /obj/item/stack/sheet/glass
-			possible_spawns += /obj/item/stack/sheet/rglass
+			possible_spawns += /obj/item/stack/sheet/glass/reinforced
 			possible_spawns += /obj/item/stack/sheet/mineral/phoron
 			possible_spawns += /obj/item/stack/sheet/mineral/gold
 			possible_spawns += /obj/item/stack/sheet/mineral/silver