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

2026-08-23 12:07:27 +01:00 · 2012-04-19 18:06:48 +01:00
parent 4f4313d953 a164efb431
commit 4e19ca0ca6
54 changed files with 8744 additions and 7571 deletions
@@ -487,6 +487,7 @@
 #include "code\game\machinery\magnet.dm"
 #include "code\game\machinery\morgue.dm"
 #include "code\game\machinery\navbeacon.dm"
+#include "code\game\machinery\newscaster.dm"
 #include "code\game\machinery\OpTable.dm"
 #include "code\game\machinery\overview.dm"
 #include "code\game\machinery\portable_turret.dm"
@@ -776,6 +777,7 @@
 #include "code\modules\admin\verbs\deadsay.dm"
 #include "code\modules\admin\verbs\debug.dm"
 #include "code\modules\admin\verbs\diagnostics.dm"
+#include "code\modules\admin\verbs\getruntimelog.dm"
 #include "code\modules\admin\verbs\gimmicks.dm"
 #include "code\modules\admin\verbs\mapping.dm"
 #include "code\modules\admin\verbs\massmodvar.dm"
@@ -54,6 +54,8 @@ var/global/datum/getrev/revdata = new("config/svndir.txt")

 		if(svndirpath && fexists(svndirpath) && fexists("[svndirpath]/entries") && isfile(file("[svndirpath]/entries")))
 			var/list/filelist = dd_file2list("[svndirpath]/entries",null)
+			if(filelist.len < 4)
+				return abort()
 			revision = filelist[4]
 			commiter = filelist[12]
 			diary << "Revision info loaded succesfully"
@@ -220,10 +220,14 @@ var
 	// These are all default values that will load should the forumdbconfig.txt
 	// file fail to read for whatever reason.

-	/*forumsqladdress = "localhost"
+/*	forumsqladdress = "localhost"
 	forumsqlport = "3306"
 	forumsqldb = "tgstation"
 	forumsqllogin = "root"
 	forumsqlpass = ""
 	forum_activated_group = "2"
 	forum_authenticated_group = "10"*/
+
+	// For FTP requests. (i.e. downloading runtime logs.)
+	// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
+	fileaccess_timer = 600 //Cannot access files by ftp until the game is finished setting up and stuff.
@@ -1,6 +1,7 @@
 /obj/effect/decal/ash
-	name = "Ashes"
+	name = "ashes"
 	desc = "Ashes to ashes, dust to dust, and into space."
+	gender = PLURAL
 	icon = 'objects.dmi'
 	icon_state = "ash"
 	anchored = 1
@@ -12,27 +13,31 @@

 /obj/effect/decal/remains/human
 	name = "remains"
-	desc = "These remains have a strange sense about them..."
+	desc = "They look like human remains. They have a strange aura about them."
+	gender = PLURAL
 	icon = 'blood.dmi'
 	icon_state = "remains"
 	anchored = 1

 /obj/effect/decal/remains/xeno
 	name = "remains"
-	desc = "These remains have a strange sense about them..."
+	desc = "They look like the remains of something... alien. They have a strange aura about them."
+	gender = PLURAL
 	icon = 'blood.dmi'
 	icon_state = "remainsxeno"
 	anchored = 1

 /obj/effect/decal/remains/robot
 	name = "remains"
-	desc = "These remains have a strange sense about them..."
+	desc = "They look like the remains of something mechanical. They have a strange aura about them."
+	gender = PLURAL
 	icon = 'robots.dmi'
 	icon_state = "remainsrobot"
 	anchored = 1

 /obj/effect/decal/point
-	name = "point"
+	name = "arrow"
+	desc = "It's an arrow hanging in mid-air. There may be a wizard about."
 	icon = 'screen1.dmi'
 	icon_state = "arrow"
 	layer = 16.0
@@ -44,8 +49,9 @@
 //HUMANS

 /obj/effect/decal/cleanable/blood
-	name = "Blood"
+	name = "blood"
 	desc = "It's red and disgusting."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -65,6 +71,7 @@
 /obj/effect/decal/cleanable/blood/drip
 	name = "drips of blood"
 	desc = "It's red."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -73,8 +80,9 @@
 	track_amt = 0

 /obj/effect/decal/cleanable/mucus
-	name = "Mucus"
+	name = "mucus"
 	desc = "Disgusting mucus."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -87,12 +95,15 @@
 	random_icon_states = list("gibbl1", "gibbl2", "gibbl3", "gibbl4", "gibbl5")

 /obj/effect/decal/cleanable/blood/tracks
-	icon_state = "tracks"
+	icon_state = "blood"
+	desc = "They look like tracks left by wheels."
+	gender = PLURAL
 	random_icon_states = null

 /obj/effect/decal/cleanable/blood/gibs
 	name = "gibs"
-	desc = "Grisly...and not the good kind neither."
+	desc = "They look bloody and gruesome."
+	gender = PLURAL
 	density = 0
 	anchored = 0
 	layer = 2
@@ -119,7 +130,8 @@

 /obj/effect/decal/cleanable/xenoblood
 	name = "xeno blood"
-	desc = "It's green blood. What the hell?"
+	desc = "It's green and acidic. It looks like... <i>blood?</i>"
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -139,6 +151,7 @@
 /obj/effect/decal/cleanable/xenoblood/xgibs
 	name = "xeno gibs"
 	desc = "Gnarly..."
+	gender = PLURAL
 	icon = 'blood.dmi'
 	icon_state = "xgib1"
 	random_icon_states = list("xgib1", "xgib2", "xgib3", "xgib4", "xgib5", "xgib6")
@@ -166,7 +179,8 @@

 /obj/effect/decal/cleanable/robot_debris
 	name = "robot debris"
-	desc = "Useless heap of junk...or is it..."
+	desc = "It's a useless heap of junk... <i>or is it?</i>"
+	gender = PLURAL
 	density = 0
 	anchored = 0
 	layer = 2
@@ -185,7 +199,8 @@

 /obj/effect/decal/cleanable/oil
 	name = "motor oil"
-	desc = "It's black oil."
+	desc = "It's black and greasy. Looks like Beepsky made another mess."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -207,6 +222,7 @@
 /obj/effect/decal/cleanable/generic
 	name = "clutter"
 	desc = "Someone should clean that up."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -216,6 +232,7 @@
 /obj/effect/decal/cleanable/dirt
 	name = "dirt"
 	desc = "Someone should clean that up."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -223,8 +240,9 @@
 	icon_state = "dirt"

 /obj/effect/decal/cleanable/greenglow
-	name = "green glow"
+	name = "glowing goo"
 	desc = "Eerie. This makes you feel creepy."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -233,7 +251,7 @@

 /obj/effect/decal/cleanable/cobweb
 	name = "cobweb"
-	desc = "Someone should remove that."
+	desc = "Somebody should remove that."
 	density = 0
 	anchored = 1
 	layer = 3
@@ -242,7 +260,7 @@

 /obj/effect/decal/cleanable/molten_item
 	name = "gooey grey mass"
-	desc = "Huh. Creepy..."
+	desc = "It looks like a melted... something."
 	density = 0
 	anchored = 1
 	layer = 3
@@ -251,7 +269,7 @@

 /obj/effect/decal/cleanable/cobweb2
 	name = "cobweb"
-	desc = "Someone should remove that."
+	desc = "Somebody should remove that."
 	density = 0
 	anchored = 1
 	layer = 3
@@ -266,8 +284,9 @@

 //Vomit (sorry)
 /obj/effect/decal/cleanable/vomit
-	name = "Vomit"
-	desc = "Unpleasant."
+	name = "vomit"
+	desc = "Gosh, how unpleasant."
+	gender = PLURAL
 	density = 0
 	anchored = 1
 	layer = 2
@@ -282,8 +301,8 @@
 		..()

 /obj/effect/decal/cleanable/tomato_smudge
-	name = "Tomato smooth"
-	desc = "It looks sort of like blood, but it's not that dark."
+	name = "tomato smudge"
+	desc = "It's red."
 	density = 0
 	anchored = 1
 	layer = 2
@@ -291,7 +310,7 @@
 	random_icon_states = list("tomato_floor1", "tomato_floor2", "tomato_floor3")

 /obj/effect/decal/cleanable/egg_smudge
-	name = "Smashed egg"
+	name = "smashed egg"
 	desc = "Seems like this one won't hatch."
 	density = 0
 	anchored = 1
@@ -300,8 +319,8 @@
 	random_icon_states = list("smashed_egg1", "smashed_egg2", "smashed_egg3")

 /obj/effect/decal/cleanable/pie_smudge //honk
-	name = "Smashed pie"
-	desc = "Pie cream from a cream pie."
+	name = "smashed pie"
+	desc = "It's pie cream from a cream pie."
 	density = 0
 	anchored = 1
 	layer = 2
@@ -19,8 +19,8 @@
 			gl_uid = 1

 /obj/machinery/autolathe
-	name = "Autolathe"
-	desc = "Produces items with metal and glass."
+	name = "\improper Autolathe"
+	desc = "It produces items using metal and glass."
 	icon_state = "autolathe"
 	density = 1
 	var/m_amount = 0.0
@@ -42,7 +42,7 @@
 	active_power_usage = 100

 /obj/machinery/camera
-	name = "Security Camera"
+	name = "security camera"
 	desc = "This is used to monitor rooms."
 	icon = 'monitors.dmi'
 	icon_state = "camera"
@@ -60,8 +60,8 @@
 	active_power_usage = 10

 /obj/machinery/dispenser
-	desc = "A simple yet bulky one-way storage device for gas tanks. Holds plasma and oxygen tanks."
-	name = "Tank Storage Unit"
+	name = "tank storage unit"
+	desc = "A simple yet bulky one-way storage device for gas tanks. Holds 10 plasma and 10 oxygen tanks."
 	icon = 'objects.dmi'
 	icon_state = "dispenser"
 	density = 1
@@ -73,8 +73,8 @@
 	active_power_usage = 10

 /obj/machinery/dna_scanner
-	name = "DNA Scanner/Implanter"
-	desc = "Scans DNA."
+	name = "\improper DNA scanner/implanter"
+	desc = "It scans DNA structures."
 	icon = 'Cryogenic2.dmi'
 	icon_state = "scanner_0"
 	density = 1
@@ -86,8 +86,8 @@
 	active_power_usage = 300

 /obj/machinery/dna_scannernew
-	name = "DNA Modifier"
-	desc = "Scans DNA better."
+	name = "\improper DNA modifier"
+	desc = "It scans DNA structures."
 	icon = 'Cryogenic2.dmi'
 	icon_state = "scanner_0"
 	density = 1
@@ -99,7 +99,7 @@
 	active_power_usage = 300

 /obj/machinery/firealarm
-	name = "Fire Alarm"
+	name = "fire alarm"
 	desc = "Pull this in case of emergency."
 	icon = 'monitors.dmi'
 	icon_state = "fire0"
@@ -114,8 +114,15 @@
 	active_power_usage = 6
 	power_channel = ENVIRON

+	New()
+		if(z == 1)
+			if(security_level)
+				src.overlays += image('monitors.dmi', "overlay_[get_security_level()]")
+			else
+				src.overlays += image('monitors.dmi', "overlay_green")
+
 /obj/machinery/partyalarm
-	name = "Party Button"
+	name = "\improper Party Button"
 	desc = "Cuban Pete is in the house!"
 	icon = 'monitors.dmi'
 	icon_state = "fire0"
@@ -132,7 +139,7 @@

 /obj/machinery/igniter
 	name = "igniter"
-	desc = "Might as well make that detonator, right?"
+	desc = "It's useful for igniting plasma."
 	icon = 'stationobjs.dmi'
 	icon_state = "igniter1"
 	var/id = null
@@ -144,7 +151,7 @@

 /obj/machinery/injector
 	name = "injector"
-	desc = "Injects gas into a chamber."
+	desc = "It injects gas into a chamber."
 	icon = 'stationobjs.dmi'
 	icon_state = "injector"
 	density = 1
@@ -183,8 +190,8 @@
 	active_power_usage = 4

 /obj/machinery/restruct
-	name = "DNA Physical Restructurization Accelerator"
-	desc = "This looks complex."
+	name = "\improper DNA physical restructurization accelerator"
+	desc = "It looks ridiculously complex."
 	icon = 'Cryogenic2.dmi'
 	icon_state = "restruct_0"
 	density = 1
@@ -196,8 +203,8 @@
 	active_power_usage = 600

 /obj/machinery/scan_console
-	name = "DNA Scanner Access Console"
-	desc = "Scans DNA."
+	name = "\improper DNA Scanner Access Console"
+	desc = "It scans DNA structures."
 	icon = 'computer.dmi'
 	icon_state = "scanner"
 	density = 1
@@ -275,13 +282,22 @@
 				16= door safties

 	*/
+
+	var/exposedwires = 0
+	var/wires = 3
+	/*
+	Bitflag,	1=checkID
+				2=Network Access
+	*/
+
 	anchored = 1.0
 	use_power = 1
 	idle_power_usage = 2
 	active_power_usage = 4

 /obj/machinery/driver_button
-	name = "Mass Driver Button"
+	name = "mass driver button"
+	desc = "FIRE AWAY!"
 	icon = 'objects.dmi'
 	icon_state = "launcherbtt"
 	desc = "A remote control switch for a Mass Driver."
@@ -293,7 +309,8 @@
 	active_power_usage = 4

 /obj/machinery/ignition_switch
-	name = "Ignition Switch"
+	name = "ignition switch"
+	desc = "It activates an igniter."
 	icon = 'objects.dmi'
 	icon_state = "launcherbtt"
 	desc = "A remote control switch for a mounted igniter."
@@ -312,8 +329,8 @@
 	var/lockeddown = 0

 /obj/machinery/teleport/hub
-	name = "hub"
-	desc = "A hub of a teleporting machine."
+	name = "teleporter hub"
+	desc = "It's the hub of a teleporting machine."
 	icon_state = "tele0"
 	var/accurate = 0
 	use_power = 1
@@ -352,7 +369,7 @@
 /obj/machinery/power/terminal
 	name = "terminal"
 	icon_state = "term"
-	desc = "An underfloor wiring terminal for power equipment"
+	desc = "It's an underfloor wiring terminal for power equipment."
 	level = 1
 	layer = TURF_LAYER
 	var/obj/machinery/power/master = null
@@ -361,8 +378,8 @@
 	layer = 2.6 // a bit above wires

 /obj/machinery/power/generator
-	name = "generator"
-	desc = "A high efficiency thermoelectric generator."
+	name = "thermoelectric generator"
+	desc = "It's a high efficiency thermoelectric generator."
 	icon_state = "teg"
 	anchored = 1
 	density = 1
@@ -374,8 +391,8 @@
 	var/lastgenlev = -1

 /obj/machinery/power/generator_type2
-	name = "generator"
-	desc = "A high efficiency thermoelectric generator."
+	name = "thermoelectric generator"
+	desc = "It's a high efficiency thermoelectric generator."
 	icon_state = "teg"
 	anchored = 1
 	density = 1
@@ -386,19 +403,18 @@
 	var/lastgen = 0
 	var/lastgenlev = -1

-
 /obj/machinery/power/monitor
