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

Conflicts:
	code/game/area/Space Station 13 areas.dm
	code/game/objects/items/weapons/manuals.dm
	code/modules/mob/living/say.dm
	code/modules/organs/organ_internal.dm
	code/modules/paperwork/paper.dm
	code/modules/supermatter/supermatter.dm
	html/changelog.html
	icons/mob/uniform.dmi

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

baystation12.dme

@@ -1266,10 +1266,6 @@
 #include "code\modules\surgery\ribcage.dm"
 #include "code\modules\surgery\robolimbs.dm"
 #include "code\modules\surgery\surgery.dm"
-#include "code\modules\telesci\bscrystal.dm"
-#include "code\modules\telesci\gps.dm"
-#include "code\modules\telesci\telepad.dm"
-#include "code\modules\telesci\telesci_computer.dm"
 #include "code\modules\virus2\analyser.dm"
 #include "code\modules\virus2\antibodies.dm"
 #include "code\modules\virus2\centrifuge.dm"

code/TriDimension/Turfs.dm

@@ -53,6 +53,13 @@
 							H:updatehealth()
 		return ..()
 
+/turf/proc/hasbelow()
+	var/turf/controllerlocation = locate(1, 1, z)
+	for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
+		if(controller.down)
+			return 1
+	return 0
+
 /turf/simulated/floor/open/proc/getbelow()
 	var/turf/controllerlocation = locate(1, 1, z)
 	for(var/obj/effect/landmark/zcontroller/controller in controllerlocation)
@@ -73,7 +80,7 @@
 
 //overwrite the attackby of space to transform it to openspace if necessary
 /turf/space/attackby(obj/item/C as obj, mob/user as mob)
-	if (istype(C, /obj/item/weapon/cable_coil))
+	if (istype(C, /obj/item/weapon/cable_coil) && src.hasbelow())
 		var/turf/simulated/floor/open/W = src.ChangeTurf(/turf/simulated/floor/open)
 		W.attackby(C, user)
 		return

code/controllers/configuration.dm

@@ -481,7 +481,7 @@
 					config.cult_ghostwriter = 1
 
 				if("req_cult_ghostwriter")
-					config.cult_ghostwriter_req_cultists = value
+					config.cult_ghostwriter_req_cultists = text2num(value)
 
 				else
 					log_misc("Unknown setting in configuration: '[name]'")

code/controllers/master_controller.dm

@@ -254,6 +254,10 @@ datum/controller/game_controller/proc/process_diseases()
 		active_diseases.Cut(i,i+1)
 
 datum/controller/game_controller/proc/process_machines()
+	process_machines_process()
+	process_machines_power()
+	process_machines_rebuild()
+datum/controller/game_controller/proc/process_machines_process()
 	var/i = 1
 	while(i<=machines.len)
 		var/obj/machinery/Machine = machines[i]
@@ -265,7 +269,8 @@ datum/controller/game_controller/proc/process_machines()
 					continue
 		machines.Cut(i,i+1)
 
-	i=1
+datum/controller/game_controller/proc/process_machines_power()
+	var/i=1
 	while(i<=active_areas.len)
 		var/area/A = active_areas[i]
 		if(A.powerupdate && A.master == A)
@@ -283,7 +288,7 @@ datum/controller/game_controller/proc/process_machines()
 		A.powerupdate = 0
 		active_areas.Cut(i,i+1)
 
-
+datum/controller/game_controller/proc/process_machines_rebuild()
 	if(controller_iteration % 150 == 0 || rebuild_active_areas)	//Every 300 seconds we retest every area/machine
 		for(var/area/A in all_areas)
 			if(A == A.master)
@@ -292,8 +297,6 @@ datum/controller/game_controller/proc/process_machines()
 		rebuild_active_areas = 0
 		
 
-		
-
 datum/controller/game_controller/proc/process_objects()
 	var/i = 1
 	while(i<=processing_objects.len)

code/datums/spells/horsemask.dm

@@ -28,12 +28,23 @@
 		user << "<span class='notice'>They are too far away!</span>"
 		return
 
-	var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead
-	magichead.canremove = 0		//curses!
-	magichead.flags_inv = null	//so you can still see their face
-	magichead.voicechange = 1	//NEEEEIIGHH
+	var/obj/item/clothing/mask/horsehead/magic/magichead = new /obj/item/clothing/mask/horsehead/magic
 	target.visible_message(	"<span class='danger'>[target]'s face  lights up in fire, and after the event a horse's head takes its place!</span>", \
 							"<span class='danger'>Your face burns up, and shortly after the fire you realise you have the face of a horse!</span>")
 	target.equip_to_slot(magichead, slot_wear_mask)
 
 	flick("e_flash", target.flash)
+
+//item used by the horsehead spell
+/obj/item/clothing/mask/horsehead/magic
+	//flags_inv = null	//so you can still see their face... no. How can you recognize someone when their face is completely different?
+	voicechange = 1		//NEEEEIIGHH
+
+	dropped(mob/user as mob)
+		canremove = 1
+		..()
+	
+	equipped(var/mob/user, var/slot)
+		if (slot == slot_wear_mask)
+			canremove = 0		//curses!
+		..()

code/game/area/Space Station 13 areas.dm

@@ -1382,11 +1382,7 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Miscellaneous Research"
 	icon_state = "toxmisc"
 
-/area/rnd/telesci
-	name = "\improper Telescience Lab"
-	icon_state = "toxmisc"
-
-/area/rnd/server
+/area/toxins/server
 	name = "\improper Server Room"
 	icon_state = "server"
 

code/game/machinery/bees_items.dm

@@ -102,18 +102,19 @@
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
 				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
-				<h3>Raising Bees</h3>
+				<h1>Raising Bees</h1>
 
 				Bees are loving but fickle creatures. Don't mess with their hive and stay away from any clusters of them, and you'll avoid their ire.
 				Sometimes, you'll need to dig around in there for those delicious sweeties though - in that case make sure you wear sealed protection gear
 				and carry an extinguisher or smoker with you - any bees chasing you, once calmed down, can thusly be netted and returned safely to the hive.<br.
 				<br>
-				Beezeez is a cure-all panacea for them, but use it too much and the hive may grow to apocalyptic proportions. Other than that, bees are excellent pets
+				BeezEez is a cure-all panacea for them, but use it too much and the hive may grow to apocalyptic proportions. Other than that, bees are excellent pets
 				for all the family and are excellent caretakers of one's garden: having a hive or two around will aid in the longevity and growth rate of plants,
 				and aid them in fighting off poisons and disease.
 

code/game/machinery/telecomms/broadcaster.dm

@@ -457,26 +457,26 @@ var/message_delay = 0 // To make sure restarting the recentmessages list is kept
 
 		if (length(heard_masked))
 			for (var/mob/R in heard_masked)
-				R.hear_radio(message,verbage, speaking, part_a, part_b, M)
+				R.hear_radio(message,verbage, speaking, part_a, part_b, M, 0, name)
 
 		/* --- Process all the mobs that heard the voice normally (understood) --- */
 
 		if (length(heard_normal))
 			for (var/mob/R in heard_normal)
-				R.hear_radio(message, verbage, speaking, part_a, part_b, M)
+				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 0, realname)
 
 		/* --- Process all the mobs that heard the voice normally (did not understand) --- */
 
 		if (length(heard_voice))
 			for (var/mob/R in heard_voice)
-				R.hear_radio(message,verbage, speaking, part_a, part_b, M)
+				R.hear_radio(message,verbage, speaking, part_a, part_b, M,0, vname)
 
 		/* --- Process all the mobs that heard a garbled voice (did not understand) --- */
 			// Displays garbled message (ie "f*c* **u, **i*er!")
 
 		if (length(heard_garbled))
 			for (var/mob/R in heard_garbled)
-				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1)
+				R.hear_radio(message, verbage, speaking, part_a, part_b, M, 1, vname)
 
 
 		/* --- Complete gibberish. Usually happens when there's a compressed message --- */

code/game/machinery/vending.dm

@@ -806,7 +806,7 @@
 	products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3,
 					/obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,
 					/obj/item/seeds/sunflowerseed = 3,/obj/item/seeds/tomatoseed = 3,/obj/item/seeds/towermycelium = 3,/obj/item/seeds/wheatseed = 3,/obj/item/seeds/appleseed = 3,
-					/obj/item/seeds/poppyseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
+					/obj/item/seeds/poppyseed = 3,/obj/item/seeds/sugarcaneseed = 3,/obj/item/seeds/ambrosiavulgarisseed = 3,/obj/item/seeds/whitebeetseed = 3,/obj/item/seeds/watermelonseed = 3,/obj/item/seeds/limeseed = 3,
 					/obj/item/seeds/lemonseed = 3,/obj/item/seeds/orangeseed = 3,/obj/item/seeds/grassseed = 3,/obj/item/seeds/cocoapodseed = 3,/obj/item/seeds/plumpmycelium = 2,
 					/obj/item/seeds/cabbageseed = 3,/obj/item/seeds/grapeseed = 3,/obj/item/seeds/pumpkinseed = 3,/obj/item/seeds/cherryseed = 3,/obj/item/seeds/plastiseed = 3,/obj/item/seeds/riceseed = 3)
 	contraband = list(/obj/item/seeds/amanitamycelium = 2,/obj/item/seeds/glowshroom = 2,/obj/item/seeds/libertymycelium = 2,/obj/item/seeds/mtearseed = 2,

code/game/objects/items.dm

@@ -210,6 +210,7 @@
 /obj/item/proc/moved(mob/user as mob, old_loc as turf)
 	return
 
+// apparently called whenever an item is removed from a slot, container, or anything else.
 /obj/item/proc/dropped(mob/user as mob)
 	..()
 

code/game/objects/items/devices/taperecorder.dm

@@ -19,10 +19,11 @@
 	throw_speed = 4
 	throw_range = 20
 
-/obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg)
+/obj/item/device/taperecorder/hear_talk(mob/living/M as mob, msg, var/verb="says")
 	if(recording)
-		var/ending = copytext(msg, length(msg))
+		//var/ending = copytext(msg, length(msg))
 		timestamp+= timerecorded
+	/*
 		if(M.stuttering)
 			storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] stammers, \"[msg]\""
 			return
@@ -35,7 +36,8 @@
 		else if(ending == "!")
 			storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] exclaims, \"[msg]\""
 			return
-		storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] says, \"[msg]\""
+	*/
+		storedinfo += "\[[time2text(timerecorded*10,"mm:ss")]\] [M.name] [verb], \"[msg]\""
 		return
 
 /obj/item/device/taperecorder/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/game/objects/items/weapons/cigs_lighters.dm

@@ -167,7 +167,12 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 		location.hotspot_expose(700, 5)
 	if(reagents && reagents.total_volume)	//	check if it has any reagents at all
 		if(iscarbon(loc) && (src == loc:wear_mask)) // if it's in the human/monkey mouth, transfer reagents to the mob
+			if(istype(loc, /mob/living/carbon/human))
+				var/mob/living/carbon/human/H = loc
+				if(H.species.flags & IS_SYNTHETIC)
+					return
 			var/mob/living/carbon/C = loc
+
 			if(prob(15)) // so it's not an instarape in case of acid
 				reagents.reaction(C, INGEST)
 			reagents.trans_to(C, REAGENTS_METABOLISM)

code/game/objects/items/weapons/tools.dm

@@ -357,6 +357,8 @@
 	if(istype(user, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = user
 		var/datum/organ/internal/eyes/E = H.internal_organs["eyes"]
+		if(H.species.flags & IS_SYNTHETIC)
+			return
 		switch(safety)
 			if(1)
 				usr << "\red Your eyes sting a little."

code/game/objects/structures/inflatable.dm

@@ -146,6 +146,9 @@
 		set category = "Object"
 		set src in oview(1)
 
+		if(isobserver(usr)) //to stop ghosts from deflating
+			return
+
 		deflate()
 
 /obj/item/inflatable/door/

code/game/objects/structures/transit_tubes.dm

@@ -117,12 +117,14 @@ obj/structure/ex_act(severity)
 /obj/structure/transit_tube/station/Bumped(mob/AM as mob|obj)
 	if(!pod_moving && icon_state == "open" && istype(AM, /mob))
 		for(var/obj/structure/transit_tube_pod/pod in loc)
-			if(!pod.moving && pod.dir in directions())
+			if(pod.contents.len)
+				AM << "<span class=The pod is already occupied.</span>"
+				return
+			else if(!pod.moving && pod.dir in directions())
 				AM.loc = pod
 				return
 			
 			
-
 /obj/structure/transit_tube/station/attack_hand(mob/user as mob)
 	if(!pod_moving)
 		for(var/obj/structure/transit_tube_pod/pod in loc)

code/game/turfs/simulated.dm

@@ -80,7 +80,7 @@
 						M.stop_pulling()
 						step(M, M.dir)
 						M << "\blue You slipped on the wet floor!"
-						playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+						playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 						M.Stun(5)
 						M.Weaken(3)
 					else
@@ -91,7 +91,7 @@
 						M.stop_pulling()
 						step(M, M.dir)
 						M << "\blue You slipped on the wet floor!"
-						playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+						playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 						M.Stun(5)
 						M.Weaken(3)
 					else
@@ -108,7 +108,7 @@
 					spawn(4) step(M, M.dir)
 					M.take_organ_damage(2) // Was 5 -- TLE
 					M << "\blue You slipped on the floor!"
-					playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+					playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 					M.Weaken(10)
 			if(3) // Ice
 				if(istype(M, /mob/living/carbon/human)) // Added check since monkeys don't have shoes
@@ -116,7 +116,7 @@
 						M.stop_pulling()
 						step(M, M.dir)
 						M << "\blue You slipped on the icy floor!"
-						playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+						playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 						M.Stun(4)
 						M.Weaken(3)
 					else
@@ -127,7 +127,7 @@
 						M.stop_pulling()
 						step(M, M.dir)
 						M << "\blue You slipped on the icy floor!"
-						playsound(src.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+						playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
 						M.Stun(4)
 						M.Weaken(3)
 					else

code/game/turfs/simulated/floor.dm

@@ -455,7 +455,7 @@ turf/simulated/floor/proc/update_icon()
 				new floor_tile.type(src)
 
 		make_plating()
-		playsound(src.loc, 'sound/items/Crowbar.ogg', 80, 1)
+		playsound(src, 'sound/items/Crowbar.ogg', 80, 1)
 
 		return
 
@@ -468,7 +468,7 @@ turf/simulated/floor/proc/update_icon()
 				new floor_tile.type(src)
 
 		make_plating()
-		playsound(src.loc, 'sound/items/Screwdriver.ogg', 80, 1)
+		playsound(src, 'sound/items/Screwdriver.ogg', 80, 1)
 
 		return
 
@@ -479,7 +479,7 @@ turf/simulated/floor/proc/update_icon()
 				user << "\blue Reinforcing the floor..."
 				if(do_after(user, 30) && R && R.amount >= 2 && is_plating())
 					ChangeTurf(/turf/simulated/floor/engine)
-					playsound(src.loc, 'sound/items/Deconstruct.ogg', 80, 1)
+					playsound(src, 'sound/items/Deconstruct.ogg', 80, 1)
 					R.use(2)
 					return
 			else
@@ -512,7 +512,7 @@ turf/simulated/floor/proc/update_icon()
 				T.use(1)
 				update_icon()
 				levelupdate()
-				playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+				playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 			else
 				user << "\blue This section is too damaged to support a tile. Use a welder to fix the damage."
 
@@ -539,7 +539,7 @@ turf/simulated/floor/proc/update_icon()
 			if(broken || burnt)
 				if(welder.remove_fuel(0,user))
 					user << "\red You fix some dents on the broken plating."
-					playsound(src.loc, 'sound/items/Welder.ogg', 80, 1)
+					playsound(src, 'sound/items/Welder.ogg', 80, 1)
 					icon_state = "plating"
 					burnt = 0
 					broken = 0

code/game/turfs/simulated/floor_types.dm

@@ -61,7 +61,7 @@
 		return
 	if(istype(C, /obj/item/weapon/wrench))
 		user << "\blue Removing rods..."
-		playsound(src.loc, 'sound/items/Ratchet.ogg', 80, 1)
+		playsound(src, 'sound/items/Ratchet.ogg', 80, 1)
 		if(do_after(user, 30))
 			new /obj/item/stack/rods(src, 2)
 			ChangeTurf(/turf/simulated/floor)

code/game/turfs/simulated/walls.dm

@@ -16,7 +16,7 @@
 /turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0)
 	if(istype(src,/turf/simulated/wall/r_wall))
 		if(!devastated)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			new /obj/structure/girder/reinforced(src)
 			new /obj/item/stack/sheet/plasteel( src )
 		else
@@ -25,7 +25,7 @@
 			new /obj/item/stack/sheet/plasteel( src )
 	else if(istype(src,/turf/simulated/wall/cult))
 		if(!devastated)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			new /obj/effect/decal/cleanable/blood(src)
 			new /obj/structure/cultgirder(src)
 		else
@@ -34,7 +34,7 @@
 
 	else
 		if(!devastated)
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 			new /obj/structure/girder(src)
 			if (mineral == "metal")
 				new /obj/item/stack/sheet/metal( src )
@@ -138,7 +138,7 @@
 		return
 
 	user << "\blue You push the wall but nothing happens!"
-	playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1)
+	playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
 	src.add_fingerprint(user)
 	return
 
@@ -156,7 +156,7 @@
 			var/obj/item/weapon/weldingtool/WT = W
 			if( WT.remove_fuel(0,user) )
 				user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
-				playsound(src.loc, 'sound/items/Welder.ogg', 10, 1)
+				playsound(src, 'sound/items/Welder.ogg', 10, 1)
 				for(var/obj/effect/E in src) if(E.name == "Wallrot")
 					del E
 				rotting = 0
@@ -183,8 +183,8 @@
 
 			EB.spark_system.start()
 			user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>"
-			playsound(src.loc, "sparks", 50, 1)
-			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src, "sparks", 50, 1)
+			playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
 
 			thermitemelt(user)
 			return
@@ -196,7 +196,7 @@
 		var/obj/item/weapon/weldingtool/WT = W
 		if( WT.remove_fuel(0,user) )
 			user << "<span class='notice'>You begin slicing through the outer plating.</span>"
-			playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+			playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 			sleep(100)
 			if( !istype(src, /turf/simulated/wall) || !user || !WT || !WT.isOn() || !T )	return
@@ -211,7 +211,7 @@
 	else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 
 		user << "<span class='notice'>You begin slicing through the outer plating.</span>"
-		playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+		playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 		sleep(60)
 		if(mineral == "diamond")//Oh look, it's tougher
@@ -247,7 +247,7 @@
 
 		EB.spark_system.start()
 		user << "<span class='notice'>You stab \the [EB] into the wall and begin to slice it apart.</span>"
-		playsound(src.loc, "sparks", 50, 1)
+		playsound(src, "sparks", 50, 1)
 
 		sleep(70)
 		if(mineral == "diamond")
@@ -256,8 +256,8 @@
 
 		if( user.loc == T && user.get_active_hand() == W )
 			EB.spark_system.start()
-			playsound(src.loc, "sparks", 50, 1)
-			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src, "sparks", 50, 1)
+			playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
 			dismantle_wall(1)
 			for(var/mob/O in viewers(user, 5))
 				O.show_message("<span class='warning'>The wall was sliced apart by [user]!</span>", 1, "<span class='warning'>You hear metal being sliced apart and sparks flying.</span>", 2)

code/game/turfs/simulated/walls_reinforced.dm

@@ -25,7 +25,7 @@
 		return
 
 	user << "\blue You push the wall but nothing happens!"
-	playsound(src.loc, 'sound/weapons/Genhit.ogg', 25, 1)
+	playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
 	src.add_fingerprint(user)
 	return
 
@@ -44,7 +44,7 @@
 			var/obj/item/weapon/weldingtool/WT = W
 			if( WT.remove_fuel(0,user) )
 				user << "<span class='notice'>You burn away the fungi with \the [WT].</span>"
-				playsound(src.loc, 'sound/items/Welder.ogg', 10, 1)
+				playsound(src, 'sound/items/Welder.ogg', 10, 1)
 				for(var/obj/effect/E in src) if(E.name == "Wallrot")
 					del E
 				rotting = 0
@@ -71,8 +71,8 @@
 
 			EB.spark_system.start()
 			user << "<span class='notice'>You slash \the [src] with \the [EB]; the thermite ignites!</span>"
-			playsound(src.loc, "sparks", 50, 1)
-			playsound(src.loc, 'sound/weapons/blade1.ogg', 50, 1)
+			playsound(src, "sparks", 50, 1)
+			playsound(src, 'sound/weapons/blade1.ogg', 50, 1)
 
 			thermitemelt(user)
 			return
@@ -87,7 +87,7 @@
 	switch(d_state)
 		if(0)
 			if (istype(W, /obj/item/weapon/wirecutters))
-				playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+				playsound(src, 'sound/items/Wirecutter.ogg', 100, 1)
 				src.d_state = 1
 				src.icon_state = "r_wall-1"
 				new /obj/item/stack/rods( src )
@@ -97,7 +97,7 @@
 		if(1)
 			if (istype(W, /obj/item/weapon/screwdriver))
 				user << "<span class='notice'>You begin removing the support lines.</span>"
-				playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+				playsound(src, 'sound/items/Screwdriver.ogg', 100, 1)
 
 				sleep(40)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return
@@ -127,7 +127,7 @@
 				if( WT.remove_fuel(0,user) )
 
 					user << "<span class='notice'>You begin slicing through the metal cover.</span>"
-					playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+					playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 					sleep(60)
 					if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T )	return
@@ -143,7 +143,7 @@
 			if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 
 				user << "<span class='notice'>You begin slicing through the metal cover.</span>"
-				playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+				playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 				sleep(40)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return
@@ -158,7 +158,7 @@
 			if (istype(W, /obj/item/weapon/crowbar))
 
 				user << "<span class='notice'>You struggle to pry off the cover.</span>"
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+				playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
 
 				sleep(100)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return
@@ -173,7 +173,7 @@
 			if (istype(W, /obj/item/weapon/wrench))
 
 				user << "<span class='notice'>You start loosening the anchoring bolts which secure the support rods to their frame.</span>"
-				playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+				playsound(src, 'sound/items/Ratchet.ogg', 100, 1)
 
 				sleep(40)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return
@@ -190,7 +190,7 @@
 				if( WT.remove_fuel(0,user) )
 
 					user << "<span class='notice'>You begin slicing through the support rods.</span>"
-					playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+					playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 					sleep(100)
 					if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !WT.isOn() || !T )	return
@@ -207,7 +207,7 @@
 			if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
 
 				user << "<span class='notice'>You begin slicing through the support rods.</span>"
-				playsound(src.loc, 'sound/items/Welder.ogg', 100, 1)
+				playsound(src, 'sound/items/Welder.ogg', 100, 1)
 
 				sleep(70)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return
@@ -223,7 +223,7 @@
 			if( istype(W, /obj/item/weapon/crowbar) )
 
 				user << "<span class='notice'>You struggle to pry off the outer sheath.</span>"
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 100, 1)
+				playsound(src, 'sound/items/Crowbar.ogg', 100, 1)
 
 				sleep(100)
 				if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T )	return

code/game/turfs/space/space.dm

@@ -39,7 +39,7 @@
 			return
 		var/obj/item/stack/rods/R = C
 		user << "\blue Constructing support lattice ..."
-		playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+		playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 		ReplaceWithLattice()
 		R.use(1)
 		return
@@ -49,7 +49,7 @@
 		if(L)
 			var/obj/item/stack/tile/plasteel/S = C
 			del(L)
-			playsound(src.loc, 'sound/weapons/Genhit.ogg', 50, 1)
+			playsound(src, 'sound/weapons/Genhit.ogg', 50, 1)
 			S.build(src)
 			S.use(1)
 			return

code/modules/admin/admin.dm

@@ -275,7 +275,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)
+			if(I.author == usr.key || I.author == "Adminbot")
 				dat += "<A href='?src=\ref[src];remove_player_info=[key];remove_index=[i]'>Remove</A>"
 			dat += "<br><br>"
 		if(update_file) info << infos

code/modules/admin/player_notes.dm

@@ -152,3 +152,16 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	log_admin("[key_name(usr)] deleted one of [key]'s notes.")
 
 	del info
+
+/proc/show_player_info_irc(var/key as text)
+	var/dat = "          Info on [key]%0D%0A"
+	var/savefile/info = new("data/player_saves/[copytext(key, 1, 2)]/[key]/info.sav")
+	var/list/infos
+	info >> infos
+	if(!infos)
+		dat = "No information found on the given key."
+	else
+		for(var/datum/player_info/I in infos)
+			dat += "[I.content]%0D%0Aby [I.author] ([I.rank]) on [I.timestamp]%0D%0A%0D%0A"
+
+	return dat

code/modules/admin/verbs/adminpm.dm

@@ -182,3 +182,28 @@
 			continue
 		if(X.key!=key && X.key!=C.key && (X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD) )
 			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;[key_name(C, X, 0)]:</B> \blue [msg]</font>" //inform X
+
+/client/proc/cmd_admin_irc_pm()
+	if(prefs.muted & MUTE_ADMINHELP)
+		src << "<font color='red'>Error: Private-Message: You are unable to use PM-s (muted).</font>"
+		return
+
+	var/msg = input(src,"Message:", "Private message to admins on IRC / 400 character limit") as text|null
+	sanitize(msg)
+
+	if(length(msg) > 400) // TODO: if message length is over 400, divide it up into seperate messages, the message length restriction is based on IRC limitations.  Probably easier to do this on the bots ends.
+		src << "\red Your message was not sent because it was more then 400 characters find your message below for ease of copy/pasting"
+		src << "\blue [msg]"
+		return
+
+	send2adminirc("PlayerPM from [key_name(src)]: [html_decode(msg)]")
+
+	src << "<font color='blue'>IRC PM to-<b>IRC-Admins</b>: [msg]</font>"
+
+	log_admin("PM: [key_name(src)]->IRC: [msg]")
+	for(var/client/X in admins)
+		if(X == src)
+			continue
+		if((X.holder.rights & R_ADMIN) || (X.holder.rights & R_MOD))
+			X << "<B><font color='blue'>PM: [key_name(src, X, 0)]-&gt;IRC-Admins:</B> \blue [msg]</font>"	
+

code/modules/admin/verbs/debug.dm

@@ -968,6 +968,89 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 		if(SMES.anchored)
 			SMES.chargemode = 1
 
+/client/proc/setup_supermatter_engine()
+	set category = "Debug"
+	set name = "Setup supermatter"
+	set desc = "Sets up the supermatter engine"
+
+	if(!check_rights(R_DEBUG|R_ADMIN))      return
+
+	var/response = alert("Are you sure? This will start up the engine. Should only be used during debug!",,"Setup Completely","Setup except coolant","No")
+
+	if(response == "No")
+		return
+
+	var/found_the_pump = 0
+	var/obj/machinery/power/supermatter/SM
+
+	for(var/obj/machinery/M in world)
+		if(!M)
+			continue
+		if(!M.loc)
+			continue
+		if(!M.loc.loc)
+			continue
+
+		if(istype(M.loc.loc,/area/engine/engine_room))
+			if(istype(M,/obj/machinery/power/rad_collector))
+				var/obj/machinery/power/rad_collector/Rad = M
+				Rad.anchored = 1
+				Rad.connect_to_network()
+
+				var/obj/item/weapon/tank/phoron/Phoron = new/obj/item/weapon/tank/phoron(Rad)
+
+				Phoron.air_contents.phoron = 29.1154	//This is a full tank if you filled it from a canister
+				Rad.P = Phoron
+
+				Phoron.loc = Rad
+
+				if(!Rad.active)
+					Rad.toggle_power()
+				Rad.update_icon()
+
+			else if(istype(M,/obj/machinery/atmospherics/binary/pump))	//Turning on every pump.
+				var/obj/machinery/atmospherics/binary/pump/Pump = M
+				if(Pump.name == "Engine Feed" && response == "Setup Completely")
+					found_the_pump = 1
+					Pump.air2.nitrogen = 3750	//The contents of 2 canisters.
+					Pump.air2.temperature = 50
+					Pump.air2.update_values()
+				Pump.on=1
+				Pump.target_pressure = 4500
+				Pump.update_icon()
+
+			else if(istype(M,/obj/machinery/power/supermatter))
+				SM = M
+				spawn(50)
+					SM.power = 320
+
+			else if(istype(M,/obj/machinery/power/smes))	//This is the SMES inside the engine room.  We don't need much power.
+				var/obj/machinery/power/smes/SMES = M
+				SMES.chargemode = 1
+				SMES.chargelevel = 200000
+				SMES.output = 75000
+
+		else if(istype(M.loc.loc,/area/engine/engine_smes))	//Set every SMES to charge and spit out 300,000 power between the 4 of them.
+			if(istype(M,/obj/machinery/power/smes))
+				var/obj/machinery/power/smes/SMES = M
+				SMES.chargemode = 1
+				SMES.chargelevel = 200000
+				SMES.output = 75000
+
+	if(!found_the_pump && response == "Setup Completely")
+		src << "\red Unable to locate air supply to fill up with coolant, adding some coolant around the supermatter"
+		var/turf/simulated/T = SM.loc
+		T.zone.air.nitrogen += 450
+		T.zone.air.temperature = 50
+		T.zone.air.update_values()
+
+
+	log_admin("[key_name(usr)] setup the supermatter engine [response == "Setup except coolant" ? "without coolant" : ""]")
+	message_admins("\blue [key_name_admin(usr)] setup the supermatter engine  [response == "Setup except coolant" ? "without coolant": ""]", 1)
+	return
+
+
+
 /client/proc/cmd_debug_mob_lists()
 	set category = "Debug"
 	set name = "Debug Mob Lists"