-        name = "Power Monitoring Computer"
-        desc = "Used to monitor the power, and remotely toggle main breakers."
-        icon = 'computer.dmi'
-        icon_state = "power"
-        density = 1
-        anchored = 1
-        use_power = 2
-        idle_power_usage = 20
-        active_power_usage = 80
-        var/control = 0
-        req_access = list(access_engine_equip)
+    name = "power monitoring computer"
+    desc = "It monitors power levels across the station, and can remotely toggle main breakers."
+    icon = 'computer.dmi'
+    icon_state = "power"
+    density = 1
+    anchored = 1
+    use_power = 2
+    idle_power_usage = 20
+    active_power_usage = 80
+    var/control = 0
+    req_access = list(access_engine_equip)

 /obj/machinery/cell_charger
 	name = "cell charger"
@@ -413,8 +429,8 @@
 	active_power_usage = 60

 /obj/machinery/light_switch
-	desc = "A light switch"
-	name = null
+	name = "light switch"
+	desc = "It turns lights on and off. What are you, simple?"
 	icon = 'power.dmi'
 	icon_state = "light1"
 	anchored = 1.0
@@ -449,16 +465,17 @@
 	icon_state = "holopad0"
 	var
 		mob/living/silicon/ai/master//Which AI, if any, is controlling the object? Only one AI may control a hologram at any time.
+		last_request = 0 //to prevent request spam. ~Carn

 /obj/machinery/hologram/projector
-	name = "Hologram Projector"
-	desc = "Makes a hologram appear...somehow..."
+	name = "hologram projector"
+	desc = "It makes a hologram appear...with magnets or something..."
 	icon = 'stationobjs.dmi'
 	icon_state = "hologram0"

 /obj/machinery/hologram/proj_ai
-	name = "Hologram Projector Platform"
-	desc = "Used for the fun of the diabolical AI."
+	name = "hologram projector platform"
+	desc = "It's used by the AI for fooling around."
 	icon = 'stationobjs.dmi'
 	icon_state = "hologram0"
 	var
@@ -8,13 +8,13 @@
 	max_combined_w_class = 21

 /obj/item/weapon/storage/backpack/cultpack
-	name = "Trophy Rack"
-	desc = "A backpack and trophy rack, useful for both carrying extra gear and proudly declaring your insanity "
+	name = "trophy rack"
+	desc = "It's useful for both carrying extra gear and proudly declaring your insanity."
 	icon_state = "cultpack"

 /obj/item/weapon/storage/trashbag
 	name = "trash bag"
-	desc = "For picking up all that trash."
+	desc = "It's the heavy-duty black polymer kind. Time to take out the trash!"
 	icon_state = "trashbag"
 	item_state = "trashbag"
 	w_class = 4.0
@@ -31,16 +31,17 @@
 */
 /obj/item/weapon/storage/pill_bottle
 	name = "pill bottle"
-	desc = "A reasonable place to put your pills."
+	desc = "It's an airtight container for storing medication."
 	icon_state = "pill_canister"
 	icon = 'chemical.dmi'
 	item_state = "contsolid"
 	w_class = 2.0
 	can_hold = list("/obj/item/weapon/reagent_containers/pill")
+	var/mode = 1 // pickup mode

 /obj/item/weapon/storage/dice
-	name = "dice pack"
-	desc = "Apparently this has dice in them."
+	name = "pack of dice"
+	desc = "It's a small container with dice inside."
 	icon_state = "pill_canister"
 	icon = 'chemical.dmi'
 	item_state = "contsolid"
@@ -66,6 +67,7 @@
 	desc = "Full of goodness."
 	icon_state = "implant"
 	item_state = "syringe_kit"
+
 /obj/item/weapon/storage/cupbox
 	name = "box of paper cups"
 	desc = "It has pictures of paper cups on the front."
@@ -304,10 +306,11 @@
 	icon_state = "firstaid"

 /obj/item/weapon/storage/syringes
-	name = "Syringes"
+	name = "syringes"
 	desc = "A box full of syringes."
 	desc = "A biohazard alert warning is printed on the box"
 	icon_state = "syringe"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap

 /obj/item/weapon/storage/firstaid/toxin
 	name = "Toxin First Aid"
@@ -543,6 +546,76 @@
 	icon_state = "box"
 	item_state = "syringe_kit"

+
+
+
+/obj/structure/closet/syndicate/resources/
+	desc = "It's an emergency storage closet for repairs."
+
+/obj/structure/closet/syndicate/resources/New()
+	..()
+
+	var/list/resources_common = list(
+
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/rods
+	)
+
+	var/list/resources_rare = list(
+
+	/obj/item/stack/sheet/gold,
+	/obj/item/stack/sheet/silver,
+	/obj/item/stack/sheet/plasma,
+	/obj/item/stack/sheet/uranium,
+	/obj/item/stack/sheet/diamond
+
+	)
+
+	sleep(2)
+
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources_common)
+			var/obj/item/stack/R = new res(src)
+			R.amount = rand(40,R.max_amount)
+
+		for(var/res in resources_rare)
+			var/obj/item/stack/R = new res(src)
+			R.amount = rand(10,25)
+
+	return
+
+/obj/structure/closet/syndicate/resources/everything
+	desc = "It's an emergency storage closet for repairs."
+
+/obj/structure/closet/syndicate/resources/everything/New()
+
+
+	var/list/resources = list(
+
+	/obj/item/stack/sheet/metal,
+	/obj/item/stack/sheet/glass,
+	/obj/item/stack/sheet/gold,
+	/obj/item/stack/sheet/silver,
+	/obj/item/stack/sheet/plasma,
+	/obj/item/stack/sheet/uranium,
+	/obj/item/stack/sheet/diamond,
+	/obj/item/stack/sheet/clown,
+	/obj/item/stack/sheet/plasteel,
+	/obj/item/stack/rods
+
+	)
+
+	sleep(2)
+
+	for(var/i = 0, i<2, i++)
+		for(var/res in resources)
+			var/obj/item/stack/R = new res(src)
+			R.amount = R.max_amount
+
+	return
+
 // Belt Bags/Satchels

 /obj/item/weapon/storage/backpack/satchel_norm
@@ -35,12 +35,8 @@
 		return

 	// Sanitize inputs to avoid SQL injection attacks
-	accname = dd_replacetext(accname, "'", "''")
-	accname = dd_replacetext(accname, ";", "")
-	accname = dd_replacetext(accname, "&", "")
-	playerkey = dd_replacetext(playerkey, "'", "''")
-	playerkey = dd_replacetext(playerkey, ";", "")
-	playerkey = dd_replacetext(playerkey, "&", "")
+	accname = sanitizeSQL(accname)
+	playerkey = sanitizeSQL(playerkey)


 	var/DBQuery/query = dbcon.NewQuery("SELECT user_id FROM [forumsqldb].phpbb_users WHERE username = '[accname]'")
@@ -52,7 +48,7 @@
 		dbcon.Disconnect()
 		return

-	query = dbcon.NewQuery("SELECT pf_byondkey FROM [forumsqldb].phpbb_profile_fields_data WHERE user_id = [uid]")
+	query = dbcon.NewQuery("SELECT pf_byondkey FROM [forumsqldb].phpbb_profile_fields_data WHERE user_id = '[uid]'")
 	if(!query.Execute())
 		src << "Unable to verify whether account is already associated with a BYOND key or not. This error shouldn't occur, please contact an administrator."
 		dbcon.Disconnect()
@@ -65,7 +61,7 @@
 		dbcon.Disconnect()
 		return

-	query = dbcon.NewQuery("SELECT * FROM [forumsqldb].phpbb_user_group WHERE user_id = [uid] AND group_id = [forum_authenticated_group]")
+	query = dbcon.NewQuery("SELECT * FROM [forumsqldb].phpbb_user_group WHERE user_id = '[uid]' AND group_id = '[forum_authenticated_group]'")
 	if(!query.Execute())
 		src << "Unable to verify whether account is already part of the authenticated group or not. This error should not occur, please contact an administrator."
 		dbcon.Disconnect()
@@ -75,19 +71,19 @@
 		dbcon.Disconnect()
 		return

-	query = dbcon.NewQuery("INSERT INTO [forumsqldb].phpbb_profile_fields_data (user_id, pf_byondkey) VALUES ([uid], '[playerkey]')") // Remember which key is associated with the account
+	query = dbcon.NewQuery("INSERT INTO [forumsqldb].phpbb_profile_fields_data (user_id, pf_byondkey) VALUES ('[uid]', '[playerkey]')") // Remember which key is associated with the account
 	if(!query.Execute())
 		src << "Unable to associate key with account. Authentication failed."
 		dbcon.Disconnect()
 		return

-	query = dbcon.NewQuery("UPDATE [forumsqldb].phpbb_user_group SET group_id = [forum_authenticated_group] WHERE user_id = [uid] AND group_id = [forum_activated_group]") // Replace 'Registered Users' group with 'Activated Users'
+	query = dbcon.NewQuery("UPDATE [forumsqldb].phpbb_user_group SET group_id = '[forum_authenticated_group]' WHERE user_id = '[uid]' AND group_id = '[forum_activated_group]'") // Replace 'Registered Users' group with 'Activated Users'
 	if(!query.Execute())
 		src << "Unable to move account into authenticated group. This error shouldn't occur, contact an administrator for help. Authentication failed."
 		dbcon.Disconnect()
 		return

-	query = dbcon.NewQuery("UPDATE [forumsqldb].phpbb_users SET group_id = [forum_authenticated_group] WHERE user_id = [uid]") // Change 'default group' the the authenticated group. Not doing so was causing many authenticated accounts to retain their unauthenticated permissions, despite being succesfully authenticated.
+	query = dbcon.NewQuery("UPDATE [forumsqldb].phpbb_users SET group_id = '[forum_authenticated_group]' WHERE user_id = '[uid]'") // Change 'default group' the the authenticated group. Not doing so was causing many authenticated accounts to retain their unauthenticated permissions, despite being succesfully authenticated.
 	if(!query.Execute())
 		src << "Unable to modify default group for account. This error should never occur, contact an administrator for help. Authentication failed."
 	else
@@ -95,8 +91,12 @@
 	dbcon.Disconnect()


+// This actually opens up a bunch of security holes to the forum DB. Given that it's not used much in the first place,
+// I'm going to keep this commented out until we're sure everything's secure.	-- TLE
+/*
 /client/verb/activate_forum_account(var/a as text)
 	set name = "Activate Forum Account"
 	set category = "Special Verbs"
 	set desc = "Associate a tgstation forum account with your BYOND key to enable posting."
-	associate_key_with_forum(a, src.key)
+	associate_key_with_forum(a, src.key)
+*/
@@ -19,7 +19,7 @@
 			return null
 	return 0

-/proc/get_area_name(N) //get area by it's name
+/proc/get_area_name(N) //get area by its name
 	for(var/area/A in world)
 		if(A.name == N)
 			return A
@@ -55,19 +55,19 @@ proc/sql_report_death(var/mob/living/carbon/human/H)
 		return

 	var/turf/T = H.loc
-	var/area/placeofdeath = T.loc
+	var/area/placeofdeath = get_area(T.loc)
 	var/podname = placeofdeath.name

-	var/sqlname = dd_replacetext(H.real_name, "'", "''")
-	var/sqlkey = dd_replacetext(H.key, "'", "''")
-	var/sqlpod = dd_replacetext(podname, "'", "''")
-	var/sqlspecial = dd_replacetext(H.mind.special_role, "'", "''")
-	var/sqljob = dd_replacetext(H.mind.assigned_role, "'", "''")
+	var/sqlname = sanitizeSQL(H.real_name)
+	var/sqlkey = sanitizeSQL(H.key)
+	var/sqlpod = sanitizeSQL(podname)
+	var/sqlspecial = sanitizeSQL(H.mind.special_role)
+	var/sqljob = sanitizeSQL(H.mind.assigned_role)
 	var/laname
 	var/lakey
 	if(H.lastattacker)
-		laname = dd_replacetext(H.lastattacker:real_name, "'", "''")
-		lakey = dd_replacetext(H.lastattacker:key, "'", "''")
+		laname = sanitizeSQL(H.lastattacker:real_name)
+		lakey = sanitizeSQL(H.lastattacker:key)
 	var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
 	var/coord = "[H.x], [H.y], [H.z]"
 	//world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])"
@@ -92,19 +92,19 @@ proc/sql_report_cyborg_death(var/mob/living/silicon/robot/H)
 		return

 	var/turf/T = H.loc
-	var/area/placeofdeath = T.loc
+	var/area/placeofdeath = get_area(T.loc)
 	var/podname = placeofdeath.name

-	var/sqlname = dd_replacetext(H.real_name, "'", "''")
-	var/sqlkey = dd_replacetext(H.key, "'", "''")
-	var/sqlpod = dd_replacetext(podname, "'", "''")
-	var/sqlspecial = dd_replacetext(H.mind.special_role, "'", "''")
-	var/sqljob = dd_replacetext(H.mind.assigned_role, "'", "''")
+	var/sqlname = sanitizeSQL(H.real_name)
+	var/sqlkey = sanitizeSQL(H.key)
+	var/sqlpod = sanitizeSQL(podname)
+	var/sqlspecial = sanitizeSQL(H.mind.special_role)
+	var/sqljob = sanitizeSQL(H.mind.assigned_role)
 	var/laname
 	var/lakey
 	if(H.lastattacker)
-		laname = dd_replacetext(H.lastattacker:real_name, "'", "''")
-		lakey = dd_replacetext(H.lastattacker:key, "'", "''")
+		laname = sanitizeSQL(H.lastattacker:real_name)
+		lakey = sanitizeSQL(H.lastattacker:key)
 	var/sqltime = time2text(world.realtime, "YYYY-MM-DD hh:mm:ss")
 	var/coord = "[H.x], [H.y], [H.z]"
 	//world << "INSERT INTO death (name, byondkey, job, special, pod, tod, laname, lakey, gender, bruteloss, fireloss, brainloss, oxyloss) VALUES ('[sqlname]', '[sqlkey]', '[sqljob]', '[sqlspecial]', '[sqlpod]', '[sqltime]', '[laname]', '[lakey]', '[H.gender]', [H.bruteloss], [H.getFireLoss()], [H.brainloss], [H.getOxyLoss()])"
@@ -37,7 +37,7 @@

 /turf/space
 	icon = 'space.dmi'
-	name = "space"
+	name = "\proper space"
 	icon_state = "placeholder"

 	temperature = TCMB
@@ -182,6 +182,7 @@
 	name = "Beaker Box"
 	icon_state = "beaker"
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap

 /obj/item/weapon/storage/beakerbox/New()
 	..()
@@ -1121,7 +1121,7 @@ ________________________________________________________________________________
 					else	break
 				U << "\blue Gained <B>[totaldrain]</B> energy from [src]."
 			else
-				U << "\red The exosuit's battery has run dry of power. You must find another source."
+				U << "\red The exosuit's battery has run dry. You must find another source of power."

 		if("CYBORG")
 			var/mob/living/silicon/robot/A = target
@@ -14,7 +14,7 @@ var/datum/event/LongTermEvent = null
 var/is_ninjad_yet = 0

 /proc/SpawnEvent()