code/modules/admin/verbs/mapping.dm

@@ -161,6 +161,7 @@ var/list/debug_verbs = list (
         ,/client/proc/hide_debug_verbs
 	,/client/proc/testZAScolors
 	,/client/proc/testZAScolors_remove
+	,/client/proc/setup_supermatter_engine
 	)
 
 

code/modules/client/client defines.dm

@@ -32,6 +32,10 @@
 	// comment out the line below when debugging locally to enable the options & messages menu
 	//control_freak = 1
 
+	var/received_irc_pm = -99999
+	var/irc_admin			//IRC admin that spoke with them last.
+	var/mute_irc = 0
+
 
 		////////////////////////////////////
 		//things that require the database//

code/modules/client/client procs.dm

@@ -45,6 +45,18 @@
 		cmd_admin_pm(C,null)
 		return
 
+	if(href_list["irc_msg"])
+		if(!holder && received_irc_pm < world.time - 6000) //Worse they can do is spam IRC for 10 minutes
+			usr << "<span class='warning'>You are no longer able to use this, it's been more then 10 minutes since an admin on IRC has responded to you</span>"
+			return
+		if(mute_irc)
+			usr << "<span class='warning'You cannot use this as your client has been muted from sending messages to the admins on IRC</span>"
+			return
+		cmd_admin_irc_pm()
+		return
+		
+
+
 	//Logs all hrefs
 	if(config && config.log_hrefs && href_logfile)
 		href_logfile << "<small>[time2text(world.timeofday,"hh:mm")] [src] (usr:[usr])</small> || [hsrc ? "[hsrc] " : ""][href]<br>"
@@ -243,9 +255,6 @@
 /client/proc/send_resources()
 //	preload_vox() //Causes long delays with initial start window and subsequent windows when first logged in.
 	
-	// Send NanoUI resources to this client
-	nanomanager.send_resources(src)
-
 	getFiles(
 		'html/search.js',
 		'html/panels.css',

code/modules/client/preferences.dm

@@ -561,6 +561,8 @@ datum/preferences
 		return
 
 	proc/SetAntagoptions(mob/user)
+		if(uplinklocation == "")
+			uplinklocation = "PDA"
 		var/HTML = "<body>"
 		HTML += "<tt><center>"
 		HTML += "<b>Antagonist Options</b> <hr />"

code/modules/clothing/gloves/stungloves.dm

@@ -3,75 +3,81 @@
 		user << "<span class='notice'>That won't work.</span>"	//i'm not putting my lips on that!
 		..()
 		return
+	
+	//add wires
 	if(istype(W, /obj/item/weapon/cable_coil))
-		if(!("stunglove" in species_restricted))
 		var/obj/item/weapon/cable_coil/C = W
-			if(!wired)
-				if(C.amount >= 2)
+		if (clipped)
+			user << "<span class='notice'>The [src] are too badly mangled for wiring.</span>"
+			return
+		
+		if(wired)
+			user << "<span class='notice'>The [src] are already wired.</span>"
+			return
+			
+		if(C.amount < 2)
+			user << "<span class='notice'>There is not enough wire to cover the [src].</span>"
+			return
+			
 		C.use(2)
 		wired = 1
 		siemens_coefficient = 3.0
-					user << "<span class='notice'>You wrap some wires around [src].</span>"
+		user << "<span class='notice'>You wrap some wires around the [src].</span>"
 		update_icon()
-				else
-					user << "<span class='notice'>There is not enough wire to cover [src].</span>"
-			else
-				user << "<span class='notice'>[src] are already wired.</span>"
-		else
-			user << "<span class='notice'[src] is not suitable for wiring.</span>"
+		return
 	
+	//add cell
 	else if(istype(W, /obj/item/weapon/cell))
 		if(!wired)
-			user << "<span class='notice'>[src] need to be wired first.</span>"
+			user << "<span class='notice'>The [src] need to be wired first.</span>"
 		else if(!cell)
 			user.drop_item()
 			W.loc = src
 			cell = W
-			user << "<span class='notice'>You attach a cell to [src].</span>"
+			user << "<span class='notice'>You attach the [cell] to the [src].</span>"
 			update_icon()
 		else
-			user << "<span class='notice'>[src] already have a cell.</span>"
+			user << "<span class='notice'>A [cell] is already attached to the [src].</span>"
+		return
 
 	else if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel))
 
-
-		wired = null
-
+		//stunglove stuff
 		if(cell)
 			cell.updateicon()
+			user << "<span class='notice'>You cut the [cell] away from the [src].</span>"
 			cell.loc = get_turf(src.loc)
 			cell = null
-		if(clipped == 0)
-			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
-			user.visible_message("\red [user] cut the fingertips off [src].","\red You cut the fingertips off [src].")
-			clipped = 1
-			if("exclude" in species_restricted)
-				name = "mangled [name]"
-				desc = "[desc] They have had the fingertips cut off of them."
-				species_restricted -= "Unathi"
-				species_restricted -= "Tajaran"
-				species_restricted += "stunglove"
-		else if(clipped == 1)
-			user << "<span class='notice'>[src] have already been clipped!</span>"
-			update_icon()
-
-		return
-
-		if(cell)
-			cell.updateicon()
-			cell.loc = get_turf(src.loc)
-			cell = null
-			user << "<span class='notice'>You cut the cell away from [src].</span>"
 			update_icon()
 			return
 		if(wired) //wires disappear into the void because fuck that shit
 			wired = 0
 			siemens_coefficient = initial(siemens_coefficient)
-			user << "<span class='notice'>You cut the wires away from [src].</span>"
+			user << "<span class='notice'>You cut the wires away from the [src].</span>"
 			update_icon()
-		..()
 			return
 		
+		//clipping fingertips
+		if(!clipped)
+			playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
+			user.visible_message("\red [user] cuts the fingertips off of the [src].","\red You cut the fingertips off of the [src].")
+			
+			clipped = 1
+			name = "mangled [name]"
+			desc = "[desc]<br>They have had the fingertips cut off of them."
+			if("exclude" in species_restricted)
+				species_restricted -= "Unathi"
+				species_restricted -= "Tajaran"
+			return
+		else
+			user << "<span class='notice'>The [src] have already been clipped!</span>"
+			update_icon()
+			return
+		
+		return
+		
+	..()
+
 /obj/item/clothing/gloves/update_icon()
 	..()
 	overlays.Cut()

code/modules/ext_scripts/irc.dm

@@ -26,3 +26,4 @@
 /hook/startup/proc/ircNotify()
 	send2mainirc("Server starting up on [config.server? "byond://[config.server]" : "byond://[world.address]:[world.port]"]")
 	return 1
+

code/modules/mining/abandonedcrates.dm

@@ -43,10 +43,7 @@
 		if(10)
 			for(var/i = 0, i < 3, i++)
 				new/obj/item/weapon/reagent_containers/glass/beaker/noreact(src)
-		if(11 to 12)
-			for(var/i = 0, i < 9, i++)
-				new/obj/item/bluespace_crystal(src)
-		if(13)
+		if(11 to 13)
 			new/obj/item/weapon/melee/classic_baton(src)
 		if(14)
 			return

code/modules/mob/hear_say.dm

@@ -4,10 +4,19 @@
 	if(!client)
 		return
 
+	if(sleeping || stat == 1)
+		hear_sleep(message)
+		return
+
 	var/style = "body"
-	if(language)
 	if(!say_understands(speaker,language))
+		if(istype(speaker,/mob/living/simple_animal))
+			var/mob/living/simple_animal/S = speaker
+			message = pick(S.speak)
+		else
 			message = stars(message)
+
+	if(language)
 		verb = language.speech_verb
 		style = language.colour
 		
@@ -21,6 +30,8 @@
 
 	var/track = null
 	if(istype(src, /mob/dead/observer))
+		if(italics && client.prefs.toggles & CHAT_GHOSTRADIO)
+			return
 		if(speaker_name != speaker.real_name)
 			speaker_name = "[speaker.real_name] ([speaker_name])"
 		track = "(<a href='byond://?src=\ref[src];track=\ref[speaker]'>follow</a>) "
@@ -33,25 +44,43 @@
 		else
 			src << "<span class='name'>[speaker_name]</span>[alt_name] talks but you cannot hear them."
 	else
-		src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track]<span class='[style]'>[verb], <span class='message'>\"[message]\"</span></span></span>"
+		src << "<span class='game say'><span class='name'>[speaker_name]</span>[alt_name] [track][verb], <span class='message'><span class='[style]'>\"[message]\"</span></span></span>"
 
 
-/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0)
+/mob/proc/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0, var/vname ="")
+
 	if(!client)
 		return
+
+	if(sleeping || stat==1) //If unconscious or sleeping
+		hear_sleep(message)
+		return
+
 	var/track = null
 
 	var/style = "body"
-	if(language)
+
 	if(!say_understands(speaker,language))
+		if(istype(speaker,/mob/living/simple_animal))
+			var/mob/living/simple_animal/S = speaker
+			message = pick(S.speak)
+		else
 			message = stars(message)
+
+	if(language)
 		verb = language.speech_verb
 		style = language.colour
 
+	
+
 	if(hard_to_hear)
 		message = stars(message)
 
 	var/speaker_name = speaker.name
+
+	if(vname)
+		speaker_name = vname
+
 	if(istype(speaker, /mob/living/carbon/human))
 		var/mob/living/carbon/human/H = speaker
 		if(H.voice)
@@ -79,7 +108,7 @@
 		track = "<a href='byond://?src=\ref[src];track=\ref[speaker]'>[speaker_name] ([jobname])</a>"
 
 	if(istype(src, /mob/dead/observer))
-		if(speaker_name != speaker.real_name)
+		if(speaker_name != speaker.real_name && !isAI(speaker)) //Announce computer and various stuff that broadcasts doesn't use it's real name but AI's can't pretend to be other mobs.
 			speaker_name = "[speaker.real_name] ([speaker_name])"
 		track = "[speaker_name] (<a href='byond://?src=\ref[src];track=\ref[speaker]'>follow</a>)"
 
@@ -87,6 +116,24 @@
 		if(prob(20))
 			src << "<span class='warning'>You feel your headset vibrate but can hear nothing from it!</span>"
 	else if(track)
-		src << "[part_a][track][part_b]<span class=\"[style]\"> [verb], \"[message]\"</span></span></span>"
+		src << "[part_a][track][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
 	else
-		src << "[part_a][speaker_name][part_b]<span class=\"[style]\"> [verb], \"[message]\"</span></span></span>"
+		src << "[part_a][speaker_name][part_b][verb], <span class=\"[style]\">\"[message]\"</span></span></span>"
+
+/mob/proc/hear_sleep(var/message)
+	var/heard = ""
+	if(prob(15))
+		var/list/punctuation = list(",", "!", ".", ";", "?")
+		var/list/messages = text2list(message, " ")
+		var/R = rand(1, messages.len)
+		var/heardword = messages[R]
+		if(copytext(heardword,1, 1) in punctuation)
+			heardword = copytext(heardword,2)
+		if(copytext(heardword,-1) in punctuation)
+			heardword = copytext(heardword,1,lentext(heardword))
+		heard = "<span class = 'game_say'>...You hear something about...[heardword]</span>"
+
+	else
+		heard = "<span class = 'game_say'>...<i>You almost hear someone talking</i>...</span>"
+
+	src << heard

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

@@ -258,6 +258,8 @@
 					adjustToxLoss(-(rads))
 					updatehealth()
 					return
+				if(species.flags & IS_SYNTHETIC)
+					return
 
 				var/damage = 0
 				switch(radiation)
@@ -1118,6 +1120,7 @@
 				speech_problem_flag = 1
 				stuttering = max(stuttering-1, 0)
 			if (slurring)
+				speech_problem_flag = 1
 				slurring = max(slurring-1, 0)
 			if(silent)
 				speech_problem_flag = 1

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

@@ -74,18 +74,32 @@
 				R.talk_into(src,message,null,verb,speaking)
 				used_radios += r_ear
 
-		if("right_ear")
+		if("right ear")
+			var/obj/item/device/radio/R
+			var/has_radio = 0
 			if(r_ear && istype(r_ear,/obj/item/device/radio))
-				var/obj/item/device/radio/R = r_ear		
-				R.talk_into(src,message,verb,speaking)
-				used_radios += r_ear
+				R = r_ear
+				has_radio = 1
+			if(r_hand && istype(r_hand, /obj/item/device/radio))
+				R = r_hand
+				has_radio = 1
+			if(has_radio)
+				R.talk_into(src,message,null,verb,speaking)
+				used_radios += R
 
 
-		if("left_ear")
+		if("left ear")
+			var/obj/item/device/radio/R
+			var/has_radio = 0
 			if(l_ear && istype(l_ear,/obj/item/device/radio))
-				var/obj/item/device/radio/R = l_ear
-				R.talk_into(src,message,verb,speaking)
-				used_radios += l_ear
+				R = l_ear
+				has_radio = 1
+			if(l_hand && istype(l_hand,/obj/item/device/radio))
+				R = l_hand				
+				has_radio = 1
+			if(has_radio)
+				R.talk_into(src,message,null,verb,speaking)
+				used_radios += R
 
 		if("intercom")
 			for(var/obj/item/device/radio/intercom/I in view(1, null))
@@ -106,7 +120,7 @@
 			return
 		else
 			if(message_mode)
-				if(message_mode in radiochannels)
+				if(message_mode in (radiochannels | "department"))
 					if(l_ear && istype(l_ear,/obj/item/device/radio))
 						l_ear.talk_into(src,message, message_mode, verb, speaking)
 						used_radios += l_ear
@@ -117,7 +131,7 @@
 
 	if(used_radios.len)
 		italics = 1
-		message_range = 3
+		message_range = 1
 
 	var/datum/gas_mixture/environment = loc.return_air()
 	if(environment)
@@ -128,7 +142,7 @@
 
 	..(message, speaking, verb, alt_name, italics, message_range, used_radios)
 
-/mob/living/carbon/human/say_understands(var/other,var/datum/language/speaking = null)
+/mob/living/carbon/human/say_understands(var/mob/other,var/datum/language/speaking = null)
 
 	if(has_brain_worms()) //Brain worms translate everything. Even mice and alien speak.
 		return 1
@@ -138,6 +152,11 @@
 		return 1
 	if (istype(other, /mob/living/carbon/slime))
 		return 1
+	if (istype(other, /mob/living/simple_animal))
+		if(other.universal_speak || src.universal_speak || src.universal_understand)
+			return 1
+		return 0
+
 	return ..()
 
 /mob/living/carbon/human/GetVoice()

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

@@ -514,3 +514,22 @@
 
 /mob/living/carbon/monkey/IsAdvancedToolUser()//Unless its monkey mode monkeys cant use advanced tools
 	return 0
+
+/mob/living/carbon/monkey/say(var/message)
+        if(stat)
+                return
+
+        if(copytext(message,1,2) == "*")
+                return emote(copytext(message,2))
+
+        if(stat)
+                return
+
+        var/verb = "says"
+
+        if(speak_emote.len)
+                verb = pick(speak_emote)
+
+        message = capitalize(trim_left(message))
+
+        ..(message, null, verb)

code/modules/mob/living/say.dm

@@ -88,6 +88,7 @@ var/list/department_radio_keys = list(
 	var/list/listening = list()
 	if(T)
 
+		var/list/objects = list()
 		var/list/hear = hear(message_range, T)
 		var/list/hearturfs = list()
 
@@ -96,22 +97,24 @@ var/list/department_radio_keys = list(
 				var/mob/M = I
 				listening += M
 				hearturfs += M.locs[1]
-				for(var/obj/item/device/radio/R in contents)
-					spawn(0)
-						R.hear_talk(src, message, verb, speaking)
+				for(var/obj/O in M.contents)
+					objects |= O
 			else if(istype(I, /obj/))
 				var/obj/O = I
 				hearturfs += O.locs[1]
-				if(istype(O, /obj/item/device/radio))
-					spawn(0)
-						O.hear_talk(src, message, verb, speaking)
+				objects |= O
+		
 		for(var/mob/M in player_list)
 			if(M.stat == DEAD && client && (M.client.prefs.toggles & CHAT_GHOSTEARS))
 				listening |= M
 				continue
-			if(M.locs[1] in hearturfs)
+			if(M.loc && M.locs[1] in hearturfs)
 				listening |= M
 
+		for(var/obj/O in objects)
+			spawn(0)
+				O.hear_talk(src, message, verb, speaking)	
+
 	var/speech_bubble_test = say_test(message)
 	var/image/speech_bubble = image('icons/mob/talk.dmi',src,"h[speech_bubble_test]")
 	spawn(30) del(speech_bubble)
@@ -123,7 +126,6 @@ var/list/department_radio_keys = list(
 
 
 	for(var/mob/M in listening)
-		if(M.client)
 		M << speech_bubble
 		M.hear_say(message,verb,speaking,alt_name, italics, src)
 

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

@@ -52,12 +52,11 @@
 /datum/robot_component/proc/is_powered()
 	return (installed == 1) && (brute_damage + electronics_damage < max_damage) && (!energy_consumption || powered)
 
-
-/datum/robot_component/proc/consume_power()
+/datum/robot_component/proc/update_power_state()
 	if(toggled == 0)
 		powered = 0
 		return
-	if(owner.cell.charge >= energy_consumption)
+	if(owner.cell && owner.cell.charge >= energy_consumption)
 		owner.cell.use(energy_consumption)
 		powered = 1
 	else
@@ -75,6 +74,10 @@
 	external_type = /obj/item/robot_parts/robot_component/actuator
 	max_damage = 50
 
+//A fixed and much cleaner implementation of /tg/'s special snowflake code.
+/datum/robot_component/actuator/is_powered()
+	return (installed == 1) && (brute_damage + electronics_damage < max_damage)
+
 /datum/robot_component/cell
 	name = "power cell"
 	max_damage = 50

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

@@ -25,6 +25,9 @@
 	else
 		msg += "Its cover is closed.\n"
 
+	if(!has_power)
+		msg += "<span class='warning'>It appears to be running on backup power.</span>\n"
+	
 	switch(src.stat)
 		if(CONSCIOUS)
 			if(!src.client)	msg += "It appears to be in stand-by mode.\n" //afk

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

@@ -33,11 +33,11 @@
 
 /mob/living/silicon/robot/proc/use_power()
 
-	if (is_component_functioning("power cell") && cell)
-		if(src.cell.charge <= 0)
-			uneq_all()
-			src.stat = 1
-		else
+	for(var/V in components)
+		var/datum/robot_component/C = components[V]
+		C.update_power_state()
+
+	if ( cell && is_component_functioning("power cell") && src.cell.charge > 0 )
 		if(src.module_state_1)
 			src.cell.use(3)
 		if(src.module_state_2)
@@ -45,17 +45,11 @@
 		if(src.module_state_3)
 			src.cell.use(3)
 
-			for(var/V in components)
-				var/datum/robot_component/C = components[V]
-				C.consume_power()
-
-			if(!is_component_functioning("actuator"))
-				Paralyse(3)
-
-			src.stat = 0
+		src.has_power = 1
 	else
-		uneq_all()
-		src.stat = 1
+		if (src.has_power)
+			src << "\red You are now running on emergency backup power."
+		src.has_power = 0
 
 
 /mob/living/silicon/robot/proc/handle_regular_status_updates()
@@ -79,7 +73,7 @@
 		death()
 
 	if (src.stat != 2) //Alive.
-		if (src.paralysis || src.stunned || src.weakened) //Stunned etc.
+		if (src.paralysis || src.stunned || src.weakened || !src.has_power) //Stunned etc.
 			src.stat = 1
 			if (src.stunned > 0)
 				AdjustStunned(-1)
@@ -124,6 +118,10 @@
 		src.druggy--
 		src.druggy = max(0, src.druggy)
 
+	//update the state of modules and components here
+	if (src.stat != 0)
+		uneq_all()
+	
 	if(!is_component_functioning("radio"))
 		radio.on = 0
 	else
@@ -134,6 +132,9 @@
 	else
 		src.blinded = 1
 		
+	if(!is_component_functioning("actuator"))
+		src.Paralyse(3)
+
 
 	return 1
 

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

@@ -42,6 +42,7 @@
 	var/emagged = 0
 	var/wiresexposed = 0
 	var/locked = 1
+	var/has_power = 1
 	var/list/req_access = list(access_robotics)
 	var/ident = 0
 	//var/list/laws = list()

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

@@ -27,6 +27,9 @@
 		message = trim(copytext(sanitize(message), 1, MAX_MESSAGE_LEN))
 		return say_dead(message)
 
+	if(copytext(message,1,2) == "*")
+		return emote(copytext(message,2))
+
 	var/bot_type = 0			//Let's not do a fuck ton of type checks, thanks.
 	if(istype(src, /mob/living/silicon/ai))
 		bot_type = IS_AI
@@ -132,17 +135,16 @@
 
 	var/obj/machinery/hologram/holopad/T = src.current
 	if(istype(T) && T.hologram && T.master == src)//If there is a hologram and its master is the user.
-		var/message_a = say_quote(message)
+		var/verb = say_quote(message)
 
 		//Human-like, sorta, heard by those who understand humans.
-		var/rendered_a = "<span class='game say'><span class='name'>[name]</span> <span class='message'>[message_a]</span></span>"
+		var/rendered_a = "<span class='game say'><span class='name'>[name]</span> [verb], <span class='message'>\"[message]\"</span></span>"
 
 		//Speach distorted, heard by those who do not understand AIs.
-		message = stars(message)
-		var/message_b = say_quote(message)
-		var/rendered_b = "<span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[message_b]</span></span>"
+		var/message_stars = stars(message)
+		var/rendered_b = "<span class='game say'><span class='name'>[voice_name]</span> [verb], <span class='message'>\"[message_stars]\"</span></span>"
 
-		src << "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> <span class='message'>[message_a]</span></span></i>"//The AI can "hear" its own message.
+		src << "<i><span class='game say'>Holopad transmitted, <span class='name'>[real_name]</span> [verb], <span class='message'>[message]</span></span></i>"//The AI can "hear" its own message.
 		for(var/mob/M in hearers(T.loc))//The location is the object, default distance.
 			if(M.say_understands(src))//If they understand AI speak. Humans and the like will be able to.
 				M.show_message(rendered_a, 2)
@@ -163,13 +165,15 @@
 	if (!message)
 		return
 
-	var/message_a = say_quote(message)
-	var/rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i>"
+	var/verb = say_quote(message)
+	
+
+	var/rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[verb], \"[message]\"</span></span></i>"
 
 	for (var/mob/living/S in living_mob_list)
 		if(S.robot_talk_understand && (S.robot_talk_understand == robot_talk_understand)) // This SHOULD catch everything caught by the one below, but I'm not going to change it.
 			if(istype(S , /mob/living/silicon/ai))
-				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[message_a]</span></span></i>"
+				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
 				S.show_message(renderedAI, 2)
 			else
 				S.show_message(rendered, 2)
@@ -177,7 +181,7 @@
 
 		else if (S.binarycheck())
 			if(istype(S , /mob/living/silicon/ai))
-				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[message_a]</span></span></i>"
+				var/renderedAI = "<i><span class='game say'>Robotic Talk, <a href='byond://?src=\ref[S];track2=\ref[S];track=\ref[src]'><span class='name'>[name]</span></a> <span class='message'>[verb], \"[message]\"</span></span></i>"
 				S.show_message(renderedAI, 2)
 			else
 				S.show_message(rendered, 2)
@@ -190,22 +194,17 @@
 	for (var/mob/M in listening)
 		if(!istype(M, /mob/living/silicon) && !M.robot_talk_understand)
 			heard += M
-
 	if (length(heard))
-		var/message_b
+		var/message_beep
+		verb = "beeps"
+		message_beep = "beep beep beep"
 		
-		message_b = "beep beep beep"
-		message_b = say_quote(message_b)
-		message_b = "<i>[message_b]</i>"
-
-		rendered = "<i><span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[message_b]</span></span></i>"
+		rendered = "<i><span class='game say'><span class='name'>[voice_name]</span> <span class='message'>[verb], \"[message_beep]\"</span></span></i>"
 
 		for (var/mob/M in heard)
 			M.show_message(rendered, 2)
 
-	message = say_quote(message)
-
-	rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[message_a]</span></span></i>"
+	rendered = "<i><span class='game say'>Robotic Talk, <span class='name'>[name]</span> <span class='message'>[verb], \"[message]\"</span></span></i>"
 
 	for (var/mob/M in dead_mob_list)
 		if(!istype(M,/mob/new_player) && !istype(M,/mob/living/carbon/brain)) //No meta-evesdropping

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

@@ -13,6 +13,7 @@
 	a_intent = "harm"
 	stop_automated_movement = 1
 	status_flags = CANPUSH
+	universal_speak = 1
 	attack_sound = 'sound/weapons/punch1.ogg'
 	min_oxy = 0
 	max_oxy = 0
@@ -167,6 +168,10 @@
 				M.show_message("\red [user] gently taps [src] with [O]. ")
 
 
+/mob/living/simple_animal/construct/armoured/Life()
+	weakened = 0
+	..()
+
 /mob/living/simple_animal/construct/armoured/bullet_act(var/obj/item/projectile/P)
 	if(istype(P, /obj/item/projectile/energy) || istype(P, /obj/item/projectile/beam))
 		var/reflectchance = 80 - round(P.damage/3)

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

@@ -8,6 +8,7 @@
 	speak_emote = list("clicks")
 	emote_hear = list("clicks")
 	emote_see = list("clacks")
+	universal_speak = 1
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/meat

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

@@ -48,6 +48,7 @@
 	response_disarm = "gently moves aside the"
 	response_harm   = "swats the"
 	stop_automated_movement = 1
+	universal_speak = 1
 
 	var/parrot_state = PARROT_WANDER //Hunt for a perch when created
 	var/parrot_sleep_max = 25 //The time the parrot sits while perched before looking around. Mosly a way to avoid the parrot's AI in life() being run every single tick.
@@ -703,3 +704,55 @@
 	ears = new /obj/item/device/radio/headset/headset_eng(src)
 	available_channels = list(":e")
 	..()
+
+/mob/living/simple_animal/parrot/say(var/message)
+
+	if(stat)
+		return
+
+	var/verb = "says"
+	if(speak_emote.len)
+		verb = pick(speak_emote)
+
+
+	var/message_mode=""
+	if(copytext(message,1,2) == ";")
+		message_mode = "headset"
+		message = copytext(message,2)
+
+	if(length(message) >= 2)
+		var/channel_prefix = copytext(message, 1 ,3)
+		message_mode = department_radio_keys[channel_prefix]
+
+	if(copytext(message,1,2) == ":")
+		var/positioncut = 3
+		message = trim(copytext(message,positioncut))
+
+	message = capitalize(trim_left(message))
+
+	if(message_mode)
+		if(message_mode in radiochannels)
+			if(ears && istype(ears,/obj/item/device/radio))
+				ears.talk_into(src,message, message_mode, verb, null)
+
+
+	..(message)
+
+
+/mob/living/simple_animal/parrot/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
+	if(prob(50))
+		parrot_hear(message)
+	..(message,verb,language,alt_name,italics,speaker)
+
+
+
+/mob/living/simple_animal/parrot/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0)
+	if(prob(50))
+		parrot_hear("[pick(available_channels)] [message]")
+	..(message,verb,language,part_a,part_b,speaker,hard_to_hear)
+
+
+/mob/living/simple_animal/parrot/proc/parrot_hear(var/message="")
+	if(!message || stat)
+		return
+	speech_buffer.Add(message)

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

@@ -8,6 +8,7 @@
 	icon_dead = "shade_dead"
 	maxHealth = 50
 	health = 50
+	universal_speak = 1
 	speak_emote = list("hisses")
 	emote_hear = list("wails","screeches")
 	response_help  = "puts their hand through"

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

@@ -15,7 +15,7 @@
 
 	var/turns_per_move = 1
 	var/turns_since_move = 0
-	universal_speak = 1
+	universal_speak = 0		//No, just no.
 	var/meat_amount = 0
 	var/meat_type
 	var/stop_automated_movement = 0 //Use this to temporarely stop random movement or to if you write special movement code for animals.
@@ -454,3 +454,22 @@
 	overlays = null
 	if (targeted_by && target_locked)
 		overlays += target_locked
+
+/mob/living/simple_animal/say(var/message)
+	if(stat)
+		return
+
+	if(copytext(message,1,2) == "*")
+		return emote(copytext(message,2))
+
+	if(stat)	
+		return
+
+	var/verb = "says"
+
+	if(speak_emote.len)
+		verb = pick(speak_emote)
+
+	message = capitalize(trim_left(message))
+
+	..(message, null, verb)

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

@@ -19,6 +19,8 @@
 	maxHealth = 30
 	health = 30
 
+	universal_speak =1
+
 	stop_automated_movement = 1
 	animate_movement = SYNC_STEPS
 

code/modules/mob/login.dm

@@ -55,3 +55,5 @@
 		var/mob/living/carbon/human/H = src
 		if(H.species && H.species.abilities)
 			client.verbs |= H.species.abilities
+
+	nanomanager.send_resources(client)

code/modules/mob/new_player/login.dm

@@ -29,5 +29,6 @@
 	new_player_panel()
 	spawn(40)
 		if(client)
+			nanomanager.send_resources(client)
 			handle_privacy_poll()
 			client.playtitlemusic()

code/modules/mob/new_player/new_player.dm

@@ -417,3 +417,10 @@
 	proc/close_spawn_windows()
 		src << browse(null, "window=latechoices") //closes late choices window
 		src << browse(null, "window=playersetup") //closes the player setup window
+
+
+/mob/new_player/hear_say(var/message, var/verb = "says", var/datum/language/language = null, var/alt_name = "",var/italics = 0, var/mob/speaker = null)
+	return
+
+/mob/new_player/hear_radio(var/message, var/verb="says", var/datum/language/language=null, var/part_a, var/part_b, var/mob/speaker = null, var/hard_to_hear = 0)
+	return

code/modules/organs/organ.dm

@@ -62,7 +62,6 @@
 		else
 			E.process()
 			number_wounds += E.number_wounds
-
 			//Robotic limb malfunctions
 			var/malfunction = 0
 			if (E.status & ORGAN_ROBOT && prob(E.brute_dam + E.burn_dam))
@@ -81,20 +80,24 @@
 					I.take_damage(rand(3,5))
 
 			//Special effects for limbs.
-			if(E.name in list("l_hand","l_arm","r_hand","r_arm") && (broken||malfunction))
+			if(E.name in list("l_hand","l_arm","r_hand","r_arm"))
 				var/obj/item/c_hand		//Getting what's in this hand
+				var/hand
 				if(E.name == "l_hand" || E.name == "l_arm")
 					c_hand = l_hand
+					hand = "left hand"
 				if(E.name == "r_hand" || E.name == "r_arm")
 					c_hand = r_hand
-
+					hand = "right hand"
 				if (c_hand)
-					u_equip(c_hand)
 
 					if(broken)
-						emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : "screams in pain and"] drops what they were holding in their [E.display_name?"[E.display_name]":"[E]"]!")
+						u_equip(c_hand)
+						var/emote_scream = pick("screams in pain and", "let's out a sharp hiss and", "cries out and")
+						emote("me", 1, "[(species && species.flags & NO_PAIN) ? "" : emote_scream ] drops what they were holding in their [hand]!")
 					if(malfunction)
-						emote("me", 1, "drops what they were holding, their [E.display_name?"[E.display_name]":"[E]"] malfunctioning!")
+						u_equip(c_hand)
+						emote("me", 1, "drops what they were holding, their [hand] malfunctioning!")
 						var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 						spark_system.set_up(5, 0, src)
 						spark_system.attach(src)

code/modules/organs/organ_external.dm

@@ -376,20 +376,21 @@ This function completely restores a damaged organ to perfect condition.
 
 		// Internal wounds get worse over time. Low temperatures (cryo) stop them.
 		if(W.internal && !W.is_treated() && owner.bodytemperature >= 170)
-			if(!owner.reagents.has_reagent("bicaridine"))	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
+			var/bicardose = owner.reagents.get_reagent_amount("bicaridine")
+			if(!bicardose)	//bicard stops internal wounds from growing bigger with time, and also stop bleeding
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
+			if(bicardose >= 30)	//overdose of bicaridine begins healing IB
+				W.damage = max(0, W.damage - 0.2)
+
 			if(!owner.reagents.has_reagent("inaprovaline")) //This little copypaste will allow inaprovaline to work too, giving it a much needed buff to help medical.
 				W.open_wound(0.1 * wound_update_accuracy)
 				owner.vessel.remove_reagent("blood",0.05 * W.damage * wound_update_accuracy)
 
-			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)//Bicaridine slows Internal Bleeding
+			owner.vessel.remove_reagent("blood",0.02 * W.damage * wound_update_accuracy)
 			if(prob(1 * wound_update_accuracy))
 				owner.custom_pain("You feel a stabbing pain in your [display_name]!",1)
 