-	if(!EventsOn || ActiveEvent)
+	if(!EventsOn || ActiveEvent || !config.allow_random_events)
 		return
 	if((world.time/10)>=3600 && toggle_space_ninja && !sent_ninja_to_station && !is_ninjad_yet)
 		EventTypes |= /datum/event/spaceninja
@@ -207,14 +207,14 @@

 	src.text += "<BR><BR>The evil Space Wizards Federation have recently broke their most feared wizard, known only as \"[SWF_desc]\" out of space jail. "
 	src.text += "He is on the run, last spotted in a system near your present location. If anybody suspicious is located aboard, please "
-	src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to it's fearful nature."
+	src.text += "approach with EXTREME caution. Cent. Com also recommends that it would be wise to not inform the crew of this, due to their fearful nature."
 	src.text += "Known attributes include: Brown sandals, a large blue hat, a voluptous white beard, and an inclination to cast spells."

 /datum/intercept_text/proc/build_nuke(datum/mind/correct_person)
 	src.text += "<BR><BR>Cent. Com recently recieved a report of a plot to destory one of our stations in your area. We believe the Nuclear Authentication Disc "
-	src.text += "that is standard issue aboard your vessel may be a target, and reccommend removal of this object, and it's storage in a safe "
+	src.text += "that is standard issue aboard your vessel may be a target. We recommend removal of this object, and it's storage in a safe "
 	src.text += "environment. As this may cause panic among the crew, all efforts should be made to keep this information a secret from all but "
-	src.text += "the most trusted members."
+	src.text += "the most trusted crew-members."

 /datum/intercept_text/proc/build_malf(datum/mind/correct_person)
 	var/a_name = pick(src.anomalies)
@@ -137,8 +137,8 @@
 						T.loc = C //put shade in stone
 						T.nodamage = 1
 						T.canmove = 0
-						T.health = T.max_health
+						T.health = T.maxHealth
 						C.icon_state = "soulstone2"
-						T << "Your soul has been recaptured by the soul stone, it's arcane energies reknitting your ethereal form"
+						T << "Your soul has been recaptured by the soul stone, its arcane energies are reknitting your ethereal form"
 						U << "\blue <b>Capture successful!</b>: \black [T.name]'s has been recaptured and stored within the soul stone."
 	return
@@ -135,7 +135,6 @@
 //							if ("3")
 //								usr.spell_list += new /obj/effect/proc_holder/spell/targeted/inflict_handler/disintegrate(usr)
 //								src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown."
-								src.temp = "This spell instantly kills somebody adjacent to you with the vilest of magick. It has a long cooldown."
 							if ("4")
 								feedback_add_details("wizard_spell_learned","DT") //please do not change the abbreviation to keep data processing consistent. Add a unique id to any new spells
 								usr.spell_list += new /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech(usr)
@@ -205,6 +205,8 @@
 				if(orient == "RIGHT")
 					icon_state = "syndipod_1-r"

+			M << "\blue <b>You feel cool air surround you. You go numb as your senses turn inward.</b>"
+
 			for(var/obj/O in src)
 				O.loc = src.loc
 			src.add_fingerprint(user)
@@ -781,6 +781,7 @@
 	name = "Diskette Box"
 	icon_state = "disk_kit"
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard	//BubbleWrap

 /obj/item/weapon/storage/diskbox/New()
 	..()
@@ -88,7 +88,7 @@
 					"\blue [user]  has cleaned  the microwave.", \
 					"\blue You have cleaned the microwave." \
 				)
-				src.dirty = 0 // It's cleaned!
+				src.dirty = 0 // It's clean!
 				src.broken = 0 // just to be sure
 				src.icon_state = "mw"
 				src.flags = OPENCONTAINER
@@ -0,0 +1,846 @@
+//##############################################
+//################### NEWSCASTERS BE HERE! ####
+//###-Agouri###################################
+
+/datum/feed_message
+	var/author=""
+	var/body=""
+	//var/parent_channel
+	var/backup_body=""
+	var/backup_author=""
+
+/datum/feed_channel
+	var/channel_name=""
+	var/list/datum/feed_message/messages = list()
+	//var/message_count = 0
+	var/locked=0
+	var/author=""
+	var/backup_author=""
+	var/censored=0
+	//var/page = null //For newspapers
+
+var/list/obj/machinery/newscaster/allCasters = list() //list that will contain reference to all newscasters in existence.
+
+
+/obj/machinery/newscaster
+	name = "Newscaster"
+	desc = "A standard Nanotrasen-licensed newsfeed handler for use in commercial space stations. All the news you absolutely have no use for, in one place!"
+	icon = 'terminals.dmi'
+	icon_state = "newscaster_normal"
+	var/isbroken = 0  //1 if someone banged it with something heavy
+	var/ispowered = 1 //starts powered, changes with power_change()
+	var/list/datum/feed_channel/channel_list = list() //This list will contain the names of the feed channels. Each name will refer to a data region where the messages of the feed channels are stored.
+	var/screen = 0                  //Or maybe I'll make it into a list within a list afterwards... whichever I prefer, go fuck yourselves :3
+		// 0 = welcome screen - main menu
+		// 1 = view feed channels
+		// 2 = create feed channel
+		// 3 = create feed story
+		// 4 = feed story submited sucessfully
+		// 5 = feed channel created successfully
+		// 6 = ERROR: Cannot create feed story
+		// 7 = ERROR: Cannot create feed channel
+		// 8 = print newspaper
+		// 9 = viewing channel feeds
+		// 10 = censor feed story
+		// 11 = censor feed channel
+		//Holy shit this is outdated, made this when I was still starting newscasters :3
+	var/paper_remaining = 0
+	var/securityCaster = 0
+	var/unit_no = 0 //Each newscaster has a unit_no
+		// 0 = Caster cannot be used to issue wanted posters
+		// 1 = the opposite
+	var/datum/feed_message/wanted //We're gonna use a feed_message to store data of the wanted person because fields are similar
+	var/wanted_issue = 0
+		// 0 = there's no WANTED issued, we don't need a special icon_state
+		// 1 = Guess what.
+	var/alert = 0
+		// 0 = there hasn't been a news/wanted update in the last minutes
+		// 1 = there has
+	var/scanned_user = "Unknown" //Will contain the name of the person who currently uses the newscaster
+	var/msg = "";        //Feed message
+	var/channel_name = ""; //the feed channel which will be receiving the feed, or being created
+	var/c_locked=0;
+	var/hitstaken = 0    //Death at 3 hits from an item with force>=15
+	var/datum/feed_channel/viewing_channel = null
+	luminosity = 0
+	anchored = 1
+
+
+/obj/machinery/newscaster/security_unit
+	name = "Security Newscaster"
+	securityCaster = 1
+
+
+/obj/machinery/newscaster/New()         //Right, apparently it's good to have a New() for machinery for some sort of global machine list...
+	allCasters += src
+	src.paper_remaining = 15            // Will probably change this to something better
+	for(var/obj/machinery/newscaster/NEWSCASTER in allCasters) // Let's give it an appropriate unit number
+		src.unit_no++
+	src.update_icon() //for any custom ones on the map...
+
+/obj/machinery/newscaster/Del()
+	allCasters -= src
+	..()
+
+/obj/machinery/newscaster/update_icon()
+	if(!ispowered || isbroken)
+		icon_state = "newscaster_off"
+		if(isbroken) //If the thing is smashed, add crack overlay on top of the unpowered sprite.
+			src.overlays = null
+			src.overlays += image(src.icon, "crack3")
+		return
+
+	src.overlays = null //reset overlays
+	if(alert) //new message alert overlay
+		src.overlays += "newscaster_alert"
+	if(hitstaken > 0) //Cosmetic damage overlay
+		src.overlays += image(src.icon, "crack[hitstaken]")
+
+	if(wanted_issue) //wanted icon state
+		icon_state = "newscaster_wanted"
+		return
+
+	icon_state = "newscaster_normal"
+	return
+
+/obj/machinery/newscaster/power_change()
+	if(isbroken) //Broken shit can't be powered.
+		return
+	if( src.powered() )
+		src.ispowered = 1
+		stat &= ~NOPOWER
+		src.update_icon()
+	else
+		spawn(rand(0, 15))
+			src.ispowered = 0
+			stat |= NOPOWER
+			src.update_icon()
+
+
+/obj/machinery/newscaster/ex_act(severity)
+	switch(severity)
+		if(1.0)
+			del(src)
+			return
+		if(2.0)
+			src.isbroken=1
+			if(prob(50))
+				del(src)
+			else
+				src.update_icon() //can't place it above the return and outside the if-else. or we might get runtimes of null.update_icon() if(prob(50)) goes in.
+			return
+		else
+			if(prob(50))
+				src.isbroken=1
+			src.update_icon()
+			return
+	return
+
+/obj/machinery/newscaster/attack_ai(mob/user as mob)
+	return src.attack_hand(user)
+
+/obj/machinery/newscaster/attack_hand(mob/user as mob)
+	if(!src.ispowered || src.isbroken)
+		return
+	if(istype(user, /mob/living/carbon/human) )
+		var/mob/living/carbon/human/human_user = user
+		var/dat
+		dat = text("<HEAD><TITLE>Newscaster</TITLE></HEAD><H3>Newscaster Unit #[src.unit_no]</H3>")
+
+		src.scan_user(human_user) //Newscaster scans you
+
+		switch(screen)
+			if(0)
+				dat += "Welcome to Newscasting Unit #[src.unit_no].<BR> Interface & News networks Operational."
+				dat += "<BR><FONT SIZE=1>Property of Nanotransen Inc</FONT>"
+				if(src.wanted_issue)
+					dat+= "<HR><A href='?src=\ref[src];view_wanted=1'>Read Wanted Issue</A>"
+				dat+= "<HR><BR><A href='?src=\ref[src];create_channel=1'>Create Feed Channel</A>"
+				dat+= "<BR><A href='?src=\ref[src];view=1'>View Feed Channels</A>"
+				dat+= "<BR><A href='?src=\ref[src];create_feed_story=1'>Submit new Feed story</A>"
+				dat+= "<BR><A href='?src=\ref[src];menu_paper=1'>Print newspaper</A>"
+				dat+= "<BR><A href='?src=\ref[src];refresh=1'>Re-scan User</A>"
+				dat+= "<BR><BR><A href='?src=\ref[human_user];mach_close=newscaster_main'>Exit</A>"
+				if(src.securityCaster)
+					var/wanted_already = 0
+					for(var/obj/machinery/newscaster/N in allCasters)
+						if(N.wanted_issue)
+							wanted_already = 1
+							break
+					dat+="<HR><B>Feed Security functions:</B><BR>"
+					dat+="<BR><A href='?src=\ref[src];menu_wanted=1'>[(wanted_already) ? ("Manage") : ("Publish")] \"Wanted\" Issue</A>"
+					dat+="<BR><A href='?src=\ref[src];menu_censor_story=1'>Censor Feed Stories</A>"
+					dat+="<BR><A href='?src=\ref[src];menu_censor_channel=1'>Mark Feed Channel with Nanotrasen D-Notice</A>"
+				dat+="<BR><HR>The newscaster recognises you as: <FONT COLOR='green'>[src.scanned_user]</FONT>"
+			if(1)
+				dat+= "Station Feed Channels<HR>"
+				if( isemptylist(src.channel_list) )
+					dat+="<I>No active channels found...</I>"
+				else
+					for(var/datum/feed_channel/CHANNEL in src.channel_list)
+						dat+="<B><A href='?src=\ref[src];show_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR></B>"
+					/*for(var/datum/feed_channel/CHANNEL in src.channel_list)
+						dat+="<B>[CHANNEL.channel_name]: </B> <BR><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[CHANNEL.author]</FONT>\]</FONT><BR><BR>"
+						if( isemptylist(CHANNEL.messages) )
+							dat+="<I>No feed messages found in channel...</I><BR><BR>"
+						else
+							for(var/datum/feed_message/MESSAGE in CHANNEL.messages)
+								dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>"*/
+
+				dat+="<BR><HR><A href='?src=\ref[src];refresh=1'>Refresh</A>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Back</A>"
+			if(2)
+				dat+="Creating new Feed Channel..."
+				dat+="<HR><B><A href='?src=\ref[src];set_channel_name=1'>Channel Name</A>:</B> [src.channel_name]<BR>"
+				dat+="<B>Channel Author:</B> <FONT COLOR='green'>[src.scanned_user]</FONT><BR>"
+				dat+="<B><A href='?src=\ref[src];set_channel_lock=1'>Will Accept Public Feeds</A>:</B> [(src.c_locked) ? ("NO") : ("YES")]<BR><BR>"
+				dat+="<BR><A href='?src=\ref[src];submit_new_channel=1'>Submit</A><BR><BR><A href='?src=\ref[src];setScreen=[0]'>Cancel</A><BR>"
+			if(3)
+				dat+="Creating new Feed Message..."
+				dat+="<HR><B><A href='?src=\ref[src];set_channel_receiving=1'>Receiving Channel</A>:</B> [src.channel_name]<BR>" //MARK
+				dat+="<B>Message Author:</B> <FONT COLOR='green'>[src.scanned_user]</FONT><BR>"
+				dat+="<B><A href='?src=\ref[src];set_new_message=1'>Message Body</A>:</B> [src.msg] <BR>"
+				dat+="<BR><A href='?src=\ref[src];submit_new_message=1'>Submit</A><BR><BR><A href='?src=\ref[src];setScreen=[0]'>Cancel</A><BR>"
+			if(4)
+				dat+="Feed story successfully submitted to [src.channel_name].<BR><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(5)
+				dat+="Feed Channel [src.channel_name] created successfully.<BR><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(6)
+				dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed story to Network.</B></FONT><HR><BR>"
+				if(src.channel_name=="")
+					dat+="<FONT COLOR='maroon'>•Invalid receiving channel name.</FONT><BR>"
+				if(src.scanned_user=="Unknown")
+					dat+="<FONT COLOR='maroon'>•Channel author unverified.</FONT><BR>"
+				if(src.msg == "" || src.msg == "\[REDACTED\]")
+					dat+="<FONT COLOR='maroon'>•Invalid message body.</FONT><BR>"
+
+				dat+="<BR><A href='?src=\ref[src];setScreen=[3]'>Return</A><BR>"
+			if(7)
+				dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed Channel to Network.</B></FONT><HR><BR>"
+				var/list/existing_channels = list() //Let's get dem existing channels
+				var/list/existing_authors = list()
+				for(var/datum/feed_channel/FC in src.channel_list)
+					existing_channels += FC.channel_name
+					if(FC.author == "\[REDACTED\]")
+						existing_authors += FC.backup_author
+					else
+						existing_authors  +=FC.author
+				if(src.scanned_user in existing_authors)
+					dat+="<FONT COLOR='maroon'>•There already exists a Feed channel under your name.</FONT><BR>"
+				if(src.channel_name=="" || src.channel_name == "\[REDACTED\]")
+					dat+="<FONT COLOR='maroon'>•Invalid channel name.</FONT><BR>"
+				if(src.channel_name in existing_channels)
+					dat+="<FONT COLOR='maroon'>•Channel name already in use.</FONT><BR>"
+				if(src.scanned_user=="Unknown")
+					dat+="<FONT COLOR='maroon'>•Channel author unverified.</FONT><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[2]'>Return</A><BR>"
+			if(8)
+				var/total_num=length(src.channel_list)
+				var/active_num=total_num
+				var/message_num=0
+				for(var/datum/feed_channel/FC in src.channel_list)
+					if(!FC.censored)
+						message_num += length(FC.messages)
+					else
+						active_num--
+				dat+="Network currently serves a total of [total_num] Feed channels, [active_num] of which are active, and a total of [message_num] Feed Stories." //TODO: CONTINUE
+				dat+="<BR><BR><B>Liquid Paper remaining:</B> [(src.paper_remaining) *100 ] cm^3"
+				dat+="<BR><BR><A href='?src=\ref[src];print_paper=[0]'>Print Paper</A>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Cancel</A>"
+			if(9)
+				dat+="<B>[src.viewing_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[src.viewing_channel.author]</FONT>\]</FONT><HR>"
+				if(src.viewing_channel.censored)
+					dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
+					dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
+				else
+					if( isemptylist(src.viewing_channel.messages) )
+						dat+="<I>No feed messages found in channel...</I><BR>"
+					else
+						for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
+							dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR><BR>"
+				dat+="<BR><HR><A href='?src=\ref[src];refresh=1'>Refresh</A>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[1]'>Back</A>"
+			if(10)
+				dat+="<B>Nanotrasen Feed Censorship Tool</B><BR>"
+				dat+="<FONT SIZE=1>NOTE: Due to the nature of news Feeds, total deletion of a Feed Story is not possible.<BR>"
+				dat+="Keep in mind that users attempting to view a censored feed will instead see the \[REDACTED\] tag above it.</FONT>"
+				dat+="<HR>Select Feed channel to get Stories from:<BR>"
+				if(isemptylist(src.channel_list))
+					dat+="<I>No feed channels found active...</I><BR>"
+				else
+					for(var/datum/feed_channel/CHANNEL in src.channel_list)
+						dat+="<A href='?src=\ref[src];pick_censor_channel=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Cancel</A>"
+			if(11)
+				dat+="<B>Nanotrasen D-Notice Handler</B><HR>"
+				dat+="<FONT SIZE=1>A D-Notice is to be bestowed upon the channel if the handling Authority deems it as harmful for the station's"
+				dat+="morale, integrity or disciplinary behaviour. A D-Notice will render a channel unable to be updated by anyone, without deleting any feed"
+				dat+="stories it might contain at the time. You can lift a D-Notice if you have the required access at any time.</FONT><HR>"
+				if(isemptylist(src.channel_list))
+					dat+="<I>No feed channels found active...</I><BR>"
+				else
+					for(var/datum/feed_channel/CHANNEL in src.channel_list)
+						dat+="<A href='?src=\ref[src];pick_d_notice=\ref[CHANNEL]'>[CHANNEL.channel_name]</A> [(CHANNEL.censored) ? ("<FONT COLOR='red'>***</FONT>") : ()]<BR>"
+
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Back</A>"
+			if(12)
+				dat+="<B>[src.viewing_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.viewing_channel.author]</FONT> \]</FONT><BR>"
+				dat+="<FONT SIZE=2><A href='?src=\ref[src];censor_channel_author=\ref[src.viewing_channel]'>[(src.viewing_channel.author=="\[REDACTED\]") ? ("Undo Author censorship") : ("Censor channel Author")]</A></FONT><HR>"
+
+
+				if( isemptylist(src.viewing_channel.messages) )
+					dat+="<I>No feed messages found in channel...</I><BR>"
+				else
+					for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
+						dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>"
+						dat+="<FONT SIZE=2><A href='?src=\ref[src];censor_channel_story_body=\ref[MESSAGE]'>[(MESSAGE.body == "\[REDACTED\]") ? ("Undo story censorship") : ("Censor story")]</A>  -  <A href='?src=\ref[src];censor_channel_story_author=\ref[MESSAGE]'>[(MESSAGE.author == "\[REDACTED\]") ? ("Undo Author Censorship") : ("Censor message Author")]</A></FONT><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[10]'>Back</A>"
+			if(13)
+				dat+="<B>[src.viewing_channel.channel_name]: </B><FONT SIZE=1>\[ created by: <FONT COLOR='maroon'>[src.viewing_channel.author]</FONT> \]</FONT><BR>"
+				dat+="Channel messages listed below. If you deem them dangerous to the station, you can <A href='?src=\ref[src];toggle_d_notice=\ref[src.viewing_channel]'>Bestow a D-Notice upon the channel</A>.<HR>"
+				if(src.viewing_channel.censored)
+					dat+="<FONT COLOR='red'><B>ATTENTION: </B></FONT>This channel has been deemed as threatening to the welfare of the station, and marked with a Nanotrasen D-Notice.<BR>"
+					dat+="No further feed story additions are allowed while the D-Notice is in effect.</FONT><BR><BR>"
+				else
+					if( isemptylist(src.viewing_channel.messages) )
+						dat+="<I>No feed messages found in channel...</I><BR>"
+					else
+						for(var/datum/feed_message/MESSAGE in src.viewing_channel.messages)
+							dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR>"
+
+				dat+="<BR><A href='?src=\ref[src];setScreen=[11]'>Back</A>"
+			if(14)
+				dat+="<B>Wanted Issue Handler:</B>"
+				var/wanted_already = 0
+				var/end_param = 1
+				for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+					if(NEWSCASTER.wanted_issue)
+						wanted_already = 1
+						end_param = 2
+						break
+				if(wanted_already)
+					dat+="<FONT SIZE=2><BR><I>A wanted issue is already in Feed Circulation. You can edit or cancel it below.</FONT></I>"
+				dat+="<HR>"
+				dat+="<A href='?src=\ref[src];set_wanted_name=1'>Criminal Name</A>: [src.channel_name] <BR>"
+				dat+="<A href='?src=\ref[src];set_wanted_desc=1'>Description</A>: [src.msg] <BR>"
+				dat+="<B>Wanted Issue created by:</B><FONT COLOR='green'> [src.scanned_user]</FONT><BR>"
+				dat+="<BR><A href='?src=\ref[src];submit_wanted=[end_param]'>[(wanted_already) ? ("Edit Issue") : ("Submit")]</A>"
+				if(wanted_already)
+					dat+="<BR><A href='?src=\ref[src];cancel_wanted=1'>Take down Issue</A>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Cancel</A>"
+			if(15)
+				dat+="<FONT COLOR='green'>Wanted issue for [src.channel_name] is now in Network Circulation.</FONT><BR><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(16)
+				dat+="<B><FONT COLOR='maroon'>ERROR: Wanted Issue rejected by Network.</B></FONT><HR><BR>"
+				if(src.channel_name=="" || src.channel_name == "\[REDACTED\]")
+					dat+="<FONT COLOR='maroon'>•Invalid name for person wanted.</FONT><BR>"
+				if(src.scanned_user=="Unknown")
+					dat+="<FONT COLOR='maroon'>•Issue author unverified.</FONT><BR>"
+				if(src.msg == "" || src.msg == "\[REDACTED\]")
+					dat+="<FONT COLOR='maroon'>•Invalid description.</FONT><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(17)
+				dat+="<B>Wanted Issue successfully deleted from Circulation</B><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(18)
+				dat+="<B><FONT COLOR ='maroon'>-- STATIONWIDE WANTED ISSUE --</B></FONT><BR><FONT SIZE=2>\[Submitted by: <FONT COLOR='green'>[src.wanted.backup_author]</FONT>\]</FONT><HR>"
+				dat+="<B>Criminal</B>: [src.wanted.author]<BR>"
+				dat+="<B>Description</B>: [src.wanted.body]<BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Back</A><BR>"
+			if(19)
+				dat+="<FONT COLOR='green'>Wanted issue for [src.channel_name] successfully edited.</FONT><BR><BR>"
+				dat+="<BR><A href='?src=\ref[src];setScreen=[0]'>Return</A><BR>"
+			if(20)
+				dat+="<FONT COLOR='green'>Printing successfull. Please receive your newspaper from the bottom of the machine.</FONT><BR><BR>"
+				dat+="<A href='?src=\ref[src];setScreen=[0]'>Return</A>"
+			if(21)
+				dat+="<FONT COLOR='maroon'>Unable to print newspaper. Insufficient paper. Please notify maintenance personnell to refill machine storage.</FONT><BR><BR>"
+				dat+="<A href='?src=\ref[src];setScreen=[0]'>Return</A>"
+			else
+				dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
+
+
+		human_user << browse(dat, "window=newscaster_main;size=400x600")
+		onclose(human_user, "newscaster_main")
+
+	/*if(src.isbroken) //debugging shit
+		return
+	src.hitstaken++
+	if(src.hitstaken==3)
+		src.isbroken = 1
+	src.update_icon()*/
+
+
+/obj/machinery/newscaster/Topic(href, href_list)
+	if(..())
+		return
+	if ((usr.contents.Find(src) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon/ai)))
+		usr.machine = src
+		if(href_list["set_channel_name"])
+			src.channel_name = strip_html(input(usr, "Provide a Feed Channel Name", "Network Channel Handler", ""))
+			while (findtext(src.channel_name," ") == 1)
+				src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1)
+			src.updateUsrDialog()
+			//src.update_icon()
+
+		else if(href_list["set_channel_lock"])
+			src.c_locked = !src.c_locked
+			src.updateUsrDialog()
+			//src.update_icon()
+
+		else if(href_list["submit_new_channel"])
+			var/list/existing_channels = list()
+			var/list/existing_authors = list()
+			for(var/datum/feed_channel/FC in src.channel_list)
+				existing_channels += FC.channel_name
+				if(FC.author == "\[REDACTED\]")
+					existing_authors += FC.backup_author
+				else
+					existing_authors  +=FC.author
+			if(src.channel_name == "" || src.channel_name == "\[REDACTED\]" || src.scanned_user == "Unknown" || (src.channel_name in existing_channels) || (src.scanned_user in existing_authors) )
+				src.screen=7
+			else
+				var/choice = alert("Please confirm Feed channel creation","Network Channel Handler","Confirm","Cancel")
+				if(choice=="Confirm")
+					var/datum/feed_channel/newChannel = new /datum/feed_channel
+					newChannel.channel_name = src.channel_name
+					newChannel.author = src.scanned_user
+					newChannel.locked = c_locked
+					feedback_inc("newscaster_channels",1)
+					for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)  //Let's add the new channel in all casters.
+						NEWSCASTER.channel_list += newChannel                          //Now that it is sane, get it into the list.
+					src.screen=5
+			src.updateUsrDialog()
+			//src.update_icon()
+
+		else if(href_list["set_channel_receiving"])
+			//var/list/datum/feed_channel/available_channels = list()
+			var/list/available_channels = list()
+			for(var/datum/feed_channel/F in src.channel_list)
+				if( (!F.locked || F.author == scanned_user) && !F.censored)
+					available_channels += F.channel_name
+			src.channel_name = strip_html(input(usr, "Choose receiving Feed Channel", "Network Channel Handler") in available_channels )
+			src.updateUsrDialog()
+
+		else if(href_list["set_new_message"])
+			src.msg = strip_html(input(usr, "Write your Feed story", "Network Channel Handler", ""))
+			while (findtext(src.msg," ") == 1)
+				src.msg = copytext(src.msg,2,lentext(src.msg)+1)
+			src.updateUsrDialog()
+
+		else if(href_list["submit_new_message"])
+			if(src.msg =="" || src.msg=="\[REDACTED\]" || src.scanned_user == "Unknown" || src.channel_name == "" )
+				src.screen=6
+			else
+				var/datum/feed_message/newMsg = new /datum/feed_message
+				newMsg.author = src.scanned_user
+				newMsg.body = src.msg
+				feedback_inc("newscaster_stories",1)
+				for(var/datum/feed_channel/FC in src.channel_list)
+					if(FC.channel_name == src.channel_name)
+						FC.messages += newMsg                      // To avoid further confusion, this one for adds the message to all existing newscasters' channel_list's channels.
+						break                                      // Another for to go through newscasters is not needed. Due to the nature of submit_new_CHANNEL, every reference
+				src.screen=4                                       // to a channel in ANY newscaster is the same. Editing one will edit them all.
+
+			for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+				NEWSCASTER.newsAlert(src.channel_name)
+
+			src.updateUsrDialog()
+
+		else if(href_list["create_channel"])
+			src.screen=2
+			src.updateUsrDialog()
+
+		else if(href_list["create_feed_story"])
+			src.screen=3
+			src.updateUsrDialog()
+
+		else if(href_list["menu_paper"])
+			src.screen=8
+			src.updateUsrDialog()
+		else if(href_list["print_paper"])
+			if(!src.paper_remaining)
+				src.screen=21
+			else
+				src.print_paper()
+				src.screen = 20
+			src.updateUsrDialog()
+
+		else if(href_list["menu_censor_story"])
+			src.screen=10
+			src.updateUsrDialog()
+
+		else if(href_list["menu_censor_channel"])
+			src.screen=11
+			src.updateUsrDialog()
+
+		else if(href_list["menu_wanted"])
+			var/already_wanted = 0
+			for(var/obj/machinery/newscaster/N in allCasters)
+				if(N.wanted_issue)
+					already_wanted = 1
+					break
+			if(already_wanted)
+				src.channel_name = src.wanted.author
+				src.msg = src.wanted.body
+			src.screen = 14
+			src.updateUsrDialog()
+
+		else if(href_list["set_wanted_name"])
+			src.channel_name = strip_html(input(usr, "Provide the name of the Wanted person", "Network Security Handler", ""))
+			while (findtext(src.channel_name," ") == 1)
+				src.channel_name = copytext(src.channel_name,2,lentext(src.channel_name)+1)
+			src.updateUsrDialog()
+
+		else if(href_list["set_wanted_desc"])
+			src.msg = strip_html(input(usr, "Provide the a description of the Wanted person and any other details you deem important", "Network Security Handler", ""))
+			while (findtext(src.msg," ") == 1)
+				src.msg = copytext(src.msg,2,lentext(src.msg)+1)
+			src.updateUsrDialog()
+
+		else if(href_list["submit_wanted"])
+			var/input_param = text2num(href_list["submit_wanted"])
+			if(src.msg == "" || src.channel_name == "" || src.scanned_user == "Unknown")
+				src.screen = 16
+			else
+				var/choice = alert("Please confirm Wanted Issue [(input_param==1) ? ("creation.") : ("edit.")]","Network Security Handler","Confirm","Cancel")
+				if(choice=="Confirm")
+					if(input_param==1)
+						var/datum/feed_message/WANTED = new /datum/feed_message
+						WANTED.author = src.channel_name
+						WANTED.body = src.msg
+						WANTED.backup_author = src.scanned_user //I know, a bit wacky
+						for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+							NEWSCASTER.wanted = WANTED
+							NEWSCASTER.wanted_issue = 1
+							NEWSCASTER.newsAlert()
+							NEWSCASTER.update_icon()
+						src.screen = 15
+					else
+						src.wanted.author = src.channel_name
+						src.wanted.body = src.msg
+						src.wanted.backup_author = src.scanned_user
+						src.screen = 19
+
+			src.updateUsrDialog()
+
+		else if(href_list["cancel_wanted"])
+			var/choice = alert("Please confirm Wanted Issue removal","Network Security Handler","Confirm","Cancel")
+			if(choice=="Confirm")
+				for(var/obj/machinery/newscaster/NEWSCASTER in allCasters)
+					NEWSCASTER.wanted_issue = 0
+					NEWSCASTER.wanted = null
+					NEWSCASTER.update_icon()
+				src.screen=17
+			src.updateUsrDialog()
+
+		else if(href_list["view_wanted"])
+			src.screen=18
+			src.updateUsrDialog()
+		else if(href_list["censor_channel_author"])
+			var/datum/feed_channel/FC = locate(href_list["censor_channel_author"])
+			if(FC.author != "<B>\[REDACTED\]</B>")
+				FC.backup_author = FC.author
+				FC.author = "<B>\[REDACTED\]</B>"
+			else
+				FC.author = FC.backup_author
+			src.updateUsrDialog()
+
+		else if(href_list["censor_channel_story_author"])
+			var/datum/feed_message/MSG = locate(href_list["censor_channel_story_author"])
+			if(MSG.author != "<B>\[REDACTED\]</B>")
+				MSG.backup_author = MSG.author
+				MSG.author = "<B>\[REDACTED\]</B>"
+			else
+				MSG.author = MSG.backup_author
+			src.updateUsrDialog()
+
+		else if(href_list["censor_channel_story_body"])
+			var/datum/feed_message/MSG = locate(href_list["censor_channel_story_body"])
+			if(MSG.body != "<B>\[REDACTED\]</B>")
+				MSG.backup_body = MSG.body
+				MSG.body = "<B>\[REDACTED\]</B>"
+			else
+				MSG.body = MSG.backup_body
+			src.updateUsrDialog()
+
+		else if(href_list["pick_d_notice"])
+			var/datum/feed_channel/FC = locate(href_list["pick_d_notice"])
+			src.viewing_channel = FC
+			src.screen=13
+			src.updateUsrDialog()
+
+		else if(href_list["toggle_d_notice"])
+			var/datum/feed_channel/FC = locate(href_list["toggle_d_notice"])
+			FC.censored = !FC.censored
+			src.updateUsrDialog()
+
+		else if(href_list["view"])
+			src.screen=1
+			src.updateUsrDialog()
+
+		else if(href_list["setScreen"]) //Brings us to the main menu and resets all fields~
+			src.screen = text2num(href_list["setScreen"])
+			if (src.screen == 0)
+				src.scanned_user = "Unknown";
+				msg = "";
+				src.c_locked=0;
+				channel_name="";
+				src.viewing_channel = null
+			src.updateUsrDialog()
+
+		else if(href_list["show_channel"])
+			var/datum/feed_channel/FC = locate(href_list["show_channel"])
+			src.viewing_channel = FC
+			src.screen = 9
+			src.updateUsrDialog()
+
+		else if(href_list["pick_censor_channel"])
+			var/datum/feed_channel/FC = locate(href_list["pick_censor_channel"])
+			src.viewing_channel = FC
+			src.screen = 12
+			src.updateUsrDialog()
+
+		else if(href_list["refresh"])
+			src.updateUsrDialog()
+
+
+/obj/machinery/newscaster/attackby(obj/item/I as obj, mob/user as mob)
+
+/*	if (istype(I, /obj/item/weapon/card/id) || istype(I, /obj/item/device/pda) ) //Name verification for channels or messages
+		if(src.screen == 4 || src.screen == 5)
+			if( istype(I, /obj/item/device/pda) )
+				var/obj/item/device/pda/P = I
+				if(P.id)
+					src.scanned_user = "[P.id.registered] ([P.id.assignment])"
+					src.screen=2
+			else
+				var/obj/item/weapon/card/id/T = I
+				src.scanned_user = text("[T.registered] ([T.assignment])")
+				src.screen=2*/  //Obsolete after autorecognition
+
+	if (src.isbroken)
+		playsound(src.loc, 'hit_on_shattered_glass.ogg', 100, 1)
+		for (var/mob/O in hearers(5, src.loc))
+			O.show_message("<EM>[user.name]</EM> further abuses the shattered [src.name].")
+	else
+		if(istype(I, /obj/item/weapon) )
+			var/obj/item/weapon/W = I
+			if(W.force <15)
+				for (var/mob/O in hearers(5, src.loc))
+					O.show_message("[user.name] hits the [src.name] with the [W.name] with no visible effect." )
+					playsound(src.loc, 'Glasshit.ogg', 100, 1)
+			else
+				src.hitstaken++
+				if(src.hitstaken==3)
+					for (var/mob/O in hearers(5, src.loc))
+						O.show_message("[user.name] smashes the [src.name]!" )
+					src.isbroken=1
+					playsound(src.loc, 'Glassbr3.ogg', 100, 1)
+				else
+					for (var/mob/O in hearers(5, src.loc))
+						O.show_message("[user.name] forcefully slams the [src.name] with the [I.name]!" )
+					playsound(src.loc, 'Glasshit.ogg', 100, 1)
+		else
+			user << "<FONT COLOR='blue'>This does nothing.</FONT>"
+	src.update_icon()
+
+/obj/machinery/newscaster/attack_ai(mob/user as mob)
+	return src.attack_hand(user) //or maybe it'll have some special functions? No idea.
+
+
+/obj/machinery/newscaster/attack_paw(mob/user as mob)
+	user << "<font color='blue'>The newscaster controls are far too complicated for your tiny brain!</font>"
+	return
+
+
+
+
+
+//########################################################################################################################
+//###################################### NEWSPAPER! ######################################################################
+//########################################################################################################################
+
+/obj/item/weapon/newspaper
+	name = "Newspaper"
+	desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations."
+	icon_state = "newspaper"
+	w_class = 2	//Let's make it fit in trashbags!
+	var/screen = 0
+	var/pages = 0
+	var/curr_page = 0
+	var/list/datum/feed_channel/news_content = list()
+	var/datum/feed_message/important_message = null
+	var/scribble=""
+	var/scribble_page = null
+
+/*obj/item/weapon/newspaper/attack_hand(mob/user as mob)
+	..()
+	world << "derp"*/
+
+obj/item/weapon/newspaper/attack_self(mob/user as mob)
+	if(ishuman(user))
+		var/mob/living/carbon/human/human_user = user
+		var/dat
+		src.pages = 0
+		switch(screen)
+			if(0) //Cover
+				dat+="<DIV ALIGN='center'><B><FONT SIZE=6>The Griffon</FONT></B></div>"
+				dat+="<DIV ALIGN='center'><FONT SIZE=2>Nanotrasen-standard newspaper, for use on Nanotrasen© Space Facilities</FONT></div><HR>"
+				if(isemptylist(src.news_content))
+					if(src.important_message)
+						dat+="Contents:<BR><ul><B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [src.pages+2]\]</FONT><BR></ul>"
+					else
+						dat+="<I>Other than the title, the rest of the newspaper is unprinted...</I>"
+				else
+					dat+="Contents:<BR><ul>"
+					for(var/datum/feed_channel/NP in src.news_content)
+						src.pages++
+					if(src.important_message)
+						dat+="<B><FONT COLOR='red'>**</FONT>Important Security Announcement<FONT COLOR='red'>**</FONT></B> <FONT SIZE=2>\[page [src.pages+2]\]</FONT><BR>"
+					var/temp_page=0
+					for(var/datum/feed_channel/NP in src.news_content)
+						temp_page++
+						dat+="<B>[NP.channel_name]</B> <FONT SIZE=2>\[page [temp_page+1]\]</FONT><BR>"
+					dat+="</ul>"
+				if(scribble_page==curr_page)
+					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[src.scribble]\"</I>"
+				dat+= "<HR><DIV STYLE='float:right;'><A href='?src=\ref[src];next_page=1'>Next Page</A></DIV> <div style='float:left;'><A href='?src=\ref[human_user];mach_close=newspaper_main'>Done reading</A></DIV>"
+			if(1) // X channel pages inbetween.
+				for(var/datum/feed_channel/NP in src.news_content)
+					src.pages++ //Let's get it right again.
+				var/datum/feed_channel/C = src.news_content[src.curr_page]
+				dat+="<FONT SIZE=4><B>[C.channel_name]</B></FONT><FONT SIZE=1> \[created by: <FONT COLOR='maroon'>[C.author]</FONT>\]</FONT><BR><BR>"
+				if(C.censored)
+					dat+="This channel was deemed dangerous to the general welfare of the station and therefore marked with a <B><FONT COLOR='red'>D-Notice</B></FONT>. Its contents were not transferred to the newspaper at the time of printing."
+				else
+					if(isemptylist(C.messages))
+						dat+="No Feed stories stem from this channel..."
+					else
+						dat+="<ul>"
+						for(var/datum/feed_message/MESSAGE in C.messages)
+							dat+="-[MESSAGE.body] <BR><FONT SIZE=1>\[Story by <FONT COLOR='maroon'>[MESSAGE.author]</FONT>\]</FONT><BR><BR>"
+						dat+="</ul>"
+				if(scribble_page==curr_page)
+					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[src.scribble]\"</I>"
+				dat+= "<BR><HR><DIV STYLE='float:left;'><A href='?src=\ref[src];prev_page=1'>Previous Page</A></DIV> <DIV STYLE='float:right;'><A href='?src=\ref[src];next_page=1'>Next Page</A></DIV>"
+			if(2) //Last page
+				for(var/datum/feed_channel/NP in src.news_content)
+					src.pages++
+				if(src.important_message!=null)
+					dat+="<DIV STYLE='float:center;'><FONT SIZE=4><B>Wanted Issue:</B></FONT SIZE></DIV><BR><BR>"
+					dat+="<B>Criminal name</B>: <FONT COLOR='maroon'>[important_message.author]</FONT><BR>"
+					dat+="<B>Description</B>: [important_message.body]"
+				else
+					dat+="<I>Apart from some uninteresting Classified ads, there's nothing on this page...</I>"
+				if(scribble_page==curr_page)
+					dat+="<BR><I>There is a small scribble near the end of this page... It reads: \"[src.scribble]\"</I>"
+				dat+= "<HR><DIV STYLE='float:left;'><A href='?src=\ref[src];prev_page=1'>Previous Page</A></DIV>"
+			else
+				dat+="I'm sorry to break your immersion. This shit's bugged. Report this bug to Agouri, polyxenitopalidou@gmail.com"
+
+		dat+="<BR><HR><div align='center'>[src.curr_page+1]</div>"
+		human_user << browse(dat, "window=newspaper_main;size=300x400")
+		onclose(human_user, "newspaper_main")
+	else
+		user << "The paper is full of intelligible symbols!"
+
+
+obj/item/weapon/newspaper/Topic(href, href_list)
+	var/mob/living/U = usr
+	..()
+	if ((src in U.contents) || ( istype(loc, /turf) && in_range(src, U) ) )
+		U.machine = src
+		if(href_list["next_page"])
+			if(curr_page==src.pages+1)
+				return //Don't need that at all, but anyway.
+			if(src.curr_page == src.pages) //We're at the middle, get to the end
+				src.screen = 2
+			else
+				if(curr_page == 0) //We're at the start, get to the middle
+					src.screen=1
+			src.curr_page++
+			playsound(src.loc, "pageturn", 50, 1)
+
+		else if(href_list["prev_page"])
+			if(curr_page == 0)
+				return
+			if(curr_page == 1)
+				src.screen = 0
+
+			else
+				if(curr_page == src.pages+1) //we're at the end, let's go back to the middle.
+					src.screen = 1
+			src.curr_page--
+			playsound(src.loc, "pageturn", 50, 1)
+
+		if (istype(src.loc, /mob))
+			src.attack_self(src.loc)
+
+
+obj/item/weapon/newspaper/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype(W, /obj/item/weapon/pen))
+		if(src.scribble_page == src.curr_page)
+			user << "<FONT COLOR='blue'>There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?</FONT>"
+		else
+			var/s = strip_html( input(user, "Write something", "Newspaper", "") )
+			s = copytext(sanitize(s), 1, MAX_MESSAGE_LEN)
+			if (!s)
+				return
+			if (!in_range(src, usr) && src.loc != usr)
+				return
+			src.scribble_page = src.curr_page
+			src.scribble = s
+			src.attack_self(user)
+		return
+
+
+////////////////////////////////////helper procs
+
+
+/obj/machinery/newscaster/proc/scan_user(mob/living/carbon/human/human_user as mob)
+	if(human_user.wear_id)                                      //Newscaster scans you
+		if(istype(human_user.wear_id, /obj/item/device/pda) )	//autorecognition, woo!
+			var/obj/item/device/pda/P = human_user.wear_id
+			if(P.id)
+				src.scanned_user = "[P.id.registered_name] ([P.id.assignment])"
+			else
+				src.scanned_user = "Unknown"
+		else if(istype(human_user.wear_id, /obj/item/weapon/card/id) )
+			var/obj/item/weapon/card/id/ID = human_user.wear_id
+			src.scanned_user ="[ID.registered_name] ([ID.assignment])"
+		else
+			src.scanned_user ="Unknown"
+	else
+		src.scanned_user ="Unknown"
+
+
+/obj/machinery/newscaster/proc/print_paper()
+	feedback_inc("newscaster_newspapers_printed",1)
+	var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
+	for(var/datum/feed_channel/FC in src.channel_list)
+		NEWSPAPER.news_content += FC
+	if(src.wanted_issue)
+		NEWSPAPER.important_message = src.wanted
+	NEWSPAPER.loc = get_turf(src)
+	src.paper_remaining--
+	return
+
+
+/obj/machinery/newscaster/proc/newsAlert(channel)
+	var/turf/T = get_turf(src)
+	if(channel)
+		for(var/mob/O in hearers(world.view-1, T))
+			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"Breaking news from [channel]!\"</span>",2)
+		src.alert = 1
+		src.update_icon()
+		spawn(600)
+			src.alert = 0
+			src.update_icon()
+	else
+		for(var/mob/O in hearers(world.view-1, T))
+			O.show_message("<span class='newscaster'><EM>[src.name]</EM> beeps, \"Wanted notice posted!\"</span>",2)
+	playsound(src.loc, 'twobeep.ogg', 75, 1)
@@ -478,7 +478,7 @@
 	if(istype(I, /obj/item/weapon/screwdriver))
 		src.panelopen = !src.panelopen
 		playsound(src.loc, 'Screwdriver.ogg', 100, 1)