-			//overdose of bicaridine begins healing IB
-			if(owner.reagents.get_reagent_amount("bicaridine") >= 30)
-				W.damage = max(0, W.damage - 0.2)
 
 		// slow healing
 		var/heal_amt = 0

code/modules/organs/organ_internal.dm

@@ -129,10 +129,8 @@
 					// Ethanol and all drinks are bad
 					if(istype(R, /datum/reagent/ethanol))
 						owner.adjustToxLoss(0.1 * process_accuracy)
-
 					// Can't cope with toxins at all
-				for(var/toxin in list("toxin", "phoron", "sacid", "pacid", "cyanide", "lexorin", "amatoxin", "chloralhydrate", "carpotoxin", "zombiepowder", "mindbreaker"))
-					if(owner.reagents.has_reagent(toxin))
+					if(istype(R, /datum/reagent/toxin))
 						owner.adjustToxLoss(0.3 * process_accuracy)
 
 /datum/organ/internal/kidney

code/modules/paperwork/paperbin.dm

@@ -33,6 +33,12 @@
 		if(temp && !temp.is_usable())
 			user << "<span class='notice'>You try to move your [temp.display_name], but cannot!"
 			return
+	var/response = ""
+	if(!papers.len > 0)
+		response = alert(user, "Do you take regular paper, or Carbon copy paper?", "Paper type request", "Regular", "Carbon-Copy", "Cancel")
+		if (response != "Regular" && response != "Carbon-Copy")
+			add_fingerprint(user)
+			return
 	if(amount >= 1)
 		amount--
 		if(amount==0)
@@ -43,12 +49,15 @@
 			P = papers[papers.len]
 			papers.Remove(P)
 		else
+			if(response == "Regular")
 				P = new /obj/item/weapon/paper
 				if(Holiday == "April Fool's Day")
 					if(prob(30))
 						P.info = "<font face=\"[P.crayonfont]\" color=\"red\"><b>HONK HONK HONK HONK HONK HONK HONK<br>HOOOOOOOOOOOOOOOOOOOOOONK<br>APRIL FOOLS</b></font>"
 						P.rigged = 1
 						P.updateinfolinks()
+			else if (response == "Carbon-Copy")
+				P = new /obj/item/weapon/paper/carbon
 
 		P.loc = user.loc
 		user.put_in_hands(P)
@@ -86,29 +95,3 @@
 		icon_state = "paper_bin0"
 	else
 		icon_state = "paper_bin1"
-
-
-/obj/item/weapon/paper_bin/carbon
-	name = "carbonless paper bin"
-	icon_state = "paper_bin2"
-
-/obj/item/weapon/paper_bin/carbon/attack_hand(mob/user as mob)
-	if(amount >= 1)
-		amount--
-		if(amount==0)
-			update_icon()
-
-		var/obj/item/weapon/paper/carbon/P
-		if(papers.len > 0)	//If there's any custom paper on the stack, use that instead of creating a new paper.
-			P = papers[papers.len]
-			papers.Remove(P)
-		else
-			P = new /obj/item/weapon/paper/carbon
-		P.loc = user.loc
-		user.put_in_hands(P)
-		user << "<span class='notice'>You take [P] out of the [src].</span>"
-	else
-		user << "<span class='notice'>[src] is empty!</span>"
-
-	add_fingerprint(user)
-	return

code/modules/projectiles/gun.dm

@@ -28,8 +28,8 @@
 	var/automatic = 0 //Used to determine if you can target multiple people.
 	var/tmp/mob/living/last_moved_mob //Used to fire faster at more than one person.
 	var/tmp/told_cant_shoot = 0 //So that it doesn't spam them with the fact they cannot hit them.
-	var/firerate = 1 	// 0 for one bullet after tarrget moves and aim is lowered,
-						//1 for keep shooting until aim is lowered
+	var/firerate = 0 	//0 for keep shooting until aim is lowered
+						// 1 for one bullet after tarrget moves and aim is lowered
 	var/fire_delay = 6
 	var/last_fired = 0
 

code/modules/projectiles/guns/projectile/shotgun.dm

@@ -26,7 +26,7 @@
 
 	attack_self(mob/living/user as mob)
 		if(recentpump)	return
-		pump()
+		pump(user)
 		recentpump = 1
 		spawn(10)
 			recentpump = 0

code/modules/projectiles/projectile/bullets.dm

@@ -62,3 +62,4 @@
 
 /obj/item/projectile/bullet/chameleon
 	damage = 1 // stop trying to murderbone with a fake gun dumbass!!!
+	embed = 0 // nope

code/modules/reagents/reagent_containers/glass.dm

@@ -281,6 +281,13 @@
 			user.drop_from_inventory(src)
 			del(src)
 			