-		user << text("<font color='blue'>You [] the Unit's maintenance panel.</font>",(src.panelopen ? "open up" : "close") )
+		user << text("<font color='blue'>You [] the unit's maintenance panel.</font>",(src.panelopen ? "open up" : "close") )
 		src.updateUsrDialog()
 		return
 	if ( istype(I, /obj/item/weapon/grab) )
@@ -492,7 +492,7 @@
 			usr << "<font color='red'>The unit is not operational.</font>"
 			return
 		if ( (src.OCCUPANT) || (src.HELMET) || (src.SUIT) ) //Unit needs to be absolutely empty
-			user << "<font color='red'>The Unit's storage area is too cluttered.</font>"
+			user << "<font color='red'>The unit's storage area is too cluttered.</font>"
 			return
 		for (var/mob/V in viewers(user))
 			V.show_message("[user] starts putting [G.affecting.name] into the Suit Storage Unit.", 3)
@@ -343,12 +343,13 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				<b>Create a wall: </b>Destroy Travel Self<br>
 				<b>Summon cultist: </b>Join Other Self<br>
 				<b>Free a cultist: </b>Travel technology other<br>
-				<b>Deafen: </b>Hide other see<br>
+				<b>Deafen: </b>Hide Other See<br>
 				<b>Blind: </b>Destroy See Other<br>
 				<b>Blood Boil: </b>Destroy See Blood<br>
-				<b>Communicate: </b>Self other technology<br>
-				<b>Stun: </b>Join hide technology<br>
-				<b>Summon Cultist Armor: </b>Hell destroy other<br>
+				<b>Communicate: </b>Self Other Technology<br>
+				<b>Stun: </b>Join Hide Technology<br>
+				<b>Summon Cultist Armor: </b>Hell Destroy Other<br>
+				<b>See Invisible: </b>See Hell Join<br>
 				</p>
 				<h2>Rune Descriptions</h2>
 				<h3>Teleport self</h3>
@@ -396,7 +397,9 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 				<h3>Stun</h3>
 				Unlike other runes, this ons is supposed to be used in talisman form. When invoked directly, it simply releases some dark energy, briefly stunning everyone around. When imbued into a talisman, you can force all of its energy into one person, stunning him so hard he cant even speak. However, effect wears off rather fast.<br>
 				<h3>Equip Armor</h3>
-				When this rune is invoked, either from a rune or a talisman, it will equip the user with the armor of the followers of Nar-Sie. To use this rune to it's fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands.<br>
+				When this rune is invoked, either from a rune or a talisman, it will equip the user with the armor of the followers of Nar-Sie. To use this rune to its fullest extent, make sure you are not wearing any form of headgear, armor, gloves or shoes, and make sure you are not holding anything in your hands.<br>
+				<h3>See Invisible</h3>
+				When invoked when standing on it, this rune allows the user to see the the world beyond as long as he does not move.<br>
 				</body>
 				</html>
 				"}
@@ -93,7 +93,7 @@ var/list/sacrificed = list()
 				usr.say("N'ath reth sh'yro eth d'raggathnor!")
 			else
 				usr.whisper("N'ath reth sh'yro eth d'raggathnor!")