+	update_icon()
+		overlays.Cut()
+
+		if (!is_open_container())
+			var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
+			overlays += lid
+
 // vials are defined twice, what?
 /*
 /obj/item/weapon/reagent_containers/glass/beaker/vial

code/modules/research/xenoarchaeology/manuals.dm

@@ -1,17 +1,18 @@
 
 /obj/item/weapon/book/manual/excavation
-	name = "Out on the dig"
+	name = "Out on the Dig"
 	icon_state = "excavation"
 	author = "Professor Patrick Mason, Curator of the Antiquities Museum on Ichar VII"
-	title = "Out on the dig"
+	title = "Out on the Dig"
 	dat = {"<html>
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
@@ -30,43 +31,43 @@
 				Every digsite I've been to, someone has forgotten something and I've never yet been to a dig that hasn't had me hiking to get to it - so gather your gear
 				and get it to the site the first time. You learn quick that time is money, when you've got a shipful of bandits searching for you the next valley over,
 				but don't be afraid to clear some space if there are any inconvenient boulders in the way.<br>
-				<list>
+				<ul>
 					<li>Floodlights (if it's dark)</li>
 					<li>Wooden trestle tables (for holding tools and finds)</li>
 					<li>Suspension field generator</li>
 					<li>Load bearing servitors (such as a mulebot, or hover-tray)</li>
 					<li>Spare energy packs</li>
-				</list><br>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Tools">Knowing your tools</a></h1>
 				Every archaeologist has a plethora of tools at their disposal, but here's the important ones:<br>
-				<list>
-				<li><b>Picks, pickaxes and brushes</b> - don't underestimate the the smallest or largest in your arsenal, each one clears a different amount
+				<ul>
+					<li><b>Picks, pickaxes, and brushes</b> - don't underestimate the the smallest or largest in your arsenal, each one clears a different amount
 						of the rockface so each one has a use.</li>
 					<li><b>Measuring tape</b> - don't leave home without it, you can use it to measure the depth a rock face has been excavated to.</li>
-				<li><b>GPS locater</b> - knowing where you are is the first step to not be lost.</li>
+					<li><b>GPS locator</b> - knowing where you are is the first step to not be lost.</li>
 					<li><b>Core sampler</b> - use this to take core samples from rock faces, which you can then run to the lab for analysis.</li>
-				<li><b>Depth scanner</b> - uses x-ray diffraction to locate anomalous densities in rock, indicating archaeological deposits or mineral veins.
-					Comes with a handy reference log containing co-ordinates and time of each scan.</li>
+					<li><b>Depth scanner</b> - uses X-ray diffraction to locate anomalous densities in rock, indicating archaeological deposits or mineral veins.
+						Comes with a handy reference log containing coordinates and time of each scan.</li>
 					<li><b>Alden-Saraspova counter</b> - uses a patented application of Fourier Transform analysis to determine the difference between background and
 						exotic radiation. Use it to determine how far you are from anomalous energy sources.</li>
-				<li><b>Radio beacon locater</b> - leave a beacon at an item of interest, then track it down later with this handy gadget. Watch for interference from other
+					<li><b>Radio beacon locator</b> - leave a beacon at an item of interest, then track it down later with this handy gadget. Watch for interference from other
 						devices though.</li>
 					<li><b>Flashlight or portable light source</b> - Self explanatory, I hope.</li>
-				<li><b>Environmental safety gear</b> - This one's dependant on the environment you're working in, but enclosed footwear and pack of internals
+					<li><b>Environmental safety gear</b> - This one's dependent on the environment you're working in, but enclosed footwear and a pack of internals
 						could save your life.</li>
-				<li><b>Anomaly safety gear</b> - A biosealed and catalysis-resistant suit along with eye shielding, tinted hood and non-reactive disposable gloves are
-				the best kind of protection you can hope for from the errors our forbears may have unleashed.</li>
+					<li><b>Anomaly safety gear</b> - A biosealed and catalysis-resistant suit along with eye shielding, tinted hood, and non-reactive disposable gloves are
+					the best kind of protection you can hope for from the errors our forebears may have unleashed.</li>
 					<li><b>Personal defence weapon</b> - Never know what you'll find on the dig: pirates, natives, ancient guardians, carnivorous wildlife...
 						it pays in blood to be prepared.</li>
-				</list><br>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Find">Finding the dig</a></h1>
 				Wouldn't be an archaeologist without their dig, but everyone has to start somewhere. Here's a basic procedure I go through when cataloguing a new planet:<br>
-				<list>
-				<li><b>Get in touch with the locals</b> (in particular geologists, miners and farmers) - Never know what's been turned up by accident, then left to
+				<ul>
+					<li><b>Get in touch with the locals</b> (in particular geologists, miners, and farmers) - Never know what's been turned up by accident, then left to
 						gather dust on a shelf.</li>
 					<li><b>Check the obvious areas first</b> - even if you're pressed for time, these ones are the generally easiest to search, and the most likely targets
 						of your rivals.</li>
@@ -75,36 +76,36 @@
 					<li><b>Tips on unearthing a deposit</b> - How do you know when you're golden? Look for telltale white strata that looks strange or out of place, or if
 						something has broken under your pick while you're digging. Your depth scanner is your best friend, but even it can't distinguish between
 						ordinary minerals and ancient leavings, if in doubt then err on the side of caution.</li>
-				</list><br>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Analyse">Analysing the contents of a dig</a></h1>
 				You've found some unusual strata, but it's not all peaches from here. No archaeologist ever managed to pull a bone from the earth without doing thorough
 				chemical analysis on every two meters of rock face nearby.<br>
-				<list>
+				<ul>
 					<li><b>Take core samples</b> - Grab a rock core for every 4m^2.</li>
 					<li><b>Clear around any potential finds</b> - Clear away ordinary rock, leaving your prizes reachable in a clearly marked area.</li>
 					<li><b>Haul off excess rock</b> - It's easy for a dig to get cluttered, and a neat archaeologist is a successful archaeologist.</li>
 					<li><b>Don't be afraid to be cautious</b> - It's slower sometimes, but the extra time will be worth the payoff when you find an Exolitic relic.</li>
 					<li><b>Chemical analysis</b> - I won't go into detail here, but the labwork is essential to any successful extraction. Marshal your core samples, and
-					send them off to the labcoated geniuses</li>
-				</list><br>
+						send them off to the labcoated geniuses.</li>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Excavate">Extracting your first find</a></h1>
-				<list>
+				<ul>
 					<li><b>Scan the rock</b> - Use a depth scanner to determine the find's depth and clearance. DON'T FORGET THESE.</li>
-				<li><b>Choose stasis field</b> - Chemical analysis on a core sample from the rock face will tell you which field is necessary to extract the find safely</li>
-				<li><b>Setup field gen</b> - Bolt it down, choose the field, check the charge and activate it. If you forget it, you'll wish you hadn't when that priceless
+					<li><b>Choose stasis field</b> - Chemical analysis on a core sample from the rock face will tell you which field is necessary to extract the find safely.</li>
+					<li><b>Setup field gen</b> - Bolt it down, choose the field, check the charge, and activate it. If you forget it, you'll wish you hadn't when that priceless
 						Uryom vase crumbles as it sees the light of day.</li>
 					<li><b>FUNCTIONAL AND SAFE digging</b> - Dig into the rock until you've cleared away a depth equal to (the anomaly depth MINUS the clearance range). The find
 						should come loose on it's own, but it will be in the midst of a chunk of rock. Use a welder or miniature excavation tool to clear away the excess.</li>
 					<li><b>FANCY AND SPEEDY digging</b> - Dig into the rock until you've cleared away a depth equal to the anomaly depth, but without any of your strokes
 						entering the clearance range.</li>
-				<li><b>The Big Find</b> - Sometimes, you'll chance upon something big, both literally and figuratively. Giant statues and functioning remnants of Precursor
+					<li><b>The big find</b> - Sometimes, you'll chance upon something big, both literally and figuratively. Giant statues and functioning remnants of Precursor
 						technology are just as exciting, to the right buyers. If your digging leaves a large boulder behind, dig into it normally and see if anything's hidden
 							inside.</li>
-				</list><br>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				</body>
@@ -112,7 +113,7 @@
 			"}
 
 /obj/item/weapon/book/manual/mass_spectrometry
-	name = "High power mass spectrometry, a comprehensive guide"
+	name = "High Power Mass Spectrometry: A Comprehensive Guide"
 	icon_state = "analysis"
 	author = "Winton Rice, Chief Mass Spectrometry Technician at the Institute of Applied Sciences on Arcadia"
 	title = "High powered mass spectrometry, a comprehensive guide"
@@ -120,10 +121,11 @@
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
@@ -138,25 +140,25 @@
 
 				<br>
 				<h1><a name="Terms">A note on terms</a></h1>
-				<list>
+				<ul>
 					<li><b>Mass spectrometry</b> - MS is the procedure used used to measure and quantify the components of matter. The most prized tool in the field of
-					'Materials analysis'</li>
+						'Materials analysis.'</li>
 					<li><b>Radiometric dating</b> - MS applied using the right carrier reagents can be used to accurately determine the age of a sample.</li>
-				<li><b>Dissonance ratio</b> - This is a pseudoarbitrary value indicating the overal presence of a particular element in a greater composite.
+					<li><b>Dissonance ratio</b> - This is a pseudoarbitrary value indicating the overall presence of a particular element in a greater composite.
 						It takes into account volume, density, molecular excitation and isotope spread.</li>
 					<li><b>Vacuum seal integrity</b> - A reference to how close an airtight seal is to failure.</li>
-				</list><br>
+				</ul><br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Analysis">Analysis progression</a></h1>
-				Modern mass spectrometry requires constant attention from the diligant researcher in order to be successul. There are many different elements to juggle,
+				Modern mass spectrometry requires constant attention from the diligent researcher in order to be successful. There are many different elements to juggle,
 					and later chapters will delve into them. For the spectrometry assistant, the first thing you need to know is that the scanner wavelength is automatically
 					calculated for you. Just tweak the settings and try to match it with the actual wavelength as closely as possible.<br>
 				<br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Seal">Seal integrity</a></h1>
-				In order to maintain sterile and environmentally static procedures, a special chamber is setup inside the spectrometer. It's protected by a proprietary vacuum seal
+				In order to maintain sterile and environmentally static procedures, a special chamber is set up inside the spectrometer. It's protected by a proprietary vacuum seal
 					produced by top tier industrial science. It will only last for a certain number of scans before failing outright, but it can be resealed through use of nanite paste.
 					Unfortunately, it's susceptible to malforming under heat stress so exposing it to higher temperatures will cause it's operation life to drop significantly.<br>
 				<br>
@@ -182,47 +184,50 @@
 			"}
 
 /obj/item/weapon/book/manual/anomaly_spectroscopy
-	name = "Spectroscopy: Analysing the anomalies of the cosmos"
+	name = "Spectroscopy: Analysing the Anomalies of the Cosmos"
 	icon_state = "anomaly"
 	author = "Doctor Martin Boyle, Director Research at the Lower Hydrolian Sector Listening Array"
-	title = "Spectroscopy: Analysing the anomalies of the cosmos"
+	title = "Spectroscopy: Analysing the Anomalies of the Cosmos"
 	dat = {"<html>
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
-
+				<br>
 				It's perhaps one of the most exciting times to be alive, with the recent breakthroughs in understanding and categorisation of things we may one day no longer call
 				'anomalies,' but rather 'infrequent or rare occurrences of certain celestial weather or phenomena.' Perhaps a little more long winded, but no less eloquent all the
 				same! Why, look at the strides we're making in piercing the walls of bluespace or our steadily improving ability to clarify and stabilise subspace emissions; it's
-				certainly an exciting time to be alive. For the moment the Hydrolian hasn't seen two spatial anomalies alike but the day will come and it is soon, I can feel it.
-			"}
+				certainly an exciting time to be alive. For the moment, the Hydrolian hasn't seen two spatial anomalies alike but the day will come and it is soon, I can feel it.
+				</body>
+			</html>"}
 
 /obj/item/weapon/book/manual/materials_chemistry_analysis
-	name = "Materials analysis and the chemical implications"
+	name = "Materials Analysis and the Chemical Implications"
 	icon_state = "chemistry"
 	author = "Jasper Pascal, Senior Lecturer in Materials Analysis at the University of Jol'Nar"
-	title = "Materials analysis and the chemical implications"
+	title = "Materials Analysis and the Chemical Implications"
 	dat = {"<html>
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
-
+				<br>
 				In today's high tech research fields, leaps and bounds are being made every day. Whether it's great strides forward in our understanding of the physical universe
-				or the operation of some fancy new piece of equipment, it seems like all the cool fields are producing new toys to play with leaving doddery old fields such as
+				or the operation of some fancy new piece of equipment, it seems like all the cool fields are producing new toys to play with, leaving doddery old fields such as
 				materials analysis and chemistry relegated to the previous few centuries, when we were still learning the makeup and structure of the elements.<br>
 				<br>
 				Well, when you're out there building the next gryo-whatsitron or isotope mobility thingummy, remember how the field of archaeology experienced a massive new rebirth
@@ -231,25 +236,26 @@
 			"}
 
 /obj/item/weapon/book/manual/anomaly_testing
-	name = "Anomalous materials and energies"
+	name = "Anomalous Materials and Energies"
 	icon_state = "triangulate"
 	author = "Norman York, formerly of the Tyrolion Institute on Titan"
-	title = "Anomalous materials and energies"
+	title = "Anomalous Materials and Energies"
 	dat = {"<html>
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
 
 				<h1><a name="Contents">Contents</a></h1>
 				<ol>
-					<li><a href="#Anomalies">Forward: Modern attitude towards anomalies</a></li>
+					<li><a href="#Anomalies">Foreword: Modern attitude towards anomalies</a></li>
 					<li><a href="#Tri">Triangulating anomalous energy readings</a></li>
 					<li><a href="#Synthetic">Harvesting and utilising anomalous energy signatures</a></li>
 				</ol>
@@ -259,7 +265,7 @@
 				vast and inscrutable mysterious of the cosmos that scholars from such august institutions as the Elysian Institute of the Sciences present
 				formulas and hypotheses for every few decades.<br>
 				<br>
-				Using our vast telescopic array installations and deep space satellite networks, we are able to detect anomalous energy fields and formations in deep space,
+				Using our vast, telescopic array installations and deep space satellite networks, we are able to detect anomalous energy fields and formations in deep space,
 				but are limited to those that are large enough to output energy that will stretch across light years worth of distance between stars.<br>
 				<br>
 				While some sectors (such as the Hydrolian Rift and Keppel's Run) are replete with inexplicable energetic activity and unique phenomena found nowhere else in
@@ -269,9 +275,9 @@
 				Indeed, a great source of knowledge and technology has always been those who come before us, in the form of the multitudinous ancient alien precursors that
 				have left scattered remnants of their great past all over settled (and unexplored) space.<br>
 				<br>
-				It is from xenoarchaeologists, high energy materials researchers and technology reconstruction authorities that we are able to theorise on the gifts these
-				species have left behind, and in some cases even reverse engineer or rebuild the technology in question. My colleague Doctor Raymond Ward of the
-				Tyrolian Institute on Titan has made great breakthroughs in a related field through his pioneering development of universally reflective materials capable
+				It is from xenoarchaeologists, high energy materials researchers, and technology reconstruction authorities that we are able to theorise on the gifts these
+				species have left behind, and in some cases even reverse engineer or rebuild the technology in question. My colleague, Doctor Raymond Ward of the
+				Tyrolian Institute on Titan, has made great breakthroughs in a related field through his pioneering development of universally reflective materials capable
 				of harvesting and 'bottling' up virtually any energy emissions yet encountered by spacefaring civilisations.<br>
 				<br>
 				And yet, there are some amongst us who do not see the benefits of those who have come before us - indeed, some among them profess the opinion that there
@@ -281,26 +287,26 @@
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Tri">Triangulating anomalous energy readings</a></h1>
-				Strong energy emissions, when remaining constant from any one fixed location for millenia, can leave an 'imprint' or distinctive energy signature on other
+				Strong energy emissions, when remaining constant from any one fixed location for millennia, can leave an 'imprint' or distinctive energy signature on other
 				matter composites that are spatially fixed relative to the source.<br>
 				<br>
 				By taking samples of such 'fixed' matter, we can apply complex analytics such as the modified Fourier Transform Procedure to reverse engineer the path of the
 				energy, and determine the approximate distance and direction that the energy source is, relative to the sample's point in space. Modern portable devices can do
 				all this purely by taking readings of local radiation.<br>
 				<br>
-				A canny researcher can thusly analyse radiationat pre-chosen points strategically scattered around an area, and if there are any anomalous energy
+				A canny researcher can thusly analyse radiation at pre-chosen points strategically scattered around an area, and if there are any anomalous energy
 				emissions in range of those points, combined the researcher can triangulate the source.<br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Synthetic">Harvesting and utilising anomalous energy signatures</a></h1>
-				As mentioned in the forward, my colleague from the Tyrolian Institute on Saturn's moon of Titan, in the Sol System, Doctor Raymond Ward has made great strides
+				As mentioned in the foreword, my colleague from the Tyrolian Institute on Saturn's moon of Titan, in the Sol System, Doctor Raymond Ward has made great strides
 				in the area of harvesting and application of the energy emitted by anomalous phenomena from around the galaxy (although I profess I have not yet seen him
 				venture further from his birthplace on Earth than the comfortable distance of the Sol Cis-Oort Satellite Sphere).<br>
 				<br>
 				By employing a patented semi-phased alloy with unique and fascinating bluespace interaction properties, Ward's contraption is able to 'harvest' energy, store
 				it and redirect it later at will (with appropriate electronic mechanisms, of course). Although he professes to see or desire no commercial or material gain
 				for the application and use of said energy once it is harvested, there are no doubt myriad ways we can come to benefit from such things beyond mere research,
-				such as the reconstruction of torn cartiligenous tissue that a peculiar radiation from an amphibious species on Brachis IV was found to emit.<br>
+				such as the reconstruction of torn cartilaginous tissue that a peculiar radiation from an amphibious species on Brachis IV was found to emit.<br>
 				<a href="#Contents">Contents</a>
 
 				</body>
@@ -308,39 +314,40 @@
 			"}
 
 /obj/item/weapon/book/manual/stasis
-	name = "Cellular suspension, the new Cryogenics?"
+	name = "Cellular Suspension, the New Cryogenics?"
 	icon_state = "stasis"
 	author = "Elvin Schmidt"
-	title = "Cellular suspension, the new Cryogenics?"
+	title = "Cellular Suspension, the New Cryogenics?"
 	dat = {"<html>
 				<head>
 				<style>
 				h1 {font-size: 18px; margin: 15px 0px 5px;}
-				h1 {font-size: 15px; margin: 15px 0px 5px;}
+				h2 {font-size: 15px; margin: 15px 0px 5px;}
 				li {margin: 2px 0px 2px 15px;}
-				ul {list-style: none; margin: 5px; padding: 0px;}
+				ul {margin: 5px; padding: 0px;}
 				ol {margin: 5px; padding: 0px 15px;}
+				body {font-size: 13px; font-family: Verdana;}
 				</style>
 				</head>
 				<body>
 
 				<h1><a name="Contents">Contents</a></h1>
 				<ol>
-					<li><a href="#Forward">Forward: A replacement for cryosleep?</a></li>
+					<li><a href="#Foreword">Foreword: A replacement for cryosleep?</a></li>
 					<li><a href="#Development">The breakthrough</a></li>
 					<li><a href="#Application">Applying this new principle</a></li>
 				</ol>
 				<br>
-				<h1><a name="Forward">Forward: A replacement for cryosleep?</a></h1>
+				<h1><a name="Foreword">Foreword: A replacement for cryosleep?</a></h1>
 				The development of rudimentary cryofreezing in the 20th and 21st centuries was hailed as a crank science by some, but many early visionaries recognised the
-				potential it had to change the way we approach so many fields, such as medicine, therapeutics and space travel. It was breakthroughs in the field in the 22nd and
-				later centures that turned the procedure from science fiction to science fact, however. Since then, cryogenics has become a hallmark of modern science, and
+				potential it had to change the way we approach so many fields, such as medicine, therapeutics, and space travel. It was breakthroughs in the field in the 22nd and
+				later centuries that turned the procedure from science fiction to science fact, however. Since then, cryogenics has become a hallmark of modern science, and
 				regarded as one of the great achievements of our era. As with all sciences however, they have their time and are superseded by newer technological miracles when
 				it is over.<br>
 				<a href="#Contents">Contents</a>
 
 				<h1><a name="Development">The breakthrough</a></h1>
-				It was in examining the effects of decellerated, blue-space high energy particles when transphased through bluespace that the effects where primarily noticed.
+				It was in examining the effects of decelerated, bluespace, high energy particles when transphased through bluespace that the effects where primarily noticed.
 				Due to exigent properties of that dimension, transphasing those particles capable of existing in bluespace with high stability levels has the effect of bringing
 				some of those effects into realspace. Examining the Hoffman emissions in particular, it was discovered that they exhibited a-entropic behaviour, and in what is
 				now termed the 'Effete Hoffman Principle,' it was found that metastabilising the Hoffman radiation resulted in the effect being applied across other physical
@@ -352,16 +359,16 @@
 				effectively identical to cryogenics, and while it consumes vastly more power and requires extremely complex equipment, it's (for all intents and purposes) superior
 				to cryogenics, all that remains is to 'commercialise' the process by enabling cheaper development and mass production.<br>
 				The Effete Hoffman Principle can be tweak-combined with other effects however, for different purposes. A division of PMC Research initially developed the application
-				in prisons as a literal 'suspension field' where convincts are held immobile in the air, and the use quickly spread to numerous other areas.<br>
+				in prisons as a literal 'suspension field' where convicts are held immobile in the air, and the use quickly spread to numerous other areas.<br>
 				<br>
 				By examining the material resonance properties of certain strong waveforms when combined with Hoffman radiation, an effect was produced able to reverse energy
 				transferral through matter, and to slow the effects of gravity. When combined with energy repulse technology, the triple effects compound themselves into a much
-				stronger field, although all three componenets do slightly different things. High energy researchers assure me of the following key points:<br>
-				<ol>
+				stronger field, although all three components do slightly different things. High energy researchers assure me of the following key points:<br>
+				<ul>
 					<li>The energy repulsion factor provides a 'shell' capable of weak suspension.</li>
 					<li>The Hoffman emissions nullify energy transferral and other kinetic activity, maintaining stability inside the field.</li>
-					<li>The resonant waveform combines the effects of the above two points, and applies it magnified onto it's synched 'resonance' materials.</li>
-				</ol>
+					<li>The resonant waveform combines the effects of the above two points, and applies it magnified onto it's synced 'resonance' materials.</li>
+				</ul>
 				As an interesting aside, a carbon waveform was chosen for the field in prison suspension fields, due to it's resonance with organic matter.<br>
 				<a href="#Contents">Contents</a>
 

code/modules/supermatter/supermatter.dm

@@ -3,6 +3,9 @@
 #define THERMAL_RELEASE_MODIFIER 10                //Higher == less heat released during reaction
 #define PHORON_RELEASE_MODIFIER 1500                //Higher == less phoron released by reaction
 #define OXYGEN_RELEASE_MODIFIER 750        //Higher == less oxygen released at high temperature/power
+#define THERMAL_RELEASE_MODIFIER 750               //Higher == more heat released during reaction
+#define PLASMA_RELEASE_MODIFIER 1500                //Higher == less plasma released by reaction
+#define OXYGEN_RELEASE_MODIFIER 1500        //Higher == less oxygen released at high temperature/power
 #define REACTION_POWER_MODIFIER 1.1                //Higher == more overall power
 
 
@@ -167,9 +170,13 @@
 
 	//Also keep in mind we are only adding this temperature to (efficiency)% of the one tile the rock
 	//is on. An increase of 4*C @ 25% efficiency here results in an increase of 1*C / (#tilesincore) overall.
-	removed.temperature += (device_energy / THERMAL_RELEASE_MODIFIER)
 	
-	removed.temperature = max(0, min(removed.temperature, 2500))
+	var/thermal_power = THERMAL_RELEASE_MODIFIER
+	if(removed.total_moles < 35) thermal_power += 750   //If you don't add coolant, you are going to have a bad time.
+
+	removed.temperature += ((device_energy * thermal_power) / max(1, removed.heat_capacity()))
+
+	removed.temperature = max(0, min(removed.temperature, 10000))
 
 	//Calculate how much gas to release
 	removed.phoron += max(device_energy / PHORON_RELEASE_MODIFIER, 0)

code/modules/telesci/bscrystal.dm

@@ -1,38 +0,0 @@
-// Bluespace crystals, used in telescience and when crushed it will blink you to a random turf.
-
-/obj/item/bluespace_crystal
-	name = "bluespace crystal"
-	desc = "A glowing bluespace crystal, not much is known about how they work. It looks very delicate."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "bluespace_crystal"
-	w_class = 2
-	origin_tech = "bluespace=4;materials=3"
-	var/blink_range = 8 // The teleport range when crushed/thrown at someone.
-
-/obj/item/bluespace_crystal/New()
-	..()
-	pixel_x = rand(-5, 5)
-	pixel_y = rand(-5, 5)
-
-/obj/item/bluespace_crystal/attack_self(var/mob/user)
-	blink_mob(user)
-	user.drop_item()
-	user.visible_message("<span class='notice'>[user] crushes the [src]!</span>")
-	del(src)
-
-/obj/item/bluespace_crystal/proc/blink_mob(var/mob/living/L)
-	do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
-
-/obj/item/bluespace_crystal/throw_impact(atom/hit_atom)
-	..()
-	if(isliving(hit_atom))
-		blink_mob(hit_atom)
-	del(src)
-
-// Artifical bluespace crystal, doesn't give you much research.
-
-/obj/item/bluespace_crystal/artificial
-	name = "artificial bluespace crystal"
-	desc = "An artificially made bluespace crystal, it looks delicate."
-	origin_tech = "bluespace=2"
-	blink_range = 4 // Not as good as the organic stuff!

code/modules/telesci/gps.dm

@@ -1,70 +0,0 @@
-var/list/GPS_list = list()
-/obj/item/device/gps
-	name = "global positioning system"
-	desc = "Helping lost spacemen find their way through the planets since 2016."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "gps-c"
-	w_class = 2.0
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	origin_tech = "programming=2;engineering=2"
-	var/gpstag = "COM0"
-	var/emped = 0
-
-/obj/item/device/gps/New()
-	..()
-	GPS_list.Add(src)
-	name = "global positioning system ([gpstag])"
-	overlays += "working"
-/obj/item/device/gps/Del()
-	GPS_list.Remove(src)
-	..()
-/obj/item/device/gps/emp_act(severity)
-	emped = 1
-	overlays -= "working"
-	overlays += "emp"
-	spawn(300)
-		emped = 0
-		overlays -= "emp"
-		overlays += "working"
-
-/obj/item/device/gps/attack_self(mob/user as mob)
-
-	var/obj/item/device/gps/t = ""
-	if(emped)
-		t += "ERROR"
-	else
-		t += "<BR><A href='?src=\ref[src];tag=1'>Set Tag</A> "
-		t += "<BR>Tag: [gpstag]"
-
-		for(var/obj/item/device/gps/G in GPS_list)
-			var/turf/pos = get_turf(G)
-			var/area/gps_area = get_area(G)
-			var/tracked_gpstag = G.gpstag
-			if(G.emped == 1)
-				t += "<BR>[tracked_gpstag]: ERROR"
-			else
-				t += "<BR>[tracked_gpstag]: [format_text(gps_area.name)] ([pos.x], [pos.y], [pos.z])"
-
-	var/datum/browser/popup = new(user, "GPS", name, 600, 450)
-	popup.set_content(t)
-	popup.set_title_image(user.browse_rsc_icon(src.icon, src.icon_state))
-	popup.open()
-
-/obj/item/device/gps/Topic(href, href_list)
-	..()
-	if(href_list["tag"] )
-		var/a = input("Please enter desired tag.", name, gpstag) as text
-		a = uppertext(copytext(sanitize(a), 1, 5))
-		if(src.loc == usr)
-			gpstag = a
-			name = "global positioning system ([gpstag])"
-			attack_self(usr)
-
-/obj/item/device/gps/science
-	icon_state = "gps-s"
-	gpstag = "SCI0"
-
-/obj/item/device/gps/engineering
-	icon_state = "gps-e"
-	gpstag = "ENG0"

code/modules/telesci/telepad.dm

@@ -1,122 +0,0 @@
-///SCI TELEPAD///
-/obj/machinery/telepad
-	name = "telepad"
-	desc = "A bluespace telepad used for teleporting objects to and from a location."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "pad-idle"
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 200
-	active_power_usage = 5000
-//CARGO TELEPAD//
-/obj/machinery/telepad_cargo
-	name = "cargo telepad"
-	desc = "A telepad used by the Rapid Crate Sender."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "pad-idle"
-	anchored = 1
-	use_power = 1
-	idle_power_usage = 20
-	active_power_usage = 500
-	var/stage = 0
-/obj/machinery/telepad_cargo/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if(istype(W, /obj/item/weapon/wrench))
-		anchored = 0
-		playsound(src, 'sound/items/Ratchet.ogg', 50, 1)
-		if(anchored)
-			anchored = 0
-			user << "<span class = 'caution'> The [src] can now be moved.</span>"
-		else if(!anchored)
-			anchored = 1
-			user << "<span class = 'caution'> The [src] is now secured.</span>"
-	if(istype(W, /obj/item/weapon/screwdriver))
-		if(stage == 0)
-			playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
-			user << "<span class = 'caution'> You unscrew the telepad's tracking beacon.</span>"
-			stage = 1
-		else if(stage == 1)
-			playsound(src, 'sound/items/Screwdriver.ogg', 50, 1)
-			user << "<span class = 'caution'> You screw in the telepad's tracking beacon.</span>"
-			stage = 0
-	if(istype(W, /obj/item/weapon/weldingtool) && stage == 1)
-		playsound(src, 'sound/items/Welder.ogg', 50, 1)
-		user << "<span class = 'caution'> You disassemble the telepad.</span>"
-		new /obj/item/stack/sheet/metal(get_turf(src))
-		new /obj/item/stack/sheet/glass(get_turf(src))
-		del(src)
-
-///TELEPAD CALLER///
-/obj/item/device/telepad_beacon
-	name = "telepad beacon"
-	desc = "Use to warp in a cargo telepad."
-	icon = 'icons/obj/radio.dmi'
-	icon_state = "beacon"
-	item_state = "signaler"
-	origin_tech = "bluespace=3"
-
-/obj/item/device/telepad_beacon/attack_self(mob/user as mob)
-	if(user)
-		user << "<span class = 'caution'> Locked In</span>"
-		new /obj/machinery/telepad_cargo(user.loc)
-		playsound(src, 'sound/effects/pop.ogg', 100, 1, 1)
-		del(src)
-	return
-
-///HANDHELD TELEPAD USER///
-/obj/item/weapon/rcs
-	name = "rapid-crate-sender (RCS)"
-	desc = "Use this to send crates and closets to cargo telepads."
-	icon = 'icons/obj/telescience.dmi'
-	icon_state = "rcs"
-	flags = FPRINT | TABLEPASS| CONDUCT
-	force = 10.0
-	throwforce = 10.0
-	throw_speed = 1
-	throw_range = 5
-	var/rcharges = 10
-	var/obj/machinery/pad = null
-	var/last_charge = 30
-	var/mode = 0
-	var/rand_x = 0
-	var/rand_y = 0
-	var/emagged = 0
-	var/teleporting = 0
-
-/obj/item/weapon/rcs/New()
-	..()
-	processing_objects.Add(src)
-/obj/item/weapon/rcs/examine()
-	desc = "Use this to send crates and closets to cargo telepads. There are [rcharges] charges left."
-	..()
-
-/obj/item/weapon/rcs/Del()
-	processing_objects.Remove(src)
-	..()
-/obj/item/weapon/rcs/process()
-	if(rcharges > 10)
-		rcharges = 10
-	if(last_charge == 0)
-		rcharges++
-		last_charge = 30
-	else
-		last_charge--
-
-/obj/item/weapon/rcs/attack_self(mob/user)
-	if(emagged)
-		if(mode == 0)
-			mode = 1
-			playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
-			user << "<span class = 'caution'> The telepad locator has become uncalibrated.</span>"
-		else
-			mode = 0
-			playsound(src.loc, 'sound/effects/pop.ogg', 50, 0)
-			user << "<span class = 'caution'> You calibrate the telepad locator.</span>"
-
-/obj/item/weapon/rcs/attackby(obj/item/W, mob/user)
-	if(istype(W,  /obj/item/weapon/card/emag) && emagged == 0)
-		emagged = 1
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-		s.set_up(5, 1, src)
-		s.start()
-		user << "<span class = 'caution'> You emag the RCS. Click on it to toggle between modes.</span>"
-		return

code/modules/telesci/telesci_computer.dm

@@ -1,312 +0,0 @@
-/obj/machinery/computer/telescience
-	name = "\improper Telepad Control Console"
-	desc = "Used to teleport objects to and from the telescience telepad."
-	icon_state = "teleport"
-	var/sending = 1
-	var/obj/machinery/telepad/telepad = null
-	var/temp_msg = "Telescience control console initialized.<BR>Welcome."
-
-	// VARIABLES //
-	var/teles_left	// How many teleports left until it becomes uncalibrated
-	var/datum/projectile_data/last_tele_data = null
-	var/z_co = 1
-	var/power_off
-	var/rotation_off
-	var/angle_off
-
-	var/rotation = 0
-	var/angle = 45
-	var/power
-
-	// Based on the power used
-	var/teleport_cooldown = 0
-	var/list/power_options = list(5, 10, 20, 25, 30, 40, 50, 80, 100) // every index requires a bluespace crystal
-	var/teleporting = 0
-	var/starting_crystals = 3
-	var/list/crystals = list()
-
-/obj/machinery/computer/telescience/New()
-	..()
-	link_telepad()
-	recalibrate()
-
-/obj/machinery/computer/telescience/Del()
-	eject()
-	..()
-
-/obj/machinery/computer/telescience/examine()
-	..()
-	usr << "There are [crystals.len] bluespace crystals in the crystal ports."
-
-/obj/machinery/computer/telescience/initialize()
-	..()
-	link_telepad()
-	for(var/i = 1; i <= starting_crystals; i++)
-		crystals += new /obj/item/bluespace_crystal/artificial(null) // starting crystals
-	power = power_options[1]
-
-/obj/machinery/computer/telescience/proc/link_telepad()
-	telepad = locate() in range(src, 7)
-
-/obj/machinery/computer/telescience/update_icon()
-	if(stat & BROKEN)
-		icon_state = "telescib"
-	else
-		if(stat & NOPOWER)
-			src.icon_state = "teleport0"
-			stat |= NOPOWER
-		else
-			icon_state = initial(icon_state)
-			stat &= ~NOPOWER
-
-/obj/machinery/computer/telescience/attack_paw(mob/user)
-	user << "You are too primitive to use this computer."
-	return
-
-/obj/machinery/computer/telescience/attackby(obj/item/W, mob/user)
-	if(istype(W, /obj/item/bluespace_crystal))
-		if(crystals.len >= power_options.len)
-			user << "<span class='warning'>There are not enough crystal ports.</span>"
-			return
-		user.drop_item()
-		crystals += W
-		W.loc = null
-		user.visible_message("<span class='notice'>[user] inserts a [W] into the [src]'s crystal port.</span>")
-	else
-		..()
-
-/obj/machinery/computer/telescience/attack_ai(mob/user)
-	src.attack_hand(user)
-
-/obj/machinery/computer/telescience/attack_hand(mob/user)
-	if(..())
-		return
-	interact(user)
-
-/obj/machinery/computer/telescience/interact(mob/user)
-	user.machine = src
-	in_use = 1
-
-	var/t = "<div class='statusDisplay'>[temp_msg]</div><BR>"
-	t += "<A href='?src=\ref[src];setrotation=1'>Set Bearing</A>"
-	t += "<div class='statusDisplay'>[rotation]<5D></div>"
-	t += "<A href='?src=\ref[src];setangle=1'>Set Elevation</A>"
-	t += "<div class='statusDisplay'>[angle]<5D></div>"
-	t += "<span class='linkOn'>Set Power</span>"
-	t += "<div class='statusDisplay'>"
-
-	for(var/i = 1; i <= power_options.len; i++)
-		if(crystals.len < i)
-			t += "<span class='linkOff'>[power_options[i]]</span>"
-			continue
-		if(power == power_options[i])
-			t += "<span class='linkOn'>[power_options[i]]</span>"
-			continue
-		t += "<A href='?src=\ref[src];setpower=[i]'>[power_options[i]]</A>"
-
-	t += "</div>"
-	t += "<A href='?src=\ref[src];setz=1'>Set Sector</A>"
-	t += "<div class='statusDisplay'>[z_co ? z_co : "NULL"]</div>"
-
-	t += "<BR><A href='?src=\ref[src];send=1'>Send</A>"
-	t += " <A href='?src=\ref[src];receive=1'>Receive</A>"
-	t += "<BR><A href='?src=\ref[src];recal=1'>Recalibrate Crystals</A> <A href='?src=\ref[src];eject=1'>Eject Crystals</A>"
-
-	// Information about the last teleport
-	t += "<BR><div class='statusDisplay'>"
-	if(!last_tele_data)
-		t += "No teleport data found."
-	else
-		t += "Source Location: ([last_tele_data.src_x], [last_tele_data.src_y])<BR>"
-		//t += "Distance: [round(last_tele_data.distance, 0.1)]m<BR>"
-		t += "Time: [round(last_tele_data.time, 0.1)] secs<BR>"
-	t += "</div>"
-
-	var/datum/browser/popup = new(user, "telesci", name, 300, 500)
-	popup.set_content(t)
-	popup.open()
-	return
-
-/obj/machinery/computer/telescience/proc/sparks()
-	if(telepad)
-		var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-		s.set_up(5, 1, get_turf(telepad))
-		s.start()
-	else
-		return
-
-/obj/machinery/computer/telescience/proc/telefail()
-	sparks()
-	visible_message("<span class='warning'>The telepad weakly fizzles.</span>")
-	return
-
-/obj/machinery/computer/telescience/proc/doteleport(mob/user)
-
-	if(teleport_cooldown > world.time)
-		temp_msg = "Telepad is recharging power.<BR>Please wait [round((teleport_cooldown - world.time) / 10)] seconds."
-		return
-
-	if(teleporting)
-		temp_msg = "Telepad is in use.<BR>Please wait."
-		return
-
-	if(telepad)
-
-		var/truePower = Clamp(power + power_off, 1, 1000)
-		var/trueRotation = rotation + rotation_off
-		var/trueAngle = Clamp(angle + angle_off, 1, 90)
-
-		var/datum/projectile_data/proj_data = projectile_trajectory(telepad.x, telepad.y, trueRotation, trueAngle, truePower)
-		last_tele_data = proj_data
-
-		var/trueX = Clamp(round(proj_data.dest_x, 1), 1, world.maxx)
-		var/trueY = Clamp(round(proj_data.dest_y, 1), 1, world.maxy)
-		var/spawn_time = round(proj_data.time) * 10
-
-		var/turf/target = locate(trueX, trueY, z_co)
-		var/area/A = get_area(target)
-		flick("pad-beam", telepad)
-
-		if(spawn_time > 15) // 1.5 seconds
-			playsound(telepad.loc, 'sound/weapons/flash.ogg', 25, 1)
-			// Wait depending on the time the projectile took to get there
-			teleporting = 1
-			temp_msg = "Powering up bluespace crystals.<BR>Please wait."
-
-
-		spawn(round(proj_data.time) * 10) // in seconds
-			if(!telepad)
-				return
-			if(telepad.stat & NOPOWER)
-				return
-			teleporting = 0
-			teleport_cooldown = world.time + (power * 2)
-			teles_left -= 1
-
-			// use a lot of power
-			use_power(power * 10)
-
-			var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
-			s.set_up(5, 1, get_turf(telepad))
-			s.start()
-
-			temp_msg = "Teleport successful.<BR>"
-			if(teles_left < 10)
-				temp_msg += "<BR>Calibration required soon."
-			else
-				temp_msg += "Data printed below."
-			investigate_log("[key_name(usr)]/[user] has teleported with Telescience at [trueX],[trueY],[z_co], in [A ? A.name : "null area"].","telesci")
-
-			var/sparks = get_turf(target)
-			var/datum/effect/effect/system/spark_spread/y = new /datum/effect/effect/system/spark_spread
-			y.set_up(5, 1, sparks)
-			y.start()
-
-			var/turf/source = target
-			var/turf/dest = get_turf(telepad)
-			if(sending)
-				source = dest
-				dest = target
-
-			flick("pad-beam", telepad)
-			playsound(telepad.loc, 'sound/weapons/emitter2.ogg', 25, 1)
-			for(var/atom/movable/ROI in source)
-				// if is anchored, don't let through
-				if(ROI.anchored)
-					if(isliving(ROI))
-						var/mob/living/L = ROI
-						if(L.buckled)
-							// TP people on office chairs
-							if(L.buckled.anchored)
-								continue
-						else
-							continue
-					else if(!isobserver(ROI))
-						continue
-				do_teleport(ROI, dest)
-			updateDialog()
-
-/obj/machinery/computer/telescience/proc/teleport(mob/user)
-	if(rotation == null || angle == null || z_co == null)
-		temp_msg = "ERROR!<BR>Set a angle, rotation and sector."
-		return
-	if(power <= 0)
-		telefail()
-		temp_msg = "ERROR!<BR>No power selected!"
-		return
-	if(angle < 1 || angle > 90)
-		telefail()
-		temp_msg = "ERROR!<BR>Elevation is less than 1 or greater than 90."
-		return
-	if(z_co == 2 || z_co < 1 || z_co > 6)
-		telefail()
-		temp_msg = "ERROR! Sector is less than 1, <BR>greater than 6, or equal to 2."
-		return
-	if(teles_left > 0)
-		doteleport(user)
-	else
-		telefail()
-		temp_msg = "ERROR!<BR>Calibration required."
-		return
-	return
-
-/obj/machinery/computer/telescience/proc/eject()
-	for(var/obj/item/I in crystals)
-		I.loc = src.loc
-		crystals -= I
-	power = 0
-
-/obj/machinery/computer/telescience/Topic(href, href_list)
-	if(..())
-		return
-	if(href_list["setrotation"])
-		var/new_rot = input("Please input desired bearing in degrees.", name, rotation) as num
-		if(..()) // Check after we input a value, as they could've moved after they entered something
-			return
-		rotation = Clamp(new_rot, -900, 900)
-		rotation = round(rotation, 0.01)
-
-	if(href_list["setangle"])
-		var/new_angle = input("Please input desired elevation in degrees.", name, angle) as num
-		if(..())
-			return
-		angle = Clamp(round(new_angle, 0.1), 1, 9999)
-
-	if(href_list["setpower"])
-		var/index = href_list["setpower"]
-		index = text2num(index)
-		if(index != null && power_options[index])
-			if(crystals.len >= index)
-				power = power_options[index]
-
-	if(href_list["setz"])
-		var/new_z = input("Please input desired sector.", name, z_co) as num
-		if(..())
-			return
-		z_co = Clamp(round(new_z), 1, 10)
-
-	if(href_list["send"])
-		sending = 1
-		teleport(usr)
-
-	if(href_list["receive"])
-		sending = 0
-		teleport(usr)
-
-	if(href_list["recal"])
-		recalibrate()
-		sparks()
-		temp_msg = "NOTICE:<BR>Calibration successful."
-
-	if(href_list["eject"])
-		eject()
-		temp_msg = "NOTICE:<BR>Bluespace crystals ejected."
-
-	updateDialog()
-	return 1
-
-/obj/machinery/computer/telescience/proc/recalibrate()
-	teles_left = rand(30, 40)
-	angle_off = rand(-25, 25)
-	power_off = rand(-4, 0)
-	rotation_off = rand(-10, 10)

code/world.dm

@@ -66,6 +66,9 @@
 //		world << "End of Topic() call."
 //		..()
 
+var/world_topic_spam_protect_ip = "0.0.0.0"
+var/world_topic_spam_protect_time = world.timeofday
+
 /world/Topic(T, addr, master, key)
 	diary << "TOPIC: \"[T]\", from:[addr], master:[master], key:[key][log_end]"
 	
@@ -92,6 +95,7 @@
 		s["ai"] = config.allow_ai
 		s["host"] = host ? host : null
 		s["players"] = list()
+		s["stationtime"] = worldtime2text()
 		var/n = 0
 		var/admins = 0
 
@@ -109,6 +113,79 @@
 
 		return list2params(s)
 
+	else if(copytext(T,1,9) == "adminmsg")
+		/*
+			We got an adminmsg from IRC bot lets split the input then validate the input.
+			expected output:
+				1. adminmsg = ckey of person the message is to
+				2. msg = contents of message, parems2list requires
+				3. validatationkey = the key the bot has, it should match the gameservers commspassword in it's configuration.
+				4. sender = the ircnick that send the message.
+		*/
+
+
+		var/input[] = params2list(T)
+		if(input["key"] != config.comms_password)
+			if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
+				
+				spawn(50)
+					world_topic_spam_protect_time = world.time
+					return "Bad Key (Throttled)"
+
+			world_topic_spam_protect_time = world.time
+			world_topic_spam_protect_ip = addr
+
+			return "Bad Key"
+		
+		var/client/C
+		
+		for(var/client/K in clients)
+			if(K.ckey == input["adminmsg"])
+				C = K
+				break
+		if(!C)
+			return "No client with that name on server"
+
+		var/message =	"<font color='red'>IRC-Admin PM from <b><a href='?irc_msg=1'>[C.holder ? "IRC-" + input["sender"] : "Administrator"]</a></b>: [input["msg"]]</font>"
+		var/amessage =  "<font color='blue'>IRC-Admin PM from <a href='?irc_msg=1'>IRC-[input["sender"]]</a> to <b>[key_name(C)]</b> : [input["msg"]]</font>"
+
+		C.received_irc_pm = world.time
+		C.irc_admin = input["sender"]
+
+		C << 'sound/effects/adminhelp.ogg'
+		C << message
+
+		
+		for(var/client/A in admins)
+			if(A != C)
+				A << amessage
+
+		return "Message Successful"
+
+	else if(copytext(T,1,6) == "notes")
+		/*
+			We got a request for notes from the IRC Bot
+			expected output:
+				1. notes = ckey of person the notes lookup is for
+				2. validationkey = the key the bot has, it should match the gameservers commspassword in it's configuration.
+		*/
+		var/input[] = params2list(T)
+		if(input["key"] != config.comms_password)
+			if(world_topic_spam_protect_ip == addr && abs(world_topic_spam_protect_time - world.time) < 50)
+
+				spawn(50)
+					world_topic_spam_protect_time = world.time
+					return "Bad Key (Throttled)"
+
+			world_topic_spam_protect_time = world.time
+			world_topic_spam_protect_ip = addr
+			return "Bad Key"
+
+		return show_player_info_irc(input["notes"])
+		
+
+		
+
 
 /world/Reboot(var/reason)
 	/*spawn(0)

html/changelog.html

@@ -56,6 +56,27 @@ should be listed in the changelog upon commit though. Thanks. -->
 
 <!-- DO NOT REMOVE, MOVE, OR COPY THIS COMMENT! THIS MUST BE THE LAST NON-EMPTY LINE BEFORE THE LOGS #ADDTOCHANGELOGMARKER# -->
 
+
+<div class='commit sansserif'>
+	<h2 class='date'>25 April 2014</h2>
+	<h3 class='author'>Various updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Overhauled saycode, you can now use languages over the radio.</li>
+		<li class='rscadd'>Chamelon items beyond just the suit.</li>
+		<li class='rscadd'>NanoUI Virology</li>
+		<li class='rscadd'>3D Sounds</li>
+		<li class='rscadd'>AI Channel color for when they want to be all sneaky</li>
+		<li class='rscadd'>New inflatable walls and airlocks for your breach sealing pleasure.</li>
+		<li class='rscadd'>Carbon Copy papers, so you can subject everyone to your authority and paperwork, but mainly paperwork</li>
+		<li class='rscadd'>Undershirts and rolling down jumpsuits</li>
+		<li class='rscadd'>Insta-hit tasers, can be shot through glass as well.</li>
+		<li class='rscadd'>Changeling balances, an emphasis put more on stealth.</li>
+		<li class='rscdel'>Genetics disabled</li>
+		<li class='rscdel'>Telescience removed, might be added again when we come up with a less math headache enducing version of it.</li>
+		<li class='bugfix'>Bugfixes galore!</li>
+	</ul>
+</div>
+
 <div class='commit sansserif'>  
                  <h2 class='date'>11 April 2014</h2>
                  <h3 class='author'>Jarcolr updated:</h3> 
@@ -76,6 +97,14 @@ should be listed in the changelog upon commit though. Thanks. -->
 	</ul>
 </div>
 
+<div class='commit sansserif'>
+	<h2 class='date'>30 March 2014</h2>
+	<h3 class='author'>RavingManiac updated:</h3>
+	<ul class='changes bgimages16'>
+		<li class='rscadd'>Inflatable walls and doors added. Useful for sealing off hull breaches, but easily punctured by sharp objects and Tajarans.</li>
+</ul>
+</div>
+
 <div class="commit sansserif">
 	<h2 class="date">10 March 2014</h2>
 	<h3 class="author">Chinsky updated:</h3>