-			usr.visible_message("\red Rune disappears with a flash of red light, and in it's place now a book lies.", \
+			usr.visible_message("\red Rune disappears with a flash of red light, and in its place now a book lies.", \
 			"\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a book.", \
 			"\red You hear a pop and smell ozone.")
 			if(istype(src,/obj/effect/rune))
@@ -354,7 +354,7 @@ var/list/sacrificed = list()
 				var/mob/living/carbon/human/L = usr
 				usr.say("Fwe'sh mah erl nyag r'ya!")
 				usr.visible_message("\red [usr]'s eyes glow blue as \he freezes in place, absolutely motionless.", \
-				"\red The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this it's a great sight, being here strains your mind and body. Hurry.", \
+				"\red The shadow that is your spirit separates itself from your body. You are now in the realm beyond. While this is a great sight, being here strains your mind and body. Hurry...", \
 				"\red You hear only complete silence for a moment.")
 				usr.ghostize()
 				for(L.ajourn=1,L.ajourn)
@@ -779,7 +779,7 @@ var/list/sacrificed = list()
 					if(iscultist(C))
 						C.say("N'ath reth sh'yro eth d'rekkathnor!")
 						C.take_overall_damage(25, 0)
-				user.visible_message("\red Rune disappears with a flash of red light, and in it's place now a body lies.", \
+				user.visible_message("\red Rune disappears with a flash of red light, and in its place now a body lies.", \
 				"\red You are blinded by the flash of red light! After you're able to see again, you see that now instead of the rune there's a body.", \
 				"\red You hear a pop and smell ozone.")
 				del(src)
@@ -50,6 +50,12 @@
 //  - Books shouldn't print straight from the library computer. Make it synch with a machine like the book binder to print instead. This should consume some sort of resource.


+// Run all strings to be used in an SQL query through this proc first to properly escape out injection attempts.
+/proc/sanitizeSQL(var/t as text)
+	var/sanitized_text = dd_replacetext(t, "'", "\\'")
+	sanitized_text = dd_replacetext(sanitized_text, "\"", "\\\"")
+	return sanitized_text
+


 /obj/structure/bookcase
@@ -219,14 +219,14 @@
 	name = "pepperspray"
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = ONBELT|TABLEPASS|FPRINT|USEDELAY
 	throwforce = 3
 	w_class = 2.0
 	throw_speed = 2
 	throw_range = 10
 	var/catch = 1
 	var/BottleSize = 1
-	var/ReagentAmount = 30
+	var/ReagentAmount = 45

 /obj/item/weapon/pepperspray/small //And this is for personal defense.
 	desc = "This appears to be a small, nonlethal, single use personal defense weapon.  Hurts like a bitch, though."
@@ -234,7 +234,7 @@
 	name = "mace"
 	icon_state = "pepperspray"
 	item_state = "pepperspray"
-	flags = ONBELT|TABLEPASS|OPENCONTAINER|FPRINT|USEDELAY
+	flags = ONBELT|TABLEPASS|FPRINT|USEDELAY
 	throwforce = 3
 	w_class = 1.0
 	throw_speed = 2
@@ -263,6 +263,8 @@
 		return

 /obj/item/weapon/pepperspray/afterattack(atom/A as mob|obj, mob/user as mob)
+	if ( A == src )
+		return
 	if (istype(A, /obj/item/weapon/storage ))
 		return
 	if (istype(A, /obj/effect/proc_holder/spell ))
@@ -324,38 +326,29 @@

 		Sprays[i] = D

-	var/direction = get_dir(src, A)
-	var/turf/T = get_turf(A)
-	var/turf/T1 = get_step(T,turn(direction, 90))
-	var/turf/T2 = get_step(T,turn(direction, -90))
-	var/list/the_targets = list(T,T1,T2)
+	//var/direction = get_dir(src, A)
+	//var/turf/T = get_turf(A)
+	//var/turf/T1 = get_step(T,turn(direction, 90))
+	//var/turf/T2 = get_step(T,turn(direction, -90))
+	//var/list/the_targets = list(T,T1,T2)

 	for(var/i=1, i<=Sprays.len, i++)
 		spawn()
 			var/obj/effect/decal/D = Sprays[i]
 			if(!D) continue

-			var/turf/my_target = null
 			// Spreads the sprays a little bit
-			if(i == 1)
-				my_target = T
-			else
-				my_target = pick(the_targets)
+			var/turf/my_target = get_turf(A) //pick(the_targets)
+			//the_targets -= my_target

-			the_targets -= my_target
-
-			var/Dist = 0
-
-			if(BottleSize)
-				Dist = rand(6,8)
-			else
-				Dist = rand(2,3)
-
-			for(var/j=1, j<=Dist, j++)
+			var/list/affected = new()	// BubbleWrap
+			for(var/j=1, j<=rand(6,8), j++)
 				step_towards(D, my_target)
 				D.reagents.reaction(get_turf(D))
 				for(var/atom/t in get_turf(D))
-					D.reagents.reaction(t)
+					if ( !(t in affected) )	// Only spray each person once, removes chat spam
+						D.reagents.reaction(t)
+						affected += t
 				sleep(2)
 			del(D)
 	sleep(1)
@@ -365,10 +358,10 @@
 		janitor.cell.charge -= 20
 		var/refill = src.reagents.get_master_reagent_id()
 		spawn(600)
-			src.reagents.add_reagent(refill, 10)
-
+			src.reagents.add_reagent(refill, 45)
 	return

+
 /obj/item/weapon/pepperspray/examine()
 	set src in usr
 	if(BottleSize)
@@ -395,6 +388,7 @@
 	w_class = 3.0
 	flags = FPRINT | TABLEPASS

+
 /obj/item/weapon/mop/New()
 	var/datum/reagents/R = new/datum/reagents(5)
 	reagents = R
@@ -137,4 +137,21 @@ var/global/list/datum/stack_recipe/plasteel_recipes = list ( \
 	S.ReplaceWithPlating()
 //	var/turf/simulated/floor/W = S.ReplaceWithFloor()
 //	W.make_plating()
-	return
+	return
+
+// CARDBOARD SHEET - BubbleWrap
+
+// /datum/stack_recipe/New(title, result_type, req_amount, res_amount, max_res_amount, time, one_per_turf, on_floor = 0)
+var/global/list/datum/stack_recipe/cardboard_recipes = list ( \
+	new/datum/stack_recipe("box", /obj/item/weapon/storage/box), \
+	new/datum/stack_recipe("light tubes", /obj/item/weapon/storage/lightbox/tubes), \
+	new/datum/stack_recipe("light bulbs", /obj/item/weapon/storage/lightbox/bulbs), \
+	new/datum/stack_recipe("mouse traps", /obj/item/weapon/storage/mousetraps), \
+	new/datum/stack_recipe("cardborg suit", /obj/item/clothing/suit/cardborg, 3), \
+	new/datum/stack_recipe("cardborg helmet", /obj/item/clothing/head/helmet/cardborg), \
+)
+
+/obj/item/stack/sheet/cardboard
+	New(var/loc, var/amount=null)
+		recipes = cardboard_recipes
+		return ..()
@@ -183,13 +183,8 @@ obj/structure
 /obj/structure/lattice/attackby(obj/item/C as obj, mob/user as mob)

 	if (istype(C, /obj/item/stack/tile/plasteel))
-
-		C:build(get_turf(src))
-		C:use(1)
-		playsound(src.loc, 'Genhit.ogg', 50, 1)
-		if (C)
-			C.add_fingerprint(user)
-		del(src)
+		var/turf/T = get_turf(src)
+		T.attackby(C, user) //BubbleWrap - hand this off to the underlying turf instead
 		return
 	if (istype(C, /obj/item/weapon/weldingtool) && C:welding)
 		user << "\blue Slicing lattice joints ..."
@@ -42,7 +42,7 @@
 	name = "Gas Tank (BIOHAZARD)"
 	desc = "Contains dangerous plasma. Do not inhale."
 	icon_state = "plasma"
-
+	flags = FPRINT | TABLEPASS | CONDUCT

 /obj/item/weapon/tank/blob_act()
 	if(prob(50))
@@ -142,6 +142,7 @@
 			verbs += /client/proc/callprocobj
 			verbs += /client/proc/rnd_check_designs
 			verbs += /client/proc/CarbonCopy
+			verbs += /client/proc/getruntimelog							//used by coders to retrieve runtime logs	

 		if (holder.level >= 5)//Game Admin********************************************************************
 			verbs += /obj/admins/proc/view_txt_log
@@ -172,6 +173,7 @@
 			verbs += /client/proc/toggle_clickproc //TODO ERRORAGE (Temporary proc while the enw clickproc is being tested)
 			verbs += /client/proc/toggle_gravity_on
 			verbs += /client/proc/toggle_gravity_off
+			verbs += /client/proc/toggle_random_events
 			// Moved over from tg's Game Master:
 			verbs += /client/proc/colorooc
 			verbs += /obj/admins/proc/toggle_aliens			//toggle aliens
@@ -425,6 +427,7 @@
 	verbs -= /client/proc/tension_report
 	verbs -= /client/proc/toggle_gravity_on
 	verbs -= /client/proc/toggle_gravity_off
+	verbs -= /client/proc/toggle_random_events
 	verbs -= /client/proc/cmd_admin_change_custom_event
 	verbs -= /client/proc/admin_invis
 	verbs -= /client/proc/callprocgen
@@ -436,7 +439,7 @@
 	verbs -= /client/proc/rnd_check_designs
 	verbs -= /client/proc/make_tajaran
 	verbs -= /client/proc/CarbonCopy
-
+	verbs -= /client/proc/getruntimelog									//used by coders to retrieve runtime logs
 	return


@@ -0,0 +1,53 @@
+/*
+	HOW DO I LOG RUNTIMES?
+	Firstly, start dreamdeamon if it isn't already running. Then select "world>Log Session" (or press the F3 key)
+	navigate the popup window to the log/runtime/ folder from where your tgstation .dmb is located.
+
+	OPTIONAL: 	you can select the little checkbox down the bottom to make dreamdeamon save the log everytime you
+				start a world. Just remember to repeat these steps with a new name when you update to a new revision!
+
+	Save it with the name of the revision your server uses (e.g. r3459.txt).
+	Coders with the Game Master rank will now be able to access any runtime logs you have archived this way!
+	This will allow us to gather information on bugs across multiple servers and make maintaining the TG
+	codebase for the entire /TG/station commuity a TONNE easier :3 Thanks for your help!
+*/
+#define FTPDELAY	200	//20 second delay to prevent spam
+
+//This proc allows GameMasters to download txt files saved to the log/runtime/ folder on the server.
+//In effect this means the server owner can log game sessions through DreamDeamon to that folder and
+//Coders (with access) can download logs (old and current).
+//To make life easier on everyone please name logfiles according to the revision number in use!
+
+//This proc has a failsafe built in to prevent spamming of ftp requests. As such it can only be used once every
+//20 seconds. This can be changed by modifying FTPDELAY's value.
+
+//PLEASE USE RESPONSIBLY, only download from the server if the log isn't already available elsewhere!
+//Bandwidth is expensive and lags are lame. Although txt files of a few kB shouldn't cause problems really ~Carn
+
+/client/proc/getruntimelog()
+	set name = "getruntimelog"
+	set desc = "Retrieve any session logfiles saved by dreamdeamon"
+	set category = "Debug"
+	set hidden = 1
+
+	if( !src.holder || holder.rank != "Game Master" )
+		src << "<font color='red'>Only Game Masters may use this command.</font>"
+		return
+
+	var/time_to_wait = fileaccess_timer - world.time
+	if(time_to_wait > 0)
+		src << "<font color='red'>Error: getruntimelog(): FTP-request spam prevention. Please wait [round(time_to_wait/10)] seconds.</font>"
+		return
+	fileaccess_timer = world.time + FTPDELAY
+
+	var/list/list_of_runtimelogs = flist("log/runtime/")
+	var/choice = input(src,"Choose a runtime-log to download:","Download",null) in list_of_runtimelogs
+
+	if(!choice || !fexists("log/runtime/[choice]"))
+		src << "<font color='red'>Error: getruntimelog(): Files not found/Invalid file([choice]).</font>"
+		return
+
+	src << ftp("log/runtime/[choice]")
+
+	return
+
@@ -902,6 +902,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		A.gravitychange(0,A)

 	command_alert("For budget reasons, Centcomm is no longer beaming gravitons to your station.  We appoligize for any inconvience.")
+//CARN
+/client/proc/toggle_random_events()
+	set category = "Server"
+	set name = "Toggle random events on/off"
+	set desc = "Toggles random events such as meteors, black holes, blob (but not space dust) on/off"
+	if(!config.allow_random_events)
+		config.allow_random_events = 1
+		usr << "Random events enabled"
+		message_admins("Admin [key_name_admin(usr)] has enabled random events.", 1)
+	else
+		config.allow_random_events = 0
+		usr << "Random events disabled"
+		message_admins("Admin [key_name_admin(usr)] has disabled random events.", 1)
+	feedback_add_details("admin_verb","TRE") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /client/proc/rnd_check_designs()
 	set category = "Debug"
@@ -1910,30 +1910,50 @@ datum
 					return
 				if(method == TOUCH)
 					if(istype(M, /mob/living/carbon/human))
-						if(M:wear_mask)
-							M << "\red Your mask protects you from the pepperspray!"
+						var/mob/living/carbon/human/victim = M
+						var/mouth_covered = 0
+						var/eyes_covered = 0
+						var/obj/item/safe_thing = null
+						if( victim.wear_mask )
+							if ( victim.wear_mask.flags & MASKCOVERSEYES )
+								eyes_covered = 1
+								safe_thing = victim.wear_mask
+							if ( victim.wear_mask.flags & MASKCOVERSMOUTH )
+								mouth_covered = 1
+								safe_thing = victim.wear_mask
+						if( victim.head )
+							if ( victim.head.flags & MASKCOVERSEYES )
+								eyes_covered = 1
+								safe_thing = victim.head
+							if ( victim.head.flags & MASKCOVERSMOUTH )
+								mouth_covered = 1
+								safe_thing = victim.head
+						if(victim.glasses)
+							eyes_covered = 1
+							if ( !safe_thing )
+								safe_thing = victim.glasses
+						if ( eyes_covered && mouth_covered )
+							victim << "\red Your [safe_thing] protects you from the pepperspray!"
 							return
-						if(M:glasses)
-							if(M.job in security_positions)
-								M:emote("me",1,"glares at you as the pepperspray drips off the lenses!")
-								M << "\red Your glasses protect you from most of the pepperspray, and your training takes care of the rest!"
-								M.eye_blurry = max(M.eye_blurry, 10)
-							M << "\red Your glasses protect you from most of the pepperspray!"
-							M:emote("scream")
-							M.eye_blurry = max(M.eye_blurry, 20)
-							M.eye_blind = max(M.eye_blind, 4)
+						else if ( mouth_covered )	// Reduced effects if partially protected
+							victim << "\red Your [safe_thing] protect you from most of the pepperspray!"
+							victim.eye_blurry = max(M.eye_blurry, 3)
+							victim.eye_blind = max(M.eye_blind, 1)
+							victim.Paralyse(1)
+							victim.drop_item()
 							return
-						if(M.job in security_positions)
-							M:emote("me",1,"shakes off most of the pepper spray's effects, at least they were trained!")
-							M << "\red Your training protects you from most of the pepperspray!"
-							M.eye_blurry = max(M.eye_blurry, 20)
-							M.eye_blind = max(M.eye_blind, 4)
-						M:emote("scream")
-						M << "\red You're sprayed directly in the eyes with pepperspray!"
-						M.eye_blurry = max(M.eye_blurry, 5)
-						M.eye_blind = max(M.eye_blind, 2)
-						M.Paralyse(1)
-						M.drop_item()
+						else if ( eyes_covered ) // Eye cover is better than mouth cover
+							victim << "\red Your [safe_thing] protects your eyes from the pepperspray!"
+							victim.emote("scream")
+							victim.eye_blurry = max(M.eye_blurry, 1)
+							return
+						else // Oh dear :D
+							victim.emote("scream")
+							victim << "\red You're sprayed directly in the eyes with pepperspray!"
+							victim.eye_blurry = max(M.eye_blurry, 5)
+							victim.eye_blind = max(M.eye_blind, 2)
+							victim.Paralyse(1)
+							victim.drop_item()

 		frostoil
 			name = "Frost Oil"
@@ -12,10 +12,9 @@
 	new /obj/item/clothing/suit/chickensuit(src.loc)
 	del(src)

-/obj/effect/landmark/costume/justice/New()
-	new /obj/item/clothing/suit/justice(src.loc)
-	var/CHOICE = pick( /obj/item/clothing/head/justice , /obj/item/clothing/head/justice/blue , /obj/item/clothing/head/justice/yellow , /obj/item/clothing/head/justice/green , /obj/item/clothing/head/justice/pink )
-	new CHOICE(src.loc)
+/obj/effect/landmark/costume/gladiator/New()
+	new /obj/item/clothing/under/gladiator(src.loc)
+	new /obj/item/clothing/head/helmet/gladiator(src.loc)
 	del(src)

 /obj/effect/landmark/costume/madscientist/New()
@@ -6,8 +6,8 @@
 	var/list/allowed = list()

 /obj/item/clothing/head/cakehat
-	name = "cakehat"
-	desc = "It is a cakehat!"
+	name = "cake-hat"
+	desc = "It's tasty looking!"
 	icon_state = "cake0"
 	var/onfire = 0.0
 	var/status = 0
@@ -15,17 +15,17 @@
 	var/fire_resist = T0C+1300	//this is the max temp it can stand before you start to cook. although it might not burn away, you take damage

 /obj/item/clothing/head/caphat
-	name = "Captain's hat"
+	name = "captain's hat"
 	icon_state = "captain"
 	desc = "It's good being the king."
-	flags = FPRINT|TABLEPASS
+	flags = FPRINT|TABLEPASS|SUITSPACE
 	item_state = "caphat"

 /obj/item/clothing/head/centhat
-	name = "Cent. Comm. hat"
+	name = "\improper CentComm. hat"
 	icon_state = "centcom"
-	desc = "It's even better to be the emperor."
-	flags = FPRINT|TABLEPASS
+	desc = "It's good to be emperor."
+	flags = FPRINT|TABLEPASS|SUITSPACE
 	item_state = "centhat"

 /obj/item/clothing/head/deathsquad/beret
@@ -43,42 +43,43 @@
 	item_state = "pwig"

 /obj/item/clothing/head/that
-	name = "Top hat"
-	desc = "An amish looking hat."
+	name = "top-hat"
+	desc = "It's an amish looking hat."
 	icon_state = "tophat"
 	item_state = "that"
 	flags = FPRINT|TABLEPASS


 /obj/item/clothing/head/chefhat
-	name = "Chef's Hat"
+	name = "chef's hat"
+	desc = "It's a hat used by chefs to keep hair out of your food. Judging by the food in the mess, they don't work."
 	icon_state = "chef"
 	item_state = "chef"
 	desc = "The commander in chef's head wear."
 	flags = FPRINT | TABLEPASS

 /obj/item/clothing/head/redcoat
-	name = "Redcoat hat"
+	name = "redcoat's hat"
 	icon_state = "redcoat"
-	desc = "I guess it's a redhead."
+	desc = "<i>'I guess it's a redhead.'</i>"
 	flags = FPRINT | TABLEPASS

 /obj/item/clothing/head/mailman
-	name = "Mailman Hat"
+	name = "mailman's hat"
 	icon_state = "mailman"
-	desc = "Right-on-time mail service head wear."
+	desc = "<i>'Right-on-time'</i> mail service head wear."
 	flags = FPRINT | TABLEPASS

 /obj/item/clothing/head/plaguedoctorhat
-	name = "Plague doctor's hat"
-	desc = "Once used by Plague doctors. Now useless."
+	name = "plague doctor's hat"
+	desc = "These were once used by Plague doctors. They're pretty much useless."
 	icon_state = "plaguedoctor"
 	flags = FPRINT | TABLEPASS
 	permeability_coefficient = 0.01

 /obj/item/clothing/head/beret
 	name = "beret"
-	desc = "A beret. A mime's favorite headwear."
+	desc = "A beret, a mime's favorite headwear."
 	icon_state = "beret"
 	flags = FPRINT | TABLEPASS

@@ -91,10 +92,11 @@
 	icon_state = "cueball"
 	flags = FPRINT|TABLEPASS|SUITSPACE|HEADCOVERSEYES|HEADCOVERSMOUTH|BLOCKHAIR
 	item_state="cueball"
+	flags_inv = 0

 /obj/item/clothing/head/secsoft
-	name = "Soft Cap"
-	desc = "A baseball hat in tasteful red."
+	name = "soft cap"
+	desc = "It's baseball hat in tasteful red colour."
 	icon_state = "secsoft"
 	flags = FPRINT|TABLEPASS|HEADCOVERSEYES
 	item_state = "helmet"
@@ -108,7 +110,7 @@
 	var/flipped = 0

 /obj/item/clothing/head/syndicatefake
-	name = "red space helmet replica"
+	name = "red space-helmet replica"
 	desc = "A plastic replica of a red space space helmet. This is a toy, it is not made for use in space!"
 	icon_state = "syndicate"
 	item_state = "syndicate"
@@ -116,19 +118,28 @@
 	flags = FPRINT | TABLEPASS | BLOCKHAIR

 /obj/item/clothing/head/chaplain_hood
-	name = "Chaplain's hood"
-	desc = "A hood that covers the head. Keeps you warm during the space winters."
+	name = "chaplain's hood"
+	desc = "It's hood that covers the head. It keeps you warm during the space winters."
 	icon_state = "chaplain_hood"
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR

 /obj/item/clothing/head/hasturhood
-	name = "Hastur's Hood"
-	desc = "This hood is unspeakably stylish"
+	name = "hastur's hood"
+	desc = "It's unspeakably stylish"
 	icon_state = "hasturhood"
 	flags = FPRINT|TABLEPASS|HEADSPACE|HEADCOVERSEYES|BLOCKHAIR

 /obj/item/clothing/head/nursehat
-	name = "Nurse Hat"
-	desc = "For quick identification of trained medical personnel."
+	name = "nurse's hat"
+	desc = "It allows quick identification of trained medical personnel."
 	icon_state = "nursehat"
 	flags = FPRINT|TABLEPASS
+
+/obj/item/clothing/head/helmet/cardborg
+	name = "cardborg helmet"
+	desc = "A helmet made out of a box."
+	icon_state = "cardborg_h"
+	item_state = "cardborg_h"
+	flags = FPRINT | TABLEPASS | HEADCOVERSEYES | HEADCOVERSMOUTH
+	see_face = 0.0
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES
@@ -131,6 +131,15 @@
 	item_state = "holidaypriest"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
+// BubbleWrap - Nothing to see here
+
+/obj/item/clothing/suit/cardborg
+	name = "cardborg suit"
+	desc = "An ordinary cardboard box with holes cut in the sides."
+	icon_state = "cardborg"
+	item_state = "cardborg"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO
+	flags_inv = HIDEJUMPSUIT

 /obj/item/clothing/suit/patientgown
 	name = "patient gown"
@@ -496,7 +496,7 @@

 /obj/item/weapon/reagent_containers/food/snacks/burger/mime
 	name = "Mime Burger"
-	desc = "It's taste defies language."
+	desc = "Its taste defies language."
 	icon_state = "mimeburger"

 /obj/item/weapon/reagent_containers/food/snacks/omelette
@@ -126,26 +126,20 @@

 		//if(icon_state == initial(icon_state))
 	var/icontype = ""
-	var/list/icons = list("Blue", "HAL9000", "Monochrome", "Rainbow", "HAL9000 Mark2", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss")
+	var/list/icons = list("Blue", "Monochrome", "Rainbow", "Inverted", "Firewall", "Green", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Red", "Static")
 	if (src.name == "B.A.N.N.E.D." && src.ckey == "spaceman96")
 		icons += "B.A.N.N.E.D."
 	icontype = input("Please, select a display!", "AI", null/*, null*/) in icons
 	if(icontype == "Blue")
 		icon_state = "ai"
-	else if(icontype == "HAL9000")
-		icon_state = "ai-hal9000-2"
 	else if(icontype == "Monochrome")
 		icon_state = "ai-mono"
 	else if(icontype == "Rainbow")
 		icon_state = "ai-clown"
-	else if(icontype == "HAL9000 Mark2")
-		icon_state = "ai-hal9000-3"
 	else if(icontype == "Inverted")
 		icon_state = "ai-u"
 	else if(icontype == "Firewall")
 		icon_state = "ai-magma"
-	else if(icontype == "Funny")
-		icon_state = "ai-yesman"
 	else if(icontype == "Green")
 		icon_state = "ai-wierd"
 	else if(icontype == "Text")
@@ -160,6 +154,10 @@
 		icon_state = "ai-bliss"
 	else if(icontype == "B.A.N.N.E.D.")
 		icon_state = "ai-banned"
+	else if(icontype == "Red")
+		icon_state = "ai-malf"
+	else if(icontype == "Static")
+		icon_state = "ai-static"
 	else//(icontype == "Matrix")
 		icon_state = "ai-matrix"

@@ -9,7 +9,7 @@
 	speak = list("Meow!","Esp!","Purr!","HSSSSS")
 	speak_emote = list("purrs", "meows")
 	emote_hear = list("meows","mews")
-	emote_see = list("shakes it's head", "shivers")
+	emote_see = list("shakes its head", "shivers")
 	speak_chance = 1
 	turns_per_move = 5
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat
@@ -1,8 +1,8 @@
 //Corgi
 /mob/living/simple_animal/corgi
-	name = "corgi"
+	name = "\improper corgi"
 	real_name = "corgi"
-	desc = "Puppy!!"
+	desc = "It's a corgi."
 	icon = 'mob.dmi'
 	icon_state = "corgi"
 	icon_living = "corgi"
@@ -10,9 +10,9 @@
 	speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
 	speak_emote = list("barks", "woofs")
 	emote_hear = list("barks", "woofs", "yaps","pants")
-	emote_see = list("shakes it's head", "shivers")
+	emote_see = list("shakes its head", "shivers")
 	speak_chance = 1
-	turns_per_move = 5
+	turns_per_move = 10
 	meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi
 	meat_amount = 3
 	response_help  = "pets the"
@@ -51,8 +51,9 @@
 /mob/living/simple_animal/corgi/show_inv(mob/user as mob)
 	/*
 	user.machine = src
+	if(user.stat) return

-	var/dat = 	"<div align='center'><b>Inventory of [src]</b></div><p>"
+	var/dat = 	"<div align='center'><b>Inventory of [name]</b></div><p>"
 	if(inventory_head)
 		dat +=	"<br><b>Head:</b> [inventory_head] (<a href='?src=\ref[src];remove_inv=head'>Remove</a>)"
 	else
@@ -63,7 +64,7 @@
 		dat +=	"<br><b>Back:</b> <a href='?src=\ref[src];add_inv=back'>Nothing</a>"

 	user << browse(dat, text("window=mob[];size=325x500", name))
-	onclose(user, "mob[name]")
+	onclose(user, "mob[real_name]")
 	*/
 	return

@@ -72,22 +73,24 @@
 		//helmet and armor = 100% protection
 		if( istype(inventory_head,/obj/item/clothing/head/helmet) && istype(inventory_back,/obj/item/clothing/suit/armor) )
 			if( O.force )
-				usr << "\red This animal is wearing too much armor. You can't cause it any damage."
+				usr << "\red This animal is wearing too much armor. You can't cause /him any damage."
 				for (var/mob/M in viewers(src, null))
 					M.show_message("\red \b [user] hits [src] with the [O], however [src] is too armored.")
 			else
-				usr << "\red This animal is wearing too much armor. You can't reach it's skin."
+				usr << "\red This animal is wearing too much armor. You can't reach its skin."
 				for (var/mob/M in viewers(src, null))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
 			if(prob(15))
-				emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on it's face")
+				emote("looks at [user] with [pick("an amused","an annoyed","a confused","a resentful", "a happy", "an excited")] expression on \his face")
 			return
 	..()

 /mob/living/simple_animal/corgi/Topic(href, href_list)
+	if(usr.stat) return
+
 	//Removing from inventory
 	if(href_list["remove_inv"])
-		if(get_dist(src,usr) > 1)
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
 			return
 		var/remove_from = href_list["remove_inv"]
 		switch(remove_from)
@@ -98,36 +101,36 @@
 					speak = list("YAP", "Woof!", "Bark!", "AUUUUUU")
 					speak_emote = list("barks", "woofs")
 					emote_hear = list("barks", "woofs", "yaps","pants")
-					emote_see = list("shakes it's head", "shivers")
+					emote_see = list("shakes its head", "shivers")
 					desc = "It's a corgi."
 					src.sd_SetLuminosity(0)
 					inventory_head.loc = src.loc
 					inventory_head = null
 				else
-					usr << "\red There is nothing on its [remove_from]."
+					usr << "\red There is nothing to remove from its [remove_from]."
 					return
 			if("back")
 				if(inventory_back)
 					inventory_back.loc = src.loc
 					inventory_back = null
 				else
-					usr << "\red There is nothing on its [remove_from]."
+					usr << "\red There is nothing to remove from its [remove_from]."
 					return

-		show_inv(usr)
+		//show_inv(usr) //Commented out because changing Ian's  name and then calling up his inventory opens a new inventory...which is annoying.

 	//Adding things to inventory
 	else if(href_list["add_inv"])
-		if(get_dist(src,usr) > 1)
-			return
-		if(!usr.get_active_hand())
-			usr << "\red You have nothing in your active hand to put in the slot."
+		if(get_dist(src,usr) > 1 || !(ishuman(usr) || ismonkey(usr) || isrobot(usr) ||  isalienadult(usr)))
 			return
 		var/add_to = href_list["add_inv"]
+		if(!usr.get_active_hand())
+			usr << "\red You have nothing in your hand to put on its [add_to]."
+			return
 		switch(add_to)
 			if("head")
 				if(inventory_head)
-					usr << "\red The [inventory_head] is already in this slot."
+					usr << "\red It's is already wearing something."
 					return
 				else
 					var/obj/item/item_to_add = usr.get_active_hand()
@@ -171,7 +174,7 @@
 					)

 					if( ! ( item_to_add.type in allowed_types ) )
-						usr << "\red The corgi doesn't seem too keen on wearing that item."
+						usr << "\red It doesn't seem too keen on wearing that item."
 						return

 					usr.drop_item()
@@ -194,13 +197,13 @@
 							desc = "It's a cute little kitty-cat! ... wait ... what the hell?"
 						if(/obj/item/clothing/head/rabbitears, /obj/item/clothing/head/collectable/rabbitears)
 							name = "Hoppy"
-							emote_see = list("twitches his nose", "hops around a bit")
+							emote_see = list("twitches its nose", "hops around a bit")
 							desc = "This is hoppy. It's a corgi-...urmm... bunny rabbit"
 						if(/obj/item/clothing/head/beret, /obj/item/clothing/head/collectable/beret)
 							name = "Yann"
-							desc = "mon dieu! C'est un chien!"
+							desc = "Mon dieu! C'est un chien!"
 							speak = list("le woof!", "le bark!", "JAPPE!!")
-							emote_see = list("cowers in fear", "surrenders", "plays dead")
+							emote_see = list("cowers in fear", "surrenders", "plays dead","looks as  though there is a wall in front of /him")
 						if(/obj/item/clothing/head/det_hat)
 							name = "Detective [real_name]"
 							desc = "[name] sees through your lies..."
@@ -209,13 +212,13 @@
 							name = "Nurse [real_name]"
 							desc = "[name] needs 100cc of beef jerky...STAT!"
 						if(/obj/item/clothing/head/pirate, /obj/item/clothing/head/collectable/pirate)
-							name = "'[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibbles","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]'"
+							name = "'[pick("Ol'","Scurvy","Black","Rum","Gammy","Bloody","Gangrene","Death","Long-John")] [pick("kibble","leg","beard","tooth","poop-deck","Threepwood","Le Chuck","corsair","Silver","Crusoe")]'"
 							desc = "Yaarghh!! Thar' be a scurvy dog!"
 							emote_see = list("hunts for treasure","stares coldly...","gnashes his tiny corgi teeth")
 							emote_hear = list("growls ferociously", "snarls")
 							speak = list("Arrrrgh!!","Grrrrrr!")
 						if(/obj/item/clothing/head/ushanka)
-							name = "[pick("Comrade","Commissar")] [real_name]"
+							name = "[pick("Comrade","Commissar","Glorious Leader")] [real_name]"
 							desc = "A follower of Karl Barx."
 							emote_see = list("contemplates the failings of the capitalist economic model", "ponders the pros and cons of vangaurdism")
 						if(/obj/item/clothing/head/collectable/police)
@@ -226,7 +229,7 @@
 							name = "Grandwizard [real_name]"
 							speak = list("YAP", "Woof!", "Bark!", "AUUUUUU", "EI  NATH!")
 						if(/obj/item/weapon/bedsheet)
-							name = "The ghost"
+							name = "\improper Ghost"
 							speak = list("WoooOOOooo~","AUUUUUUUUUUUUUUUUUU")
 							emote_see = list("stumbles around", "shivers")
 							emote_hear = list("howls","groans")
@@ -239,7 +242,7 @@

 			if("back")
 				if(inventory_back)
-					usr << "\red The [inventory_back] is already in this slot."
+					usr << "\red It's already wearing something."
 					return
 				else
 					var/obj/item/item_to_add = usr.get_active_hand()
@@ -255,7 +258,7 @@
 					)

 					if( ! ( item_to_add.type in allowed_types ) )
-						usr << "\red The object cannot fit on this animal."
+						usr << "\red This object won't fit."
 						return

 					usr.drop_item()
@@ -271,6 +274,7 @@
 /mob/living/simple_animal/corgi/Ian
 	name = "Ian"
 	real_name = "Ian"	//Intended to hold the name without altering it.
+	gender = "male"
 	desc = "It's a corgi."
 	var/turns_since_scan = 0
 	var/obj/movement_target
@@ -323,7 +327,7 @@
 						emote("stares at the [movement_target] that [movement_target.loc] has with a sad puppy-face")

 		if(prob(1))
-			emote("dances around")
+			emote(pick("dances around","chases its tail"))
 			spawn(0)
 				for(var/i in list(1,2,4,8,4,2,1,2,4,8,4,2,1,2,4,8,4,2))
 					dir = i
@@ -343,11 +347,12 @@
 			var/mob/tmob = AM
 			if(istype(tmob, /mob/living/carbon/human) && tmob.mutations & FAT)
 				if(prob(70))
-					for(var/mob/M in viewers(src, null))
-						if(M.client)
-							M << "\red <B>[src] fails to push [tmob]'s fat ass out of the way.</B>"
+					src << "\red <B>You fail to push [tmob]'s fat ass out of the way.</B>"
 					now_pushing = 0
 					return
+			if(tmob.nopush)
+				now_pushing = 0
+				return

 			tmob.LAssailant = src
 		now_pushing = 0
@@ -375,6 +380,20 @@
 	mind.assigned_role = "Corgi"
 	mind.key = G.key

+
+/mob/living/simple_animal/corgi/attackby(var/obj/item/O as obj, var/mob/user as mob)  //Marker -Agouri
+	if(istype(O, /obj/item/weapon/newspaper))
+		if(alive)
+			for(var/mob/M in viewers(user, null))
+				if ((M.client && !( M.blinded )))
+					M.show_message("\blue [user] baps [name] on the nose with the rolled up [O]")
+			spawn(0)
+				for(var/i in list(1,2,4,8,4,2,1,2))
+					dir = i
+					sleep(1)
+	else
+		..()
+
 /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi
 	name = "Corgi meat"
 	desc = "Tastes like... well you know..."
@@ -2,7 +2,7 @@
 	name = "animal"
 	var/icon_living = ""
 	var/icon_dead = ""
-	var/max_health = 20
+	maxHealth = 20
 	var/alive = 1
 	var/list/speak = list()
 	var/list/speak_emote = list()//	Emotes while speaking IE: Ian [emote], [text] -- Ian barks, "WOOF!". Spoken text is generated from the speak variable.
@@ -50,6 +50,8 @@
 	var/wall_smash = 0 //if they can smash walls

 	var/speed = 0 //LETS SEE IF I CAN SET SPEEDS FOR SIMPLE MOBS WITHOUT DESTROYING EVERYTHING. Higher speed is slower, negative speed is faster
+
+	var/obj/item/device/radio/headset/ears = null
 /mob/living/simple_animal/New()
 	..()
 	verbs -= /mob/verb/observe
@@ -70,24 +72,59 @@
 			density = 1
 		return

+
 	if(health < 1)
-		alive = 0
-		icon_state = icon_dead
-		stat = 2 			//Dead
-		density = 0
-		return
+		Die()

-	if(health > max_health)
-		health = max_health
+	if(health > maxHealth)
+		health = maxHealth

+/*
+	// Stun/Weaken
+
+	if (paralysis || stunned || weakened) //Stunned etc.
+		if (stunned > 0)
+			AdjustStunned(-1)
+			stat = 0
+		if (weakened > 0)
+			AdjustWeakened(-1)
+			lying = 1
+			stat = 0
+		if (paralysis > 0)
+			AdjustParalysis(-1)
+			blinded = 1
+			lying = 1
+			stat = 1
+		var/h = hand
+		hand = 0
+		drop_item()
+		hand = 1
+		drop_item()
+		hand = h
+
+	else	//Not stunned.
+		lying = 0
+		stat = 0
+
+	if(paralysis || stunned || weakened || buckled)
+		canmove = 0
+	else
+		canmove = 1
+*/
 	//Movement
 	if(!ckey && !stop_automated_movement)
-		if(isturf(src.loc) && !resting && !buckled)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
+		if(isturf(src.loc) && !resting && !buckled && canmove)		//This is so it only moves if it's not inside a closet, gentics machine, etc.
 			turns_since_move++
 			if(turns_since_move >= turns_per_move)
 				Move(get_step(src,pick(cardinal)))
 				turns_since_move = 0

+
+
+
+
+
+
 	//Speaking
 	if(speak_chance)
 		if(prob(speak_chance))
@@ -201,6 +238,7 @@

 /mob/living/simple_animal/emote(var/act)
 	if(act)
+		if(act == "scream")	act = "makes a loud and pained whimper" //ugly hack to stop animals screaming when crushed :P
 		for (var/mob/O in viewers(src, null))
 			O.show_message("<B>[src]</B> [act].")

@@ -267,9 +305,9 @@
 	if(istype(O, /obj/item/stack/medical))
 		if(alive)
 			var/obj/item/stack/medical/MED = O
-			if(health < max_health)
+			if(health < maxHealth)
 				if(MED.amount >= 1)
-					health = min(max_health, health + MED.heal_brute)
+					health = min(maxHealth, health + MED.heal_brute)
 					MED.amount -= 1
 					if(MED.amount <= 0)
 						del(MED)
@@ -289,9 +327,24 @@
 			for(var/mob/M in viewers(src, null))
 				if ((M.client && !( M.blinded )))
 					M.show_message("\red [user] gently taps [src] with the [O]. ")
+
+
 /mob/living/simple_animal/movement_delay()
 	var/tally = 0 //Incase I need to add stuff other than "speed" later

 	tally = speed

-	return tally
+	return tally
+
+/mob/living/simple_animal/Stat()
+	..()
+
+	statpanel("Status")
+	stat(null, "Health: [round((health / maxHealth) * 100)]%")
+
+/mob/living/simple_animal/proc/Die()
+	alive = 0
+	icon_state = icon_dead
+	stat = DEAD
+	density = 0
+	return
@@ -5,7 +5,7 @@
 	icon_state = "shade"
 	icon_living = "shade"
 	icon_dead = "shade_dead"
-	max_health = 50
+	maxHealth = 50
 	health = 50
 	speak_emote = list("hisses")
 	emote_hear = list("wails","screeches")
@@ -164,9 +164,9 @@

 		else
 			if (stat & MAINT)
-				usr << "The cover is closed. Something wrong with it: it's doesn't work."
+				usr << "The cover is closed. Something is wrong with it, it doesn't work."
 			else if (malfhack)
-				usr << "The cover is broken. It's may be hard to force it open."
+				usr << "The cover is broken. It may be hard to force it open."
 			else
 				usr << "The cover is closed."

@@ -385,14 +385,12 @@
 //		use_power(luminosity * LIGHTING_POWER_FACTOR, LIGHT)

 // called when area power state changes
-
 /obj/machinery/light/power_change()
-	spawn(rand(0,15))
+	spawn(10)
 		var/area/A = src.loc.loc
 		A = A.master
 		seton(A.lightswitch && A.power_light)

-
 // called when on fire

 /obj/machinery/light/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
@@ -593,7 +591,12 @@
 	name = "replacement bulbs"
 	icon = 'storage.dmi'
 	icon_state = "light"
+	desc = "This box is shaped on the inside so that only light tubes and bulbs fit."
 	item_state = "syringe_kit"
+	foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
+	storage_slots=21
+	can_hold = list("/obj/item/weapon/light/tube", "/obj/item/weapon/light/bulb")
+	max_combined_w_class = 21

 /obj/item/weapon/storage/lightbox/bulbs/New()
 	..()
@@ -188,7 +188,7 @@ display round(lastgen) and plasmatank amount
 	attackby(var/obj/item/O as obj, var/mob/user as mob)
 		if(istype(O, text2path(coin_path)))
 			if(coins >= max_coins)
-				user << "\red The generator already has it's maximum amount of fuel!"
+				user << "\red The generator already has its maximum amount of fuel!"
 				return
 			coins++
 			user.drop_item()
@@ -217,7 +217,7 @@
 				temp_server.id_with_download += num

 		else if(href_list["reset_tech"])
-			var/choice = alert("Technology Data Rest", "Are you sure you want to reset this technology to it's default data? Data lost cannot be recovered.", "Continue", "Cancel")
+			var/choice = alert("Technology Data Rest", "Are you sure you want to reset this technology to its default data? Data lost cannot be recovered.", "Continue", "Cancel")
 			if(choice == "Continue")
 				for(var/datum/tech/T in temp_server.files.known_tech)
 					if(T.id == href_list["reset_tech"])
@@ -226,7 +226,7 @@
 			temp_server.files.RefreshResearch()

 		else if(href_list["reset_design"])
-			var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? If you still have the prerequisites for the design, it'll reset to it's base reliability. Data lost cannot be recovered.", "Continue", "Cancel")
+			var/choice = alert("Design Data Deletion", "Are you sure you want to delete this design? If you still have the prerequisites for the design, it'll reset to its base reliability. Data lost cannot be recovered.", "Continue", "Cancel")
 			if(choice == "Continue")
 				for(var/datum/design/D in temp_server.files.known_designs)
 					if(D.id == href_list["reset_design"])
@@ -56,6 +56,10 @@ PROBABILITY MONKEY 0
 PROBABILITY TRAITORCHAN 0
 PROBABILITY EXTEND-A-TRAITORMONGOUS 3
 PROBABILITY EPIDEMIC 1
+
+## Hash out to disable random events during the round.
+ALLOW_RANDOM_EVENTS
+
 ## if amount of traitors scales or not
 TRAITOR_SCALING