Merge tgstation13 r4570 into bs12_with_tgport

Conflicts:
	baystation12.dme
	code/defines/obj.dm
	code/defines/procs/helpers.dm
	code/defines/turf.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/cult/cult_structures.dm
	code/game/gamemodes/events.dm
	code/game/machinery/telecomms/machine_interactions.dm
	code/game/master_controller.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/item.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/wires.dm
	code/game/objects/weapons.dm
	code/game/turfs/turf.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/new_player/login.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/unused/toilets.dm
	html/changelog.html
	icons/effects/alert.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/area/areas.dm

@@ -3,80 +3,43 @@
 
 
 // ===
-/area/
+/area
 	var/global/global_uid = 0
 	var/uid
 
 /area/New()
-
+	icon_state = ""
+	layer = 10
 	master = src //moved outside the spawn(1) to avoid runtimes in lighting.dm when it references src.loc.loc.master ~Carn
-	src.icon = 'icons/effects/alert.dmi'
 	uid = ++global_uid
-	spawn(1)
-	//world.log << "New: [src] [tag]"
-		var/sd_created = findtext(tag,"sd_L")
-		sd_New(sd_created)
-		if(sd_created)
-			related += src
-			return
-		related = list(src)
+	related = list(src)
 
-		src.icon = 'icons/effects/alert.dmi'
-		src.layer = 10
-	//	update_lights()
-		if(name == "Space")			// override defaults for space
-			requires_power = 1
-			always_unpowered = 1
-			sd_SetLuminosity(1)
-			power_light = 0
-			power_equip = 0
-			power_environ = 0
-			//has_gravity = 0    // Space has gravity.  Because.. because.
+	if(type == /area)	// override defaults for space. TODO: make space areas of type /area/space rather than /area
+		requires_power = 1
+		always_unpowered = 1
+		lighting_use_dynamic = 1
+		power_light = 0
+		power_equip = 0
+		power_environ = 0
+//		lighting_state = 4
+		//has_gravity = 0    // Space has gravity.  Because.. because.
 
-		if(!requires_power)
-			power_light = 0//rastaf0
-			power_equip = 0//rastaf0
-			power_environ = 0//rastaf0
-			luminosity = 1
-			sd_lighting = 0			// *DAL*
-		else
-			luminosity = 0
-			//sd_SetLuminosity(0)		// *DAL*
+	if(requires_power)
+		luminosity = 0
+	else
+		power_light = 0			//rastaf0
+		power_equip = 0			//rastaf0
+		power_environ = 0		//rastaf0
+		luminosity = 1
+		lighting_use_dynamic = 0
+
+	..()
+
+//	spawn(15)
+	power_change()		// all machines set to current power level, also updates lighting icon
+	InitializeLighting()
 
 
-
-
-	/*spawn(5)
-		for(var/turf/T in src)		// count the number of turfs (for lighting calc)
-			if(no_air)
-				T.oxygen = 0		// remove air if so specified for this area
-				T.n2 = 0
-				T.res_vars()
-
-	*/
-
-
-	spawn(15)
-		src.power_change()		// all machines set to current power level, also updates lighting icon
-
-/*
-/proc/get_area(area/A)
-	while (A)
-		if (istype(A, /area))
-			return A
-
-		A = A.loc
-	return null
-*/
-/*
-/area/proc/update_lights()
-	var/new_power = 0
-	for(var/obj/machinery/light/L in src.contents)
-		if(L.on)
-			new_power += (L.luminosity * 20)
-	lighting_power_usage = new_power
-	return
-*/
 /area/proc/poweralert(var/state, var/obj/source as obj)
 	if (state != poweralm)
 		poweralm = state

code/game/asteroid/asteroid.dm

@@ -2,7 +2,7 @@ var/global/max_secret_rooms = 3
 
 
 
-
+/*
 proc/spawn_asteroid(var/turf/start_loc,var/type,var/size,var/richness)//type: 0 or null - random, 1 - nothing,  2 - iron, 3 - silicon
 	if(!size)
 		size = pick(100;2,50;3,35;4,25;6,10;12)
@@ -43,7 +43,8 @@ proc/spawn_asteroid(var/turf/start_loc,var/type,var/size,var/richness)//type: 0
 			max_secret_rooms--
 
 	return 1
-
+*/
+/*
 /proc/populate_w_asteroids(var/z,var/density=null)
 	if(!density)
 		density = pick(10,20,40)
@@ -55,7 +56,7 @@ proc/spawn_asteroid(var/turf/start_loc,var/type,var/size,var/richness)//type: 0
 		if(start_loc && spawn_asteroid(start_loc))
 			density--
 	return
-
+*/
 //this is terrible!	-Pete
 /*
 /datum/game_mode/proc/setup_sectors()
@@ -79,7 +80,7 @@ proc/spawn_asteroid(var/turf/start_loc,var/type,var/size,var/richness)//type: 0
 			else
 				break
 	world << "\blue \b Randomization complete."
-/*
+
 	//debug
 	for(x=1,x<=global_map.len,x++)
 		var/list/y_arr = global_map[x]
@@ -92,7 +93,7 @@ proc/spawn_asteroid(var/turf/start_loc,var/type,var/size,var/richness)//type: 0
 				else t = "Empty Cold Space"
 			world << "Global map [x] - [y] contains [t] (Z = [y_arr[y]])"
 	//debug
-*/
+
 	return
 
 /datum/game_mode/proc/spawn_exporation_packs()

code/game/atom_procs.dm

@@ -1,6 +1,41 @@
+//Movable atoms
+/atom/movable
+	var/mob/pulledby = null
+
+/atom/movable/verb/pull()
+	set name = "Pull"
+	set category = "IC"
+	set src in oview(1)
+
+	usr.start_pulling(src)
+	return
+
+//All atoms
+/atom/verb/examine()
+	set name = "Examine"
+	set category = "IC"
+	set src in oview(12)	//make it work from farther away
+
+	if (!( usr ))
+		return
+	usr << "That's \a [src]." //changed to "That's" from "This is" because "This is some metal sheets" sounds dumb compared to "That's some metal sheets" ~Carn
+	usr << desc
+	// *****RM
+	//usr << "[name]: Dn:[density] dir:[dir] cont:[contents] icon:[icon] is:[icon_state] loc:[loc]"
+	return
+
 /atom/proc/MouseDrop_T()
 	return
 
+/atom/proc/relaymove()
+	return
+
+/atom/proc/ex_act()
+	return
+
+/atom/proc/blob_act()
+	return
+
 /atom/proc/attack_hand(mob/user as mob)
 	return
 
@@ -32,7 +67,6 @@
 	src.attack_paw(user)
 	return
 
-
 // for metroids
 /atom/proc/attack_metroid(mob/user as mob)
 	return
@@ -166,6 +200,17 @@
 		del(fingerprints)
 	return
 
+
+/atom/proc/transfer_fingerprints_to(var/atom/A)
+	if(!istype(A.fingerprints,/list))
+		A.fingerprints = list()
+	if(!istype(A.fingerprintshidden,/list))
+		A.fingerprintshidden = list()
+	A.fingerprints |= fingerprints            //detective
+	A.fingerprintshidden |= fingerprintshidden    //admin
+	A.fingerprintslast = fingerprintslast
+
+
 //returns 1 if made bloody, returns 0 otherwise
 /atom/proc/add_blood(mob/living/carbon/human/M as mob)
 	if (!( istype(M, /mob/living/carbon/human) ))

code/game/cellautomata.dm

@@ -118,8 +118,8 @@
 
 	socket_talk = new /datum/socket_talk()
 	master_controller = new /datum/controller/game_controller()
-	spawn(-1)
-		master_controller.setup()
+	spawn(-1)	master_controller.setup()
+	lighting_controller.Initialize()
 	return
 
 //Crispy fullban

code/game/gamemodes/changeling/changeling_powers.dm

@@ -344,7 +344,7 @@
 	set category = "Changeling"
 	set name = "Regenerative Stasis (20)"
 
-	var/datum/changeling/changeling = changeling_power(20,0,100,UNCONSCIOUS)
+	var/datum/changeling/changeling = changeling_power(20,0,100,DEAD)
 	if(!changeling)	return
 
 	changeling.chem_charges -= 20

code/game/gamemodes/changeling/modularchangling.dm

@@ -27,8 +27,8 @@ var/list/datum/power/changeling/powerinstances = list()
 
 /datum/power/changeling/fakedeath
 	name = "Regenerative Stasis"
-	desc = "We fake our death while we regenerate our form, even through death."
-	helptext = "Must be used before death."
+	desc = "We become weakened to a death-like state, where we will rise again from death."
+	helptext = "Can be used before or after death. Duration varies greatly."
 	genomecost = 0
 	allowduringlesserform = 1
 	verbpath = /mob/proc/changeling_fakedeath
@@ -56,7 +56,7 @@ var/list/datum/power/changeling/powerinstances = list()
 /datum/power/changeling/silence_sting
 	name = "Silence Sting"
 	desc = "We silently sting a human, completely silencing them for a short time."
-	helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and can not."
+	helptext = "Does not provide a warning to a victim that they have been stung, until they try to speak and cannot."
 	genomecost = 2
 	allowduringlesserform = 1
 	verbpath = /mob/proc/changeling_silence_sting
@@ -64,6 +64,7 @@ var/list/datum/power/changeling/powerinstances = list()
 /datum/power/changeling/transformation_sting
 	name = "Transformation Sting"
 	desc = "We silently sting a human, injecting a retrovirus that forces them to transform into another."
+	helptext = "Does not provide a warning to others. The victim will transform much like a changeling would."
 	genomecost = 3
 	verbpath = /mob/proc/changeling_transformation_sting
 

code/game/gamemodes/cult/cult_structures.dm

@@ -24,7 +24,7 @@
 	name = "Desk"
 	desc = "A desk covered in arcane manuscripts and tomes in unknown languages. Looking at the text makes your skin crawl"
 	icon_state = "tomealtar"
-	luminosity = 5
+//	luminosity = 5
 
 //sprites for this no longer exist	-Pete
 //(they were stolen from another game anyway)

code/game/gamemodes/events.dm

@@ -92,14 +92,13 @@
 			IonStorm()
 		if(14)
 			spacevine_infestation()
-		// TODO: Uncomment this after feature freeze -Giacom
-		//if(15)
-		//	communications_blackout()
+		if(15)
+			communications_blackout()
 
-/proc/communications_blackout()
+/proc/communications_blackout(var/silent = 1)
 
 	//Uncomment below if you want communication blackouts to have a warning.
-	//command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
+	if(!silent) command_alert("Ionospheric anomalies detected. Temporary telecommunication failure imminent. Please contact you-BZZT")
 	for(var/obj/machinery/telecomms/T in telecomms_list)
 		T.emp_act(1)
 

code/game/gamemodes/gameticker.dm

@@ -137,11 +137,12 @@ var/global/datum/controller/gameticker/ticker
 	if(admins_number == 0)
 		send2irc("Server", "Round just started with no admins online!")
 
-	spawn() supply_ticker() // Added to kick-off the supply shuttle regenerating points -- TLE
+	supply_shuttle.process() 		//Start the supply shuttle regenerating points -- TLE
+	master_controller.process()		//Start master_controller.process()
+	lighting_controller.process()	//Start processing DynamicAreaLighting updates
 
-	//Start master_controller.process()
-	spawn master_controller.process()
-	if (config.sql_enabled)
+
+	if(config.sql_enabled)
 		spawn(3000)
 		statistic_cycle() // Polls population totals regularly and stores them in an SQL DB -- TLE
 

code/game/gamemodes/meteor/meteors.dm

@@ -163,51 +163,4 @@
 	if(istype(W, /obj/item/weapon/pickaxe))
 		del(src)
 		return
-	..()
-
-/*
-//Testing purposes only!
-/obj/item/weapon/meteorgun
-	name = "Meteor Gun"
-	desc = "This beast fires meteors!. TESTING PURPOSES ONLY, This gun is <b>incomplete</b>!"
-	icon = 'icons/obj/gun.dmi'
-	icon_state = "lasercannon"
-	item_state = "gun"
-
-/obj/item/weapon/meteorgun/attack_self()
-	var/start_x = usr.loc.x
-	var/start_y = usr.loc.y
-	var/start_z = usr.loc.z
-	var/end_x = 0
-	var/end_y = 0
-	var/end_z = 0
-
-	switch(usr.dir)
-		if(NORTH)
-			end_x = start_x
-			end_y = world.maxy-TRANSITIONEDGE
-		if(SOUTH)
-			end_x = start_x
-			end_y = TRANSITIONEDGE
-		if(EAST)
-			end_x = world.maxx-TRANSITIONEDGE
-			end_y = start_y
-		if(WEST)
-			end_x = TRANSITIONEDGE
-			end_y = start_y
-		else //north
-			end_x = start_x
-			end_y = TRANSITIONEDGE
-	end_z = start_z
-
-	var/start = locate(start_x, start_y, start_z)
-	var/end = locate(end_x, end_y, end_z)
-	var/obj/effect/meteor/M = new /obj/effect/meteor(start)
-
-	M.dest = end
-
-	spawn(0)
-		walk_towards(M, M.dest, 1)
-
-	return
-*/
+	..()

code/game/jobs/access.dm

@@ -87,6 +87,7 @@
 /obj/var/req_one_access_txt = "0"
 
 /obj/New()
+	..()
 	//NOTE: If a room requires more than one access (IE: Morgue + medbay) set the req_acesss_txt to "5;6" if it requires 5 and 6
 	if(src.req_access_txt)
 		var/list/req_access_str = dd_text2list(req_access_txt,";")
@@ -106,7 +107,7 @@
 			if(n)
 				req_one_access += n
 
-	..()
+
 
 //returns 1 if this mob has sufficient access to use this object
 /obj/proc/allowed(mob/M)

code/game/landmarks.dm

@@ -4,62 +4,63 @@
 	tag = text("landmark*[]", name)
 	invisibility = 101
 
-	if (name == "shuttle")
-		shuttle_z = z
-		del(src)
+	switch(name)			//some of these are probably obsolete
+		if("shuttle")
+			shuttle_z = z
+			del(src)
 
-	if (name == "airtunnel_stop")
-		airtunnel_stop = x
+		if("airtunnel_stop")
+			airtunnel_stop = x
 
-	if (name == "airtunnel_start")
-		airtunnel_start = x
+		if("airtunnel_start")
+			airtunnel_start = x
 
-	if (name == "airtunnel_bottom")
-		airtunnel_bottom = y
+		if("airtunnel_bottom")
+			airtunnel_bottom = y
 
-	if (name == "monkey")
-		monkeystart += loc
-		del(src)
-	if (name == "start")
-		newplayer_start += loc
-		del(src)
+		if("monkey")
+			monkeystart += loc
+			del(src)
+		if("start")
+			newplayer_start += loc
+			del(src)
 
-	if (name == "wizard")
-		wizardstart += loc
-		del(src)
+		if("wizard")
+			wizardstart += loc
+			del(src)
 
-	if (name == "JoinLate")
-		latejoin += loc
-		del(src)
+		if("JoinLate")
+			latejoin += loc
+			del(src)
 
-	//prisoners
-	if (name == "prisonwarp")
-		prisonwarp += loc
-		del(src)
-//	if (name == "mazewarp")
-//		mazewarp += loc
-	if (name == "Holding Facility")
-		holdingfacility += loc
-	if (name == "tdome1")
-		tdome1	+= loc
-	if (name == "tdome2")
-		tdome2 += loc
-	if (name == "tdomeadmin")
-		tdomeadmin	+= loc
-	if (name == "tdomeobserve")
-		tdomeobserve += loc
-	//not prisoners
-	if (name == "prisonsecuritywarp")
-		prisonsecuritywarp += loc
-		del(src)
+		//prisoners
+		if("prisonwarp")
+			prisonwarp += loc
+			del(src)
+	//	if("mazewarp")
+	//		mazewarp += loc
+		if("Holding Facility")
+			holdingfacility += loc
+		if("tdome1")
+			tdome1	+= loc
+		if("tdome2")
+			tdome2 += loc
+		if("tdomeadmin")
+			tdomeadmin	+= loc
+		if("tdomeobserve")
+			tdomeobserve += loc
+		//not prisoners
+		if("prisonsecuritywarp")
+			prisonsecuritywarp += loc
+			del(src)
 
-	if (name == "blobstart")
-		blobstart += loc
-		del(src)
+		if("blobstart")
+			blobstart += loc
+			del(src)
 
-	if(name == "xeno_spawn")
-		xeno_spawn += loc
-		del(src)
+		if("xeno_spawn")
+			xeno_spawn += loc
+			del(src)
 
 	return 1
 

code/game/machinery/OpTable.dm

@@ -108,7 +108,7 @@
 /obj/machinery/optable/process()
 	check_victim()
 
-/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/user as mob)
+/obj/machinery/optable/attackby(obj/item/weapon/W as obj, mob/living/carbon/user as mob)
 
 	if (istype(W, /obj/item/weapon/grab))
 		if(ismob(W:affecting))

code/game/machinery/bots/bots.dm

@@ -3,12 +3,15 @@
 /obj/machinery/bot
 	icon = 'icons/obj/aibots.dmi'
 	layer = MOB_LAYER
+	luminosity = 2
 	var/obj/item/weapon/card/id/botcard			// the ID card that the bot "holds"
 	var/on = 1
 	var/health = 0 //do not forget to set health for your bot!
 	var/maxhealth = 0
 	var/fire_dam_coeff = 1.0
 	var/brute_dam_coeff = 1.0
+	var/open = 0//Maint panel
+	var/locked = 1
 	//var/emagged = 0 //Urist: Moving that var to the general /bot tree as it's used by most bots
 
 
@@ -29,7 +32,12 @@
 		src.explode()
 
 /obj/machinery/bot/proc/Emag(mob/user as mob)
-	if(!emagged) emagged = 1
+	if(locked)
+		locked = 0
+		emagged = 1
+		user << "<span class='warning'>You bypass [src]'s controls.</span>"
+	if(!locked && open)
+		emagged = 2
 
 /obj/machinery/bot/examine()
 	set src in view()
@@ -70,16 +78,20 @@
 
 
 /obj/machinery/bot/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	if (istype(W, /obj/item/weapon/screwdriver))
-		if (src.health < maxhealth)
-			src.health = min(maxhealth, src.health+25)
-			user.visible_message(
-				"\red [user] repairs [src]!",
-				"\blue You repair [src]!"
-			)
+	if(istype(W, /obj/item/weapon/screwdriver))
+		if(!locked)
+			open = !open
+			user << "<span class='notice'>Maintenance panel is now [src.open ? "opened" : "closed"].</span>"
+	else if(istype(W, /obj/item/weapon/weldingtool))
+		if(health < maxhealth)
+			if(open)
+				health = min(maxhealth, health+10)
+				user.visible_message("\red [user] repairs [src]!","\blue You repair [src]!")
+			else
+				user << "<span class='notice'>Unable to repair with the maintenance panel closed.</span>"
 		else
 			user << "<span class='notice'>[src] does not need a repair.</span>"
-	else if (istype(W, /obj/item/weapon/card/emag) && !emagged)
+	else if (istype(W, /obj/item/weapon/card/emag) && emagged < 2)
 		Emag(user)
 	else
 		switch(W.damtype)

code/game/machinery/bots/cleanbot.dm

@@ -26,11 +26,9 @@
 	health = 25
 	maxhealth = 25
 	var/cleaning = 0
-	var/locked = 1
 	var/screwloose = 0
 	var/oddbutton = 0
 	var/blood = 1
-	var/panelopen = 0
 	var/list/target_types = list()
 	var/obj/effect/decal/cleanable/target
 	var/obj/effect/decal/cleanable/oldtarget
@@ -86,13 +84,14 @@
 	dat += text({"
 <TT><B>Automatic Station Cleaner v1.0</B></TT><BR><BR>
 Status: []<BR>
-Behaviour controls are [src.locked ? "locked" : "unlocked"]"},
+Behaviour controls are [src.locked ? "locked" : "unlocked"]<BR>
+Maintenance panel panel is [src.open ? "opened" : "closed"]"},
 text("<A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A>"))
 	if(!src.locked)
 		dat += text({"<BR>Cleans Blood: []<BR>"}, text("<A href='?src=\ref[src];operation=blood'>[src.blood ? "Yes" : "No"]</A>"))
 		dat += text({"<BR>Patrol station: []<BR>"}, text("<A href='?src=\ref[src];operation=patrol'>[src.should_patrol ? "Yes" : "No"]</A>"))
 	//	dat += text({"<BR>Beacon frequency: []<BR>"}, text("<A href='?src=\ref[src];operation=freq'>[src.beacon_freq]</A>"))
-	if(src.panelopen && !src.locked)
+	if(src.open && !src.locked)
 		dat += text({"
 Odd looking screw twiddled: []<BR>
 Weird button pressed: []"},
@@ -138,25 +137,25 @@ text("<A href='?src=\ref[src];operation=oddbutton'>[src.oddbutton ? "Yes" : "No"
 
 /obj/machinery/bot/cleanbot/attackby(obj/item/weapon/W, mob/user as mob)
 	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if(src.allowed(usr))
+		if(src.allowed(usr) && !open && !emagged)
 			src.locked = !src.locked
 			user << "<span class='notice'>You [ src.locked ? "lock" : "unlock"] the [src] behaviour controls.</span>"
 		else
-			user << "<span class='notice'>This [src] doesn't seem to respect your authority.</span>"
-	else if (istype(W, /obj/item/weapon/screwdriver))
-		if(!src.locked)
-			src.panelopen = !src.panelopen
-			user << "<span class='notice'>You [ src.panelopen ? "open" : "close"] the hidden panel on [src].</span>"
+			if(emagged)
+				user << "<span class='warning'>ERROR</span>"
+			if(open)
+				user << "<span class='warning'>Please close the access panel before locking it.</span>"
+			else
+				user << "<span class='notice'>This [src] doesn't seem to respect your authority.</span>"
 	else
 		return ..()
 
 /obj/machinery/bot/cleanbot/Emag(mob/user as mob)
 	..()
-	if(user) user << "<span class='notice'>The [src] buzzes and beeps.</span>"
-	src.oddbutton = 1
-	src.screwloose = 1
-	src.panelopen = 0
-	src.locked = 1
+	if(open && !locked)
+		if(user) user << "<span class='notice'>The [src] buzzes and beeps.</span>"
+		src.oddbutton = 1
+		src.screwloose = 1
 
 /obj/machinery/bot/cleanbot/process()
 	set background = 1

code/game/machinery/bots/ed209bot.dm

@@ -20,7 +20,6 @@
 
 	//var/lasers = 0
 
-	var/locked = 1 //Behavior Controls lock
 	var/mob/living/carbon/target
 	var/oldtarget_name
 	var/threatlevel = 0
@@ -124,7 +123,8 @@
 	dat += text({"
 <TT><B>Automatic Security Unit v2.5</B></TT><BR><BR>
 Status: []<BR>
-Behaviour controls are [src.locked ? "locked" : "unlocked"]"},
+Behaviour controls are [src.locked ? "locked" : "unlocked"]<BR>
+Maintenance panel panel is [src.open ? "opened" : "closed"]"},
 
 "<A href='?src=\ref[src];power=1'>[src.on ? "On" : "Off"]</A>" )
 
@@ -186,11 +186,16 @@ Auto Patrol: []"},
 
 /obj/machinery/bot/ed209/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (src.allowed(user))
+		if (src.allowed(user) && !open && !emagged)
 			src.locked = !src.locked
 			user << "<span class='notice'>Controls are now [src.locked ? "locked" : "unlocked"].</span>"
 		else
-			user << "<span class='warning'>Access denied.</span>"
+			if(emagged)
+				user << "<span class='warning'>ERROR</span>"
+			if(open)
+				user << "<span class='warning'>Please close the access panel before locking it.</span>"
+			else
+				user << "<span class='notice'>Access denied.</span>"
 	else
 		..()
 		if (!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target))
@@ -201,19 +206,20 @@ Auto Patrol: []"},
 
 /obj/machinery/bot/ed209/Emag(mob/user as mob)
 	..()
-	if(user) user << "<span class='warning'>You short out [src]'s target assessment circuits.</span>"
-	spawn(0)
-		for(var/mob/O in hearers(src, null))
-			O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
-	src.target = null
-	if(user) src.oldtarget_name = user.name
-	src.last_found = world.time
-	src.anchored = 0
-	src.emagged = 1
-	src.on = 1
-	src.icon_state = "[lasercolor]ed209[src.on]"
-	src.projectile = null
-	mode = SECBOT_IDLE
+	if(open && !locked)
+		if(user) user << "<span class='warning'>You short out [src]'s target assessment circuits.</span>"
+		spawn(0)
+			for(var/mob/O in hearers(src, null))
+				O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
+		src.target = null
+		if(user) src.oldtarget_name = user.name
+		src.last_found = world.time
+		src.anchored = 0
+		src.emagged = 2
+		src.on = 1
+		src.icon_state = "[lasercolor]ed209[src.on]"
+		src.projectile = null
+		mode = SECBOT_IDLE
 
 /obj/machinery/bot/ed209/process()
 	set background = 1
@@ -654,7 +660,7 @@ Auto Patrol: []"},
 /obj/machinery/bot/ed209/proc/assess_perp(mob/living/carbon/human/perp as mob)
 	var/threatcount = 0
 
-	if(src.emagged) return 10 //Everyone is a criminal!
+	if(src.emagged == 2) return 10 //Everyone is a criminal!
 
 	if((src.idcheck) || (isnull(perp:wear_id)) || (istype(perp:wear_id, /obj/item/weapon/card/id/syndicate)))
 
@@ -814,17 +820,17 @@ Auto Patrol: []"},
 
 	if(!projectile)
 		if(!lasercolor)
-			if (src.emagged)
+			if (src.emagged == 2)
 				projectile = /obj/item/projectile/beam
 			else
 				projectile = /obj/item/projectile/energy/electrode
 		else if(lasercolor == "b")
-			if (src.emagged)
+			if (src.emagged == 2)
 				projectile = /obj/item/projectile/omnitag
 			else
 				projectile = /obj/item/projectile/bluetag
 		else if(lasercolor == "r")
-			if (src.emagged)
+			if (src.emagged == 2)
 				projectile = /obj/item/projectile/omnitag
 			else
 				projectile = /obj/item/projectile/redtag
@@ -871,8 +877,8 @@ Auto Patrol: []"},
 				var/mob/toshoot = pick(targets)
 				if (toshoot)
 					targets-=toshoot
-					if (prob(50) && !emagged)
-						emagged = 1
+					if (prob(50) && emagged < 2)
+						emagged = 2
 						shootAt(toshoot)
 						emagged = 0
 					else

code/game/machinery/bots/floorbot.dm

@@ -42,7 +42,6 @@
 	var/improvefloors = 0
 	var/eattiles = 0
 	var/maketiles = 0
-	var/locked = 1
 	var/turf/target
 	var/turf/oldtarget
 	var/oldloc = null
@@ -80,6 +79,7 @@
 	var/dat
 	dat += "<TT><B>Automatic Station Floor Repairer v1.0</B></TT><BR><BR>"
 	dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>"
+	dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]<BR>"
 	dat += "Tiles left: [src.amount]<BR>"
 	dat += "Behvaiour controls are [src.locked ? "locked" : "unlocked"]<BR>"
 	if(!src.locked)
@@ -109,15 +109,24 @@
 		user << "<span class='notice'>You load [loaded] tiles into the floorbot. He now contains [src.amount] tiles.</span>"
 		src.updateicon()
 	else if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if(src.allowed(usr))
+		if(src.allowed(usr) && !open && !emagged)
 			src.locked = !src.locked
 			user << "<span class='notice'>You [src.locked ? "lock" : "unlock"] the [src] behaviour controls.</span>"
 		else
-			user << "<span class='notice'>The [src] doesn't seem to respect your authority.</span>"
+			if(emagged)
+				user << "<span class='warning'>ERROR</span>"
+			if(open)
+				user << "<span class='warning'>Please close the access panel before locking it.</span>"
+			else
+				user << "<span class='warning'>Access denied.</span>"
 		src.updateUsrDialog()
 	else
 		..()
 
+/obj/machinery/bot/floorbot/Emag(mob/user as mob)
+	..()
+	if(open && !locked)
+		if(user) user << "<span class='notice'>The [src] buzzes and beeps.</span>"
 
 /obj/machinery/bot/floorbot/Topic(href, href_list)
 	if(..())
@@ -184,7 +193,7 @@
 		for(var/mob/O in viewers(src, null))
 			O.show_message(text("[src] makes an excited booping beeping sound!"), 1)
 
-	if(!src.target || src.target == null)
+	if((!src.target || src.target == null) && emagged < 2)
 		if(targetdirection != null)
 			/*
 			for (var/turf/space/D in view(7,src))
@@ -217,6 +226,14 @@
 					src.target = T
 					break
 
+	if((!src.target || src.target == null) && emagged == 2)
+		if(!src.target || src.target == null)
+			for (var/turf/simulated/floor/D in view(7,src))
+				if(!(D in floorbottargets) && D != src.oldtarget && D.floor_tile)
+					src.oldtarget = D
+					src.target = D
+					break
+
 	if(!src.target || src.target == null)
 		if(src.loc != src.oldloc)
 			src.oldtarget = null
@@ -245,8 +262,23 @@
 			src.eattile(src.target)
 		else if(istype(src.target, /obj/item/stack/sheet/metal))
 			src.maketile(src.target)
-		else if(istype(src.target, /turf/))
+		else if(istype(src.target, /turf/) && emagged < 2)
 			repair(src.target)
+		else if(emagged == 2 && istype(src.target,/turf/simulated/floor))
+			var/turf/simulated/floor/F = src.target
+			src.anchored = 1
+			src.repairing = 1
+			if(prob(90))
+				F.break_tile_to_plating()
+			else
+				F.ReplaceWithLattice()
+			for(var/mob/O in viewers(src, null))
+				O.show_message(text("\red [src] makes an excited booping sound."), 1)
+			spawn(50)
+				src.amount ++
+				src.anchored = 0
+				src.repairing = 0
+				src.target = null
 		src.path = new()
 		return
 
@@ -348,8 +380,15 @@
 	if (prob(50))
 		new /obj/item/robot_parts/l_arm(Tsec)
 
-	if (amount)
-		new /obj/item/stack/tile/plasteel(Tsec) // only one tile, yes
+	while (amount)//Dumps the tiles into the appropriate sized stacks
+		if(amount >= 16)
+			var/obj/item/stack/tile/plasteel/T = new (Tsec)
+			T.amount = 16
+			amount -= 16
+		else
+			var/obj/item/stack/tile/plasteel/T = new (Tsec)
+			T.amount = src.amount
+			amount = 0
 
 	var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
 	s.set_up(3, 1, src)

code/game/machinery/bots/medbot.dm

@@ -15,7 +15,6 @@
 	maxhealth = 20
 	req_access =list(access_medical)
 	var/stunned = 0 //It can be stunned by tasers. Delicate circuits.
-	var/locked = 1
 //var/emagged = 0
 	var/obj/machinery/camera/cam = null
 	var/list/botcard_access = list(access_medical, access_morgue, access_genetics, access_robotics)
@@ -106,6 +105,7 @@
 	var/dat
 	dat += "<TT><B>Automatic Medical Unit v1.0</B></TT><BR><BR>"
 	dat += "Status: <A href='?src=\ref[src];power=1'>[src.on ? "On" : "Off"]</A><BR>"
+	dat += "Maintenance panel panel is [src.open ? "opened" : "closed"]<BR>"
 	dat += "Beaker: "
 	if (src.reagent_glass)
 		dat += "<A href='?src=\ref[src];eject=1'>Loaded \[[src.reagent_glass.reagents.total_volume]/[src.reagent_glass.reagents.maximum_volume]\]</a>"
@@ -181,12 +181,17 @@
 
 /obj/machinery/bot/medbot/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if (istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if (src.allowed(user))
+		if (src.allowed(user) && !open && !emagged)
 			src.locked = !src.locked
 			user << "<span class='notice'>Controls are now [src.locked ? "locked." : "unlocked."]</span>"
 			src.updateUsrDialog()
 		else
-			user << "<span class='warning'>Access denied.</span>"
+			if(emagged)
+				user << "<span class='warning'>ERROR</span>"
+			if(open)
+				user << "<span class='warning'>Please close the access panel before locking it.</span>"
+			else
+				user << "<span class='warning'>Access denied.</span>"
 
 	else if (istype(W, /obj/item/weapon/reagent_containers/glass))
 		if(src.locked)
@@ -210,19 +215,20 @@
 
 /obj/machinery/bot/medbot/Emag(mob/user as mob)
 	..()
-	if(user) user << "<span class='warning'>You short out [src]'s reagent synthesis circuits.</span>"
-	spawn(0)
-		for(var/mob/O in hearers(src, null))
-			O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
-	flick("medibot_spark", src)
-	src.patient = null
-	if(user) src.oldpatient = user
-	src.currently_healing = 0
-	src.last_found = world.time
-	src.anchored = 0
-	src.emagged = 1
-	src.on = 1
-	src.icon_state = "medibot[src.on]"
+	if(open && !locked)
+		if(user) user << "<span class='warning'>You short out [src]'s reagent synthesis circuits.</span>"
+		spawn(0)
+			for(var/mob/O in hearers(src, null))
+				O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
+		flick("medibot_spark", src)
+		src.patient = null
+		if(user) src.oldpatient = user
+		src.currently_healing = 0
+		src.last_found = world.time
+		src.anchored = 0
+		src.emagged = 2
+		src.on = 1
+		src.icon_state = "medibot[src.on]"
 
 /obj/machinery/bot/medbot/process()
 	set background = 1
@@ -322,7 +328,7 @@
 	if(C.suiciding)
 		return 0 //Kevorkian school of robotic medical assistants.
 
-	if(src.emagged) //Everyone needs our medicine. (Our medicine is toxins)
+	if(src.emagged == 2) //Everyone needs our medicine. (Our medicine is toxins)
 		return 1
 
 	//If they're injured, we're using a beaker, and don't have one of our WONDERCHEMS.
@@ -380,7 +386,7 @@
 	if((src.use_beaker) && (src.reagent_glass) && (src.reagent_glass.reagents.total_volume))
 		reagent_id = "internal_beaker"
 
-	if(src.emagged) //Emagged! Time to poison everybody.
+	if(src.emagged == 2) //Emagged! Time to poison everybody.
 		reagent_id = "toxin"
 
 	var/virus = 0

code/game/machinery/bots/mulebot.dm

@@ -17,9 +17,7 @@
 	maxhealth = 150
 	fire_dam_coeff = 0.7
 	brute_dam_coeff = 0.5
-	var/locked = 1
 	var/atom/movable/load = null		// the loaded crate (usually)
-
 	var/beacon_freq = 1400
 	var/control_freq = 1447
 
@@ -49,7 +47,6 @@
 	var/auto_return = 1	// true if auto return to home beacon after unload
 	var/auto_pickup = 1 // true if auto-pickup at beacon
 
-	var/open = 0		// true if maint hatch is open
 	var/obj/item/weapon/cell/cell
 						// the installed power cell
 

code/game/machinery/bots/secbot.dm

@@ -12,7 +12,6 @@
 	brute_dam_coeff = 0.5
 //	weight = 1.0E7
 	req_access = list(access_security)
-	var/locked = 1 //Behavior Controls lock
 	var/mob/living/carbon/target
 	var/oldtarget_name
 	var/threatlevel = 0
@@ -114,7 +113,8 @@
 	dat += text({"
 <TT><B>Automatic Security Unit v1.3</B></TT><BR><BR>
 Status: []<BR>
-Behaviour controls are [src.locked ? "locked" : "unlocked"]"},
+Behaviour controls are [src.locked ? "locked" : "unlocked"]<BR>
+Maintenance panel panel is [src.open ? "opened" : "closed"]"},
 
 "<A href='?src=\ref[src];power=1'>[src.on ? "On" : "Off"]</A>" )
 
@@ -162,11 +162,16 @@ Auto Patrol: []"},
 
 /obj/machinery/bot/secbot/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/weapon/card/id)||istype(W, /obj/item/device/pda))
-		if(src.allowed(user))
+		if(src.allowed(user) && !open && !emagged)
 			src.locked = !src.locked
 			user << "Controls are now [src.locked ? "locked." : "unlocked."]"
 		else
-			user << "\red Access denied."
+			if(emagged)
+				user << "<span class='warning'>ERROR</span>"
+			if(open)
+				user << "\red Please close the access panel before locking it."
+			else
+				user << "\red Access denied."
 	else
 		..()
 		if(!istype(W, /obj/item/weapon/screwdriver) && (W.force) && (!src.target))
@@ -174,18 +179,20 @@ Auto Patrol: []"},
 			src.mode = SECBOT_HUNT
 
 /obj/machinery/bot/secbot/Emag(mob/user as mob)
-	if(user) user << "\red You short out [src]'s target assessment circuits."
-	spawn(0)
-		for(var/mob/O in hearers(src, null))
-			O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
-	src.target = null
-	if(user) src.oldtarget_name = user.name
-	src.last_found = world.time
-	src.anchored = 0
-	src.emagged = 1
-	src.on = 1
-	src.icon_state = "secbot[src.on]"
-	mode = SECBOT_IDLE
+	..()
+	if(open && !locked)
+		if(user) user << "\red You short out [src]'s target assessment circuits."
+		spawn(0)
+			for(var/mob/O in hearers(src, null))
+				O.show_message("\red <B>[src] buzzes oddly!</B>", 1)
+		src.target = null
+		if(user) src.oldtarget_name = user.name
+		src.last_found = world.time
+		src.anchored = 0
+		src.emagged = 2
+		src.on = 1
+		src.icon_state = "secbot[src.on]"
+		mode = SECBOT_IDLE
 
 /obj/machinery/bot/secbot/process()
 	set background = 1
@@ -586,7 +593,7 @@ Auto Patrol: []"},
 /obj/machinery/bot/secbot/proc/assess_perp(mob/living/carbon/human/perp as mob)
 	var/threatcount = 0
 
-	if(src.emagged) return 10 //Everyone is a criminal!
+	if(src.emagged == 2) return 10 //Everyone is a criminal!
 
 	if(src.idcheck && !src.allowed(perp))
 

code/game/machinery/camera.dm

@@ -1,39 +1,3 @@
-var/global/list/obj/machinery/camera/Cameras = list()
-
-/obj/machinery/camera/New()
-	Cameras += src
-	..()
-
-/obj/machinery/camera/Del()
-	Cameras -= src
-	..()
-
-
-// Double clicking turfs to move to nearest camera
-
-/turf/proc/move_camera_by_click()
-	if (usr.stat)
-		return ..()
-	if (world.time <= usr:lastDblClick+2)
-		return ..()
-
-	//try to find the closest working camera in the same area, switch to it
-	var/area/A = get_area(src)
-	var/best_dist = INFINITY //infinity
-	var/best_cam = null
-	for(var/obj/machinery/camera/C in A)
-		if(usr:network != C.network)	continue
-		if(!C.status)	continue	//	ignore disabled cameras
-		var/dist = get_dist(src, C)
-		if(dist < best_dist)
-			best_dist = dist
-			best_cam = C
-
-	if(!best_cam)
-		return ..()
-	usr:lastDblClick = world.time
-	usr:switchCamera(best_cam)
-
 /mob/living/silicon/ai/proc/ai_camera_list()
 	set category = "AI Commands"
 	set name = "Show Camera List"
@@ -55,26 +19,36 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	var/list/namecounts = list()
 	var/list/humans = list()
 	var/list/others = list()
+
 	for(var/mob/living/M in mob_list)
-		//Cameras can't track people wearing an agent card or a ninja hood.
-		var/human = 0
-		if(istype(M, /mob/living/carbon/human))
-			human = 1
-			if(istype(M:wear_id, /obj/item/weapon/card/id/syndicate))
-				continue
-		 	if(istype(M:head, /obj/item/clothing/head/helmet/space/space_ninja)&&!M:head:canremove)
-		 		continue
-		if(!istype(M.loc, /turf)) //in a closet or something, AI can't see him anyways
-			continue
-		if(istype(M.loc.loc, /area/wizard_station))
-			continue
-		if(M.invisibility)//cloaked
+		// Easy checks first.
+		// Don't detect mobs on Centcom. Since the wizard den is on Centcomm, we only need this.
+		if(M.loc.z == 2)
 			continue
 		if(M == usr)
 			continue
+		if(M.invisibility)//cloaked
+			continue
 		if(M.digitalcamo)
 			continue
-		if(M.loc.z == 2) // Don't detect mobs on Centcom
+
+		// Human check
+		var/human = 0
+		if(istype(M, /mob/living/carbon/human))
+			human = 1
+			var/mob/living/carbon/human/H = M
+			//Cameras can't track people wearing an agent card or a ninja hood.
+			if(istype(H.wear_id, /obj/item/weapon/card/id/syndicate))
+				continue
+		 	if(istype(H.head, /obj/item/clothing/head/helmet/space/space_ninja))
+		 		var/obj/item/clothing/head/helmet/space/space_ninja/hood = H.head
+	 			if(!hood.canremove)
+	 				continue
+
+	 	if(!isturf(M.loc))
+	 		continue
+		 // Now, are they viewable by a camera? (This is last because it's the most intensive check)
+		if(!cameranet.checkCameraVis(M))
 			continue
 
 		var/name = M.name
@@ -104,20 +78,21 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	var/mob/living/silicon/ai/U = usr
 
 	U.cameraFollow = target
-	U << text("Now tracking [] on camera.", target.name)
-	if (U.machine == null)
-		U.machine = U
+	//U << text("Now tracking [] on camera.", target.name)
+	//if (U.machine == null)
+	//	U.machine = U
+	U << "Now tracking [target.name] on camera."
 
 	spawn (0)
 		while (U.cameraFollow == target)
 			if (U.cameraFollow == null)
 				return
-			else if (istype(target, /mob/living/carbon/human))
+			if (istype(target, /mob/living/carbon/human))
 				if(istype(target:wear_id, /obj/item/weapon/card/id/syndicate))
 					U << "Follow camera mode terminated."
 					U.cameraFollow = null
 					return
-		 		if(istype(target:head, /obj/item/clothing/head/helmet/space/space_ninja)&&!target:head:canremove)
+		 		if(istype(target:head, /obj/item/clothing/head/helmet/space/space_ninja) && !target:head:canremove)
 		 			U << "Follow camera mode terminated."
 					U.cameraFollow = null
 					return
@@ -126,53 +101,20 @@ var/global/list/obj/machinery/camera/Cameras = list()
 					U.cameraFollow = null
 					return
 
-			else if(istype(target.loc,/obj/effect/dummy))
+			if(istype(target.loc,/obj/effect/dummy))
 				U << "Follow camera mode ended."
 				U.cameraFollow = null
 				return
-			else if (!target || !istype(target.loc, /turf)) //in a closet
+			if (!isturf(target.loc)) //in a closet
 				U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
-				sleep(40) //because we're sleeping another second after this (a few lines down)
+				sleep(50) //because we're sleeping another second after this (a few lines down)
+				continue
+			if(!cameranet.checkCameraVis(target))
+				U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
+				sleep(50) //because we're sleeping another second after this (a few lines down)
 				continue
 
-			var/obj/machinery/camera/C = U.current
-			if ((C && istype(C, /obj/machinery/camera)) || C==null)
-
-				if(isrobot(target))
-					var/mob/living/silicon/robot/R = target
-					C = R.camera
-					U.reset_view(C)
-				else
-					var/closestDist = -1
-					if (C!=null)
-						if (C.status)
-							closestDist = get_dist(C, target)
-					//U << text("Dist = [] for camera []", closestDist, C.name)
-					var/zmatched = 0
-					if (closestDist > 7 || closestDist == -1)
-						//check other cameras
-						var/obj/machinery/camera/closest = C
-						for(var/obj/machinery/camera/C2 in Cameras)
-							if (C2.network == src.network)
-								if (C2.z == target.z)
-									zmatched = 1
-									if (C2.status)
-										var/dist = get_dist(C2, target)
-										if ((dist < closestDist) || (closestDist == -1))
-											closestDist = dist
-											closest = C2
-						//U << text("Closest camera dist = [], for camera []", closestDist, closest.area.name)
-
-						if (closest != C)
-							U.reset_view(closest)
-							//use_power(50)
-						if (zmatched == 0)
-							U << "Target is not on or near any active cameras on the station. We'll check again in 5 seconds (unless you use the cancel-camera verb)."
-							sleep(40) //because we're sleeping another second after this (a few lines down)
-			else
-				U << "Follow camera mode ended."
-				U.cameraFollow = null
-
+			U.eyeobj.setLoc(get_turf(target))
 			sleep(10)
 
 /proc/camera_sort(list/L)
@@ -191,7 +133,6 @@ var/global/list/obj/machinery/camera/Cameras = list()
 					L.Swap(j, j + 1)
 	return L
 
-
 /mob/living/silicon/ai/attack_ai(var/mob/user as mob)
 	if (user != src)
 		return
@@ -199,13 +140,8 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	if (stat == 2)
 		return
 
-	// If they cancel then just put them back to their old camera
-	var/obj/machinery/camera/tempC = src.current
-	user.machine = src
-	switchCamera(null)
-
 	var/list/L = list()
-	for (var/obj/machinery/camera/C in Cameras)
+	for (var/obj/machinery/camera/C in cameranet.cameras)
 		L.Add(C)
 
 	camera_sort(L)
@@ -214,19 +150,15 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	D["Cancel"] = "Cancel"
 	for (var/obj/machinery/camera/C in L)
 		if (C.network == src.network)
-			D[text("[][]", C.c_tag, (C.status ? null : " (Deactivated)"))] = C
+			D[text("[][]", C.c_tag, (C.can_use() ? null : " (Deactivated)"))] = C
 
 	var/t = input(user, "Which camera should you change to?") as null|anything in D
 
 	if (!t || t == "Cancel")
-		if(tempC && tempC.status)
-			switchCamera(tempC)
-		else
-			switchCamera(null)
 		return 0
 
 	var/obj/machinery/camera/C = D[t]
-	switchCamera(C)
+	src.eyeobj.setLoc(C)
 
 	return
 
@@ -234,13 +166,15 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	if(prob(100/(hardened + severity)))
 		icon_state = "cameraemp"
 		network = null                   //Not the best way but it will do. I think.
+		cameranet.removeCamera(src)
+		stat |= EMPED
+		SetLuminosity(0)
 		spawn(900)
 			network = initial(network)
 			icon_state = initial(icon_state)
-		for(var/mob/living/silicon/ai/O in mob_list)
-			if (O.current == src)
-				O.cancel_camera()
-				O << "Your connection to the camera has been lost."
+			stat &= ~EMPED
+			if(can_use())
+				cameranet.addCamera(src)
 		for(var/mob/O in mob_list)
 			if (istype(O.machine, /obj/machinery/computer/security))
 				var/obj/machinery/computer/security/S = O.machine
@@ -266,9 +200,9 @@ var/global/list/obj/machinery/camera/Cameras = list()
 /obj/machinery/camera/attack_ai(var/mob/living/silicon/ai/user as mob)
 	if (!istype(user))
 		return
-	if (src.network != user.network || !(src.status))
+	if (!src.can_use())
 		return
-	user.reset_view(src)
+	user.eyeobj.setLoc(get_turf(src))
 
 /obj/machinery/camera/attack_paw(mob/living/carbon/alien/humanoid/user as mob)
 	if(!istype(user))
@@ -329,7 +263,7 @@ var/global/list/obj/machinery/camera/Cameras = list()
 					case.motion = 1
 				del(src)
 	else if (istype(W, /obj/item/weapon/camera_bug))
-		if (!src.status)
+		if (!src.can_use())
 			user << "\blue Camera non-functional"
 			return
 		if (src.bugged)
@@ -381,10 +315,6 @@ var/global/list/obj/machinery/camera/Cameras = list()
 	// now disconnect anyone using the camera
 	//Apparently, this will disconnect anyone even if the camera was re-activated.
 	//I guess that doesn't matter since they can't use it anyway?
-	for(var/mob/living/silicon/ai/O in player_list)
-		if (O.current == src)
-			O.cancel_camera()
-			O << "Your connection to the camera has been lost."
 	for(var/mob/O in player_list)
 		if (istype(O.machine, /obj/machinery/computer/security))
 			var/obj/machinery/computer/security/S = O.machine
@@ -393,6 +323,13 @@ var/global/list/obj/machinery/camera/Cameras = list()
 				O.reset_view(null)
 				O << "The screen bursts into static."
 
+/obj/machinery/camera/proc/can_use()
+	if(!status)
+		return 0
+	if(stat & EMPED)
+		return 0
+	return 1
+
 /atom/proc/auto_turn()
 	//Automatically turns based on nearby walls.
 	var/turf/simulated/wall/T = null
@@ -414,10 +351,17 @@ var/global/list/obj/machinery/camera/Cameras = list()
 //Return a working camera that can see a given mob
 //or null if none
 /proc/seen_by_camera(var/mob/M)
+	for(var/obj/machinery/camera/C in oview(4, M))
+		if(C.can_use())	// check if camera disabled
+			return C
+			break
+	return null
 
-	for(var/obj/machinery/camera/C in oview(M))
-		if(C.status)	// check if camera disabled
+/proc/near_range_camera(var/mob/M)
+
+	for(var/obj/machinery/camera/C in range(4, M))
+		if(C.can_use())	// check if camera disabled
 			return C
 			break
 
-	return null
+	return null

code/game/machinery/computer/camera.dm

@@ -30,10 +30,11 @@
 	attack_hand(var/mob/user as mob)
 		if(stat & (NOPOWER|BROKEN))	return
 
-		user.machine = src
+		if(!isAI(user))
+			user.machine = src
 
 		var/list/L = list()
-		for (var/obj/machinery/camera/C in Cameras)
+		for (var/obj/machinery/camera/C in cameranet.cameras)
 			L.Add(C)
 
 		camera_sort(L)
@@ -56,14 +57,20 @@
 			return 0
 
 		if(C)
-			if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.status )) && (!istype(user, /mob/living/silicon/ai)))
-				if(!C.status)
+			if ((get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) || !( C.can_use() )) && (!istype(user, /mob/living/silicon/ai)))
+				if(!C.can_use() && !isAI(user))
 					src.current = null
 				return 0
 			else
-				src.current = C
-				use_power(50)
-				spawn( 5 )
+				if(isAI(user))
+					var/mob/living/silicon/ai/A = user
+					A.eyeobj.setLoc(get_turf(C))
+					A.client.eye = A.eyeobj
+				else
+					src.current = C
+					use_power(50)
+
+				spawn(5)
 					attack_hand(user)
 		return
 
@@ -78,6 +85,15 @@
 	density = 0
 	circuit = null
 
+/obj/machinery/computer/security/telescreen/entertainment
+	name = "entertainment monitor"
+	desc = "Damn, they better have /tg/thechannel on these things."
+	icon = 'icons/obj/status_display.dmi'
+	icon_state = "entertainment"
+	network = "thunder"
+	density = 0
+	circuit = null
+
 
 /obj/machinery/computer/security/wooden_tv
 	name = "Security Cameras"

code/game/machinery/cryo.dm

@@ -1,14 +1,13 @@
 /obj/machinery/atmospherics/unary/cryo_cell
 	name = "cryo cell"
-	icon = 'icons/obj/Cryogenic2.dmi'
-	icon_state = "celltop-P"
+	icon = 'icons/obj/cryogenics.dmi'
+	icon_state = "cell-off"
 	density = 1
 	anchored = 1.0
 	layer = 5
 
 	var/on = 0
 	var/temperature_archived
-	var/obj/effect/overlay/O1 = null
 	var/mob/living/carbon/occupant = null
 	var/beaker = null
 	var/next_trans = 0
@@ -17,263 +16,247 @@
 
 
 
-	New()
-		..()
-		build_icon()
-		initialize_directions = dir
+/obj/machinery/atmospherics/unary/cryo_cell/New()
+	..()
+	initialize_directions = dir
 
-	initialize()
-		if(node) return
-		var/node_connect = dir
-		for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
-			if(target.initialize_directions & get_dir(target,src))
-				node = target
-				break
+/obj/machinery/atmospherics/unary/cryo_cell/initialize()
+	if(node) return
+	var/node_connect = dir
+	for(var/obj/machinery/atmospherics/target in get_step(src,node_connect))
+		if(target.initialize_directions & get_dir(target,src))
+			node = target
+			break
 
-	process()
-		..()
-		if(!node)
-			return
-		if(!on)
-			src.updateUsrDialog()
-			return
-
-		if(src.occupant)
-			if(occupant.stat != 2)
-				process_occupant()
-
-		if(air_contents)
-			temperature_archived = air_contents.temperature
-			heat_gas_contents()
-			expel_gas()
-
-		if(abs(temperature_archived-air_contents.temperature) > 1)
-			network.update = 1
-
-		src.updateUsrDialog()
-		return 1
-
-
-	allow_drop()
-		return 0
-
-
-	relaymove(mob/user as mob)
-		if(user.stat)
-			return
-		src.go_out()
+/obj/machinery/atmospherics/unary/cryo_cell/process()
+	..()
+	if(!node)
+		return
+	if(!on)
+		updateUsrDialog()
 		return
 
-	attack_hand(mob/user as mob)
-		user.machine = src
-		var/beaker_text = ""
-		var/health_text = ""
-		var/temp_text = ""
-		if(src.occupant)
-			if(src.occupant.health <= -100)
-				health_text = "<FONT color=red>Dead</FONT>"
-			else if(src.occupant.health < 0)
-				health_text = "<FONT color=red>[round(src.occupant.health,0.1)]</FONT>"
-			else
-				health_text = "[round(src.occupant.health,0.1)]"
-		if(air_contents.temperature > T0C)
-			temp_text = "<FONT color=red>[air_contents.temperature]</FONT>"
-		else if(air_contents.temperature > 225)
-			temp_text = "<FONT color=black>[air_contents.temperature]</FONT>"
-		else
-			temp_text = "<FONT color=blue>[air_contents.temperature]</FONT>"
-		if(src.beaker)
-			beaker_text = "<B>Beaker:</B> <A href='?src=\ref[src];eject=1'>Eject</A>"
-		else
-			beaker_text = "<B>Beaker:</B> <FONT color=red>No beaker loaded</FONT>"
-		var/dat = {"<B>Cryo cell control system</B><BR>
-			<B>Current cell temperature:</B> [temp_text]K<BR>
-			<B>Cryo status:</B> [ src.on ? "<A href='?src=\ref[src];start=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];start=1'>On</A>"]<BR>
-			[beaker_text]<BR><BR>
-			<B>Current occupant:</B> [src.occupant ? "<BR>Name: [src.occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(src.occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(src.occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(src.occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(src.occupant.getToxLoss(),0.1)]<BR>Body temperature: [src.occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
-
-		"}
-		user.machine = src
-		user << browse(dat, "window=cryo")
-		onclose(user, "cryo")
-
-	Topic(href, href_list)
-		if ((get_dist(src, usr) <= 1) || istype(usr, /mob/living/silicon/ai))
-			if(href_list["start"])
-				src.on = !src.on
-				build_icon()
-			if(href_list["eject"])
-				beaker:loc = src.loc
-				beaker = null
-
-			src.updateUsrDialog()
-			src.add_fingerprint(usr)
-			return
-
-	attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
-		if(istype(G, /obj/item/weapon/reagent_containers/glass))
-			if(src.beaker)
-				user << "\red A beaker is already loaded into the machine."
-				return
-
-			src.beaker =  G
-			user.drop_item()
-			G.loc = src
-			user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
-		else if(istype(G, /obj/item/weapon/grab))
-			if(!ismob(G:affecting))
-				return
-			for(var/mob/living/carbon/metroid/M in range(1,G:affecting))
-				if(M.Victim == G:affecting)
-					usr << "[G:affecting:name] will not fit into the cryo because they have a Metroid latched onto their head."
-					return
-			var/mob/M = G:affecting
-			if(put_mob(M))
-				del(G)
-		src.updateUsrDialog()
-		return
-
-	proc
-		add_overlays()
-			src.overlays = list(O1)
-
-		build_icon()
-			if(on)
-				if(src.occupant)
-					icon_state = "celltop_1"
-				else
-					icon_state = "celltop"
-			else
-				icon_state = "celltop-p"
-			O1 = new /obj/effect/overlay(  )
-			O1.icon = 'icons/obj/Cryogenic2.dmi'
-			if(src.node)
-				O1.icon_state = "cryo_bottom_[src.on]"
-			else
-				O1.icon_state = "cryo_bottom"
-			O1.pixel_y = -32.0
-			src.pixel_y = 32
-			add_overlays()
-
-		process_occupant()
-			if(air_contents.total_moles() < 10)
-				return
-			if(occupant)
-				if(occupant.stat == 2)
-					return
-				occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature)*current_heat_capacity/(current_heat_capacity + air_contents.heat_capacity())
-				occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise
-				occupant.stat = 1
-				if(occupant.bodytemperature < T0C)
-					occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000)
-					occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
-					if(air_contents.oxygen > 2)
-						if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1)
-					else
-						occupant.adjustOxyLoss(-1)
-					//severe damage should heal waaay slower without proper chemicals
-					if(occupant.bodytemperature < 225)
-						if (occupant.getToxLoss())
-							occupant.adjustToxLoss(max(-1, -20/occupant.getToxLoss()))
-						var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
-						var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
-						occupant.heal_organ_damage(heal_brute,heal_fire)
-				if(beaker && (next_trans == 0))
-					beaker:reagents.trans_to(occupant, 1, 10)
-					beaker:reagents.reaction(occupant)
-			next_trans++
-			if(next_trans == 10)
-				next_trans = 0
+	if(occupant)
+		if(occupant.stat != 2)
+			process_occupant()
 
+	if(air_contents)
+		temperature_archived = air_contents.temperature
 		heat_gas_contents()
-			if(air_contents.total_moles() < 1)
-				return
-			var/air_heat_capacity = air_contents.heat_capacity()
-			var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
-			if(combined_heat_capacity > 0)
-				var/combined_energy = T20C*current_heat_capacity + air_heat_capacity*air_contents.temperature
-				air_contents.temperature = combined_energy/combined_heat_capacity
-
 		expel_gas()
-			if(air_contents.total_moles() < 1)
-				return
-			var/datum/gas_mixture/expel_gas = new
-			var/remove_amount = air_contents.total_moles()/100
-			expel_gas = air_contents.remove(remove_amount)
-			expel_gas.temperature = T20C // Lets expel hot gas and see if that helps people not die as they are removed
-			loc.assume_air(expel_gas)
 
-		go_out()
-			if(!( src.occupant ))
-				return
-			//for(var/obj/O in src)
-			//	O.loc = src.loc
-			if (src.occupant.client)
-				src.occupant.client.eye = src.occupant.client.mob
-				src.occupant.client.perspective = MOB_PERSPECTIVE
-			src.occupant.loc = src.loc
-//			src.occupant.metabslow = 0
-			src.occupant = null
-			build_icon()
+	if(abs(temperature_archived-air_contents.temperature) > 1)
+		network.update = 1
+
+	updateUsrDialog()
+	return 1
+
+
+/obj/machinery/atmospherics/unary/cryo_cell/allow_drop()
+	return 0
+
+
+/obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/user as mob)
+	if(user.stat)
+		return
+	go_out()
+	return
+
+/obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user as mob)
+	user.machine = src
+	var/beaker_text = ""
+	var/health_text = ""
+	var/temp_text = ""
+	if(occupant)
+		if(occupant.health <= -100)
+			health_text = "<FONT color=red>Dead</FONT>"
+		else if(occupant.health < 0)
+			health_text = "<FONT color=red>[round(occupant.health,0.1)]</FONT>"
+		else
+			health_text = "[round(occupant.health,0.1)]"
+	if(air_contents.temperature > T0C)
+		temp_text = "<FONT color=red>[air_contents.temperature]</FONT>"
+	else if(air_contents.temperature > 225)
+		temp_text = "<FONT color=black>[air_contents.temperature]</FONT>"
+	else
+		temp_text = "<FONT color=blue>[air_contents.temperature]</FONT>"
+	if(beaker)
+		beaker_text = "<B>Beaker:</B> <A href='?src=\ref[src];eject=1'>Eject</A>"
+	else
+		beaker_text = "<B>Beaker:</B> <FONT color=red>No beaker loaded</FONT>"
+	var/dat = {"<B>Cryo cell control system</B><BR>
+		<B>Current cell temperature:</B> [temp_text]K<BR>
+		<B>Cryo status:</B> [ on ? "<A href='?src=\ref[src];start=1'>Off</A> <B>On</B>" : "<B>Off</B> <A href='?src=\ref[src];start=1'>On</A>"]<BR>
+		[beaker_text]<BR><BR>
+		<B>Current occupant:</B> [occupant ? "<BR>Name: [occupant]<BR>Health: [health_text]<BR>Oxygen deprivation: [round(occupant.getOxyLoss(),0.1)]<BR>Brute damage: [round(occupant.getBruteLoss(),0.1)]<BR>Fire damage: [round(occupant.getFireLoss(),0.1)]<BR>Toxin damage: [round(occupant.getToxLoss(),0.1)]<BR>Body temperature: [occupant.bodytemperature]" : "<FONT color=red>None</FONT>"]<BR>
+		"}
+	user.machine = src
+	user << browse(dat, "window=cryo")
+	onclose(user, "cryo")
+
+/obj/machinery/atmospherics/unary/cryo_cell/Topic(href, href_list)
+	if ((get_dist(src, usr) <= 1) || istype(usr, /mob/living/silicon/ai))
+		if(href_list["start"])
+			on = !on
+			update_icon()
+		if(href_list["eject"])
+			beaker:loc = loc
+			beaker = null
+
+		updateUsrDialog()
+		add_fingerprint(usr)
+		return
+
+/obj/machinery/atmospherics/unary/cryo_cell/attackby(var/obj/item/weapon/G as obj, var/mob/user as mob)
+	if(istype(G, /obj/item/weapon/reagent_containers/glass))
+		if(beaker)
+			user << "\red A beaker is already loaded into the machine."
 			return
-		put_mob(mob/living/carbon/M as mob)
-			if (!istype(M))
-				usr << "\red <B>The cryo cell cannot handle such liveform!</B>"
-				return
-			if (src.occupant)
-				usr << "\red <B>The cryo cell is already occupied!</B>"
-				return
-			if (M.abiotic())
-				usr << "\red Subject may not have abiotic items on."
-				return
-			if(!src.node)
-				usr << "\red The cell is not correctly connected to its pipe network!"
-				return
-			if (M.client)
-				M.client.perspective = EYE_PERSPECTIVE
-				M.client.eye = src
-			M.stop_pulling()
-			M.loc = src
-			if(M.health > -100 && (M.health < 0 || M.sleeping))
-				M << "\blue <b>You feel a cold liquid surround you. Your skin starts to freeze up.</b>"
-			src.occupant = M
-//			M.metabslow = 1
-			src.add_fingerprint(usr)
-			build_icon()
-			return 1
 
-	verb
-		move_eject()
-			set name = "Eject occupant"
-			set category = "Object"
-			set src in oview(1)
-			if(usr == src.occupant)//If the user is inside the tube...
-				if (usr.stat == 2)//and he's not dead....
-					return
-				usr << "\blue Release sequence activated. This will take two minutes."
-				sleep(1200)
-				if(!src || !usr || !src.occupant || (src.occupant != usr)) //Check if someone's released/replaced/bombed him already
-					return
-				src.go_out()//and release him from the eternal prison.
+		beaker =  G
+		user.drop_item()
+		G.loc = src
+		user.visible_message("[user] adds \a [G] to \the [src]!", "You add \a [G] to \the [src]!")
+	else if(istype(G, /obj/item/weapon/grab))
+		if(!ismob(G:affecting))
+			return
+		for(var/mob/living/carbon/metroid/M in range(1,G:affecting))
+			if(M.Victim == G:affecting)
+				usr << "[G:affecting:name] will not fit into the cryo because they have a Metroid latched onto their head."
+				return
+		var/mob/M = G:affecting
+		if(put_mob(M))
+			del(G)
+	updateUsrDialog()
+	return
+
+/obj/machinery/atmospherics/unary/cryo_cell/update_icon()
+	if(on)
+		if(occupant)
+			icon_state = "cell-occupied"
+			return
+		icon_state = "cell-on"
+		return
+	icon_state = "cell-off"
+
+/obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant()
+	if(air_contents.total_moles() < 10)
+		return
+	if(occupant)
+		if(occupant.stat == 2)
+			return
+		occupant.bodytemperature += 2*(air_contents.temperature - occupant.bodytemperature)*current_heat_capacity/(current_heat_capacity + air_contents.heat_capacity())
+		occupant.bodytemperature = max(occupant.bodytemperature, air_contents.temperature) // this is so ugly i'm sorry for doing it i'll fix it later i promise
+		occupant.stat = 1
+		if(occupant.bodytemperature < T0C)
+			occupant.sleeping = max(5, (1/occupant.bodytemperature)*2000)
+			occupant.Paralyse(max(5, (1/occupant.bodytemperature)*3000))
+			if(air_contents.oxygen > 2)
+				if(occupant.getOxyLoss()) occupant.adjustOxyLoss(-1)
 			else
-				if (usr.stat != 0)
-					return
-				src.go_out()
-			add_fingerprint(usr)
-			return
+				occupant.adjustOxyLoss(-1)
+			//severe damage should heal waaay slower without proper chemicals
+			if(occupant.bodytemperature < 225)
+				if (occupant.getToxLoss())
+					occupant.adjustToxLoss(max(-1, -20/occupant.getToxLoss()))
+				var/heal_brute = occupant.getBruteLoss() ? min(1, 20/occupant.getBruteLoss()) : 0
+				var/heal_fire = occupant.getFireLoss() ? min(1, 20/occupant.getFireLoss()) : 0
+				occupant.heal_organ_damage(heal_brute,heal_fire)
+		if(beaker && (next_trans == 0))
+			beaker:reagents.trans_to(occupant, 1, 10)
+			beaker:reagents.reaction(occupant)
+	next_trans++
+	if(next_trans == 10)
+		next_trans = 0
 
-		move_inside()
-			set name = "Move Inside"
-			set category = "Object"
-			set src in oview(1)
-			for(var/mob/living/carbon/metroid/M in range(1,usr))
-				if(M.Victim == usr)
-					usr << "You're too busy getting your life sucked out of you."
-					return
-			if (usr.stat != 0 || stat & (NOPOWER|BROKEN))
-				return
-			put_mob(usr)
+/obj/machinery/atmospherics/unary/cryo_cell/proc/heat_gas_contents()
+	if(air_contents.total_moles() < 1)
+		return
+	var/air_heat_capacity = air_contents.heat_capacity()
+	var/combined_heat_capacity = current_heat_capacity + air_heat_capacity
+	if(combined_heat_capacity > 0)
+		var/combined_energy = T20C*current_heat_capacity + air_heat_capacity*air_contents.temperature
+		air_contents.temperature = combined_energy/combined_heat_capacity
+
+/obj/machinery/atmospherics/unary/cryo_cell/proc/expel_gas()
+	if(air_contents.total_moles() < 1)
+		return
+	var/datum/gas_mixture/expel_gas = new
+	var/remove_amount = air_contents.total_moles()/100
+	expel_gas = air_contents.remove(remove_amount)
+	expel_gas.temperature = T20C // Lets expel hot gas and see if that helps people not die as they are removed
+	loc.assume_air(expel_gas)
+
+/obj/machinery/atmospherics/unary/cryo_cell/proc/go_out()
+	if(!( occupant ))
+		return
+	//for(var/obj/O in src)
+	//	O.loc = loc
+	if (occupant.client)
+		occupant.client.eye = occupant.client.mob
+		occupant.client.perspective = MOB_PERSPECTIVE
+	occupant.loc = get_step(loc, SOUTH)	//this doesn't account for walls or anything, but i don't forsee that being a problem.
+//	occupant.metabslow = 0
+	occupant = null
+	update_icon()
+	return
+/obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/M as mob)
+	if (!istype(M))
+		usr << "\red <B>The cryo cell cannot handle such liveform!</B>"
+		return
+	if (occupant)
+		usr << "\red <B>The cryo cell is already occupied!</B>"
+		return
+	if (M.abiotic())
+		usr << "\red Subject may not have abiotic items on."
+		return
+	if(!node)
+		usr << "\red The cell is not correctly connected to its pipe network!"
+		return
+	if (M.client)
+		M.client.perspective = EYE_PERSPECTIVE
+		M.client.eye = src
+	M.stop_pulling()
+	M.loc = src
+	if(M.health > -100 && (M.health < 0 || M.sleeping))
+		M << "\blue <b>You feel a cold liquid surround you. Your skin starts to freeze up.</b>"
+	occupant = M
+//	M.metabslow = 1
+	add_fingerprint(usr)
+	update_icon()
+	return 1
+
+/obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject()
+	set name = "Eject occupant"
+	set category = "Object"
+	set src in oview(1)
+	if(usr == occupant)//If the user is inside the tube...
+		if (usr.stat == 2)//and he's not dead....
 			return
+		usr << "\blue Release sequence activated. This will take two minutes."
+		sleep(1200)
+		if(!src || !usr || !occupant || (occupant != usr)) //Check if someone's released/replaced/bombed him already
+			return
+		go_out()//and release him from the eternal prison.
+	else
+		if (usr.stat != 0)
+			return
+		go_out()
+	add_fingerprint(usr)
+	return
+
+/obj/machinery/atmospherics/unary/cryo_cell/verb/move_inside()
+	set name = "Move Inside"
+	set category = "Object"
+	set src in oview(1)
+	for(var/mob/living/carbon/metroid/M in range(1,usr))
+		if(M.Victim == usr)
+			usr << "You're too busy getting your life sucked out of you."
+			return
+	if (usr.stat != 0 || stat & (NOPOWER|BROKEN))
+		return
+	put_mob(usr)
+	return
 
 
 

code/game/machinery/doors/airlock.dm

@@ -9,6 +9,7 @@
 #define AIRLOCK_WIRE_ELECTRIFY 9
 #define AIRLOCK_WIRE_SAFETY 10
 #define AIRLOCK_WIRE_SPEED 11
+#define AIRLOCK_WIRE_LIGHT 12
 
 /*
 	New methods:
@@ -32,21 +33,26 @@
 //This generates the randomized airlock wire assignments for the game.
 /proc/RandomAirlockWires()
 	//to make this not randomize the wires, just set index to 1 and increment it in the flag for loop (after doing everything else).
-	var/list/wires = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-	airlockIndexToFlag = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-	airlockIndexToWireColor = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
-	airlockWireColorToIndex = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+	var/list/wires = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+	airlockIndexToFlag = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+	airlockIndexToWireColor = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
+	airlockWireColorToIndex = list(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)
 	var/flagIndex = 1
-	for (var/flag=1, flag<2048, flag+=flag)
+	for (var/flag=1, flag<4096, flag+=flag)
 		var/valid = 0
+		var/list/colorList = list(AIRLOCK_WIRE_IDSCAN, AIRLOCK_WIRE_MAIN_POWER1, AIRLOCK_WIRE_MAIN_POWER2, AIRLOCK_WIRE_DOOR_BOLTS,
+		AIRLOCK_WIRE_BACKUP_POWER1, AIRLOCK_WIRE_BACKUP_POWER2, AIRLOCK_WIRE_OPEN_DOOR, AIRLOCK_WIRE_AI_CONTROL, AIRLOCK_WIRE_ELECTRIFY,
+		AIRLOCK_WIRE_SAFETY, AIRLOCK_WIRE_SPEED, AIRLOCK_WIRE_LIGHT)
+
 		while (!valid)
-			var/colorIndex = rand(1, 11)
+			var/colorIndex = pick(colorList)
 			if(wires[colorIndex]==0)
 				valid = 1
 				wires[colorIndex] = flag
 				airlockIndexToFlag[flagIndex] = flag
 				airlockIndexToWireColor[flagIndex] = colorIndex
 				airlockWireColorToIndex[colorIndex] = flagIndex
+				colorList -= colorIndex
 		flagIndex+=1
 	return wires
 
@@ -69,13 +75,14 @@ Airlock index -> wire color are { 9, 4, 6, 7, 5, 8, 1, 2, 3 }.
 	var/spawnPowerRestoreRunning = 0
 	var/welded = null
 	var/locked = 0
-	var/wires = 2047
+	var/lights = 1 // bolt lights show by default
+	var/wires = 4095
 	secondsElectrified = 0 //How many seconds remain until the door is no longer electrified. -1 if it is permanently electrified until someone fixes it.
 	var/aiDisabledIdScanner = 0
 	var/aiHacking = 0
 	var/obj/machinery/door/airlock/closeOther = null
 	var/closeOtherId = null
-	var/list/signalers[11]
+	var/list/signalers[12]
 	var/lockdownbyai = 0
 	autoclose = 1
 	var/doortype = 0
@@ -436,6 +443,10 @@ About the new airlock wires panel:
 			normalspeed = !normalspeed
 			src.updateUsrDialog()
 
+		if(AIRLOCK_WIRE_LIGHT)
+			lights = !lights
+			src.updateUsrDialog()
+
 
 /obj/machinery/door/airlock/proc/cut(var/wireColor)
 	var/wireFlag = airlockWireColorToFlag[wireColor]
@@ -480,6 +491,10 @@ About the new airlock wires panel:
 			autoclose = 0
 			src.updateUsrDialog()
 
+		if(AIRLOCK_WIRE_LIGHT)
+			lights = 0
+			src.updateUsrDialog()
+
 /obj/machinery/door/airlock/proc/mend(var/wireColor)
 	var/wireFlag = airlockWireColorToFlag[wireColor]
 	var/wireIndex = airlockWireColorToIndex[wireColor] //not used in this function
@@ -517,6 +532,10 @@ About the new airlock wires panel:
 				close()
 			src.updateUsrDialog()
 
+		if(AIRLOCK_WIRE_LIGHT)
+			lights = 1
+			src.updateUsrDialog()
+
 
 /obj/machinery/door/airlock/proc/isElectrified()
 	if(src.secondsElectrified != 0)
@@ -613,7 +632,7 @@ About the new airlock wires panel:
 /obj/machinery/door/airlock/update_icon()
 	if(overlays) overlays = null
 	if(density)
-		if(locked)
+		if(locked && lights)
 			icon_state = "door_locked"
 		else
 			icon_state = "door_closed"
@@ -710,6 +729,14 @@ About the new airlock wires panel:
 			t1 += text(" <A href='?src=\ref[];aiEnable=4'>Raise?</a><br>\n", src)
 		else
 			t1 += text(" Cannot raise door bolts due to power failure.<br>\n")
+
+	if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
+		t1 += text("Door bolt lights wire is cut.<br>\n")
+	else if(!src.lights)
+		t1 += text("Door lights are off. <A href='?src=\ref[];aiEnable=10'>Enable?</a><br>\n", src)
+	else
+		t1 += text("Door lights are on. <A href='?src=\ref[];aiDisable=10'>Disable?</a><br>\n", src)
+
 	if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY))
 		t1 += text("Electrification wire is cut.<br>\n")
 	if(src.secondsElectrified==-1)
@@ -842,7 +869,8 @@ About the new airlock wires panel:
 			"Grey" = 8,
 			"Black" = 9,
 			"Gold" = 10,
-			"Aqua" = 11
+			"Aqua" = 11,
+			"Pink" = 12
 		)
 		for(var/wiredesc in wires)
 			var/is_uncut = src.wires & airlockWireColorToFlag[wires[wiredesc]]
@@ -858,7 +886,7 @@ About the new airlock wires panel:
 					t1 += "<a href='?src=\ref[src];signaler=[wires[wiredesc]]'>Attach signaler</a>"
 			t1 += "<br>"
 
-		t1 += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]", (src.locked ? "The door bolts have fallen!" : "The door bolts look up."), ((src.arePowerSystemsOn() && !(stat & NOPOWER)) ? "The test light is on." : "The test light is off!"), (src.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."),  (src.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."))
+		t1 += text("<br>\n[]<br>\n[]<br>\n[]<br>\n[]<br>\n[]", (src.locked ? "The door bolts have fallen!" : "The door bolts look up."), (src.lights ? "The door bolt lights are on." : "The door bolt lights are off!"), ((src.arePowerSystemsOn() && !(stat & NOPOWER)) ? "The test light is on." : "The test light is off!"), (src.aiControlDisabled==0 ? "The 'AI control allowed' light is on." : "The 'AI control allowed' light is off."),  (src.safe==0 ? "The 'Check Wiring' light is on." : "The 'Check Wiring' light is off."))
 
 		t1 += text("<p><a href='?src=\ref[];close=1'>Close</a></p>\n", src)
 
@@ -968,7 +996,7 @@ About the new airlock wires panel:
 				if(5)
 					//un-electrify door
 					if(src.isWireCut(AIRLOCK_WIRE_ELECTRIFY))
-						usr << text("Can't un-electrify the airlock - The electrification wire is cut.<br>\n")
+						usr << text("Can't un-electrify the airlock - The electrification wire is cut.")
 					else if(src.secondsElectrified==-1)
 						src.secondsElectrified = 0
 					else if(src.secondsElectrified>0)
@@ -977,18 +1005,18 @@ About the new airlock wires panel:
 				if(8)
 					// Safeties!  We don't need no stinking safeties!
 					if (src.isWireCut(AIRLOCK_WIRE_SAFETY))
-						usr << text("Control to door sensors is disabled.</a><br>\n")
+						usr << text("Control to door sensors is disabled.")
 					else if (src.safe)
 						safe = 0
 					else
-						usr << text("Firmware reports safeties already overriden.</a><br>\n")
+						usr << text("Firmware reports safeties already overriden.")
 
 
 
 				if(9)
 					// Door speed control
 					if(src.isWireCut(AIRLOCK_WIRE_SPEED))
-						usr << text("Control to door timing circuitry has been severed.</a><br>\n")
+						usr << text("Control to door timing circuitry has been severed.")
 					else if (src.normalspeed)
 						normalspeed = 0
 					else
@@ -997,13 +1025,22 @@ About the new airlock wires panel:
 				if(7)
 					//close door
 					if(src.welded)
-						usr << text("The airlock has been welded shut!<br>\n")
+						usr << text("The airlock has been welded shut!")
 					else if(src.locked)
-						usr << text("The door bolts are down!<br>\n")
+						usr << text("The door bolts are down!")
 					else if(!src.density)
 						close()
 					else
-						usr << text("The airlock is already closed.<br>\n")
+						open()
+
+				if(10)
+					// Bolt lights
+					if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
+						usr << text("Control to door bolt lights has been severed.</a>")
+					else if (src.lights)
+						lights = 0
+					else
+						usr << text("Door bolt lights are already disabled!")
 
 
 
@@ -1066,17 +1103,17 @@ About the new airlock wires panel:
 				if (8) // Not in order >.>
 					// Safeties!  Maybe we do need some stinking safeties!
 					if (src.isWireCut(AIRLOCK_WIRE_SAFETY))
-						usr << text("Control to door sensors is disabled.<br>\n")
+						usr << text("Control to door sensors is disabled.")
 					else if (!src.safe)
 						safe = 1
 						src.updateUsrDialog()
 					else
-						usr << text("Firmware reports safeties already in place.<br>\n")
+						usr << text("Firmware reports safeties already in place.")
 
 				if(9)
 					// Door speed control
 					if(src.isWireCut(AIRLOCK_WIRE_SPEED))
-						usr << text("Control to door timing circuitry has been severed.</a><br>\n")
+						usr << text("Control to door timing circuitry has been severed.")
 					else if (!src.normalspeed)
 						normalspeed = 1
 						src.updateUsrDialog()
@@ -1086,14 +1123,24 @@ About the new airlock wires panel:
 				if(7)
 					//open door
 					if(src.welded)
-						usr << text("The airlock has been welded shut!<br>\n")
+						usr << text("The airlock has been welded shut!")
 					else if(src.locked)
-						usr << text("The door bolts are down!<br>\n")
+						usr << text("The door bolts are down!")
 					else if(src.density)
 						open()
-	//					close()
 					else
-						usr << text("The airlock is already opened.<br>\n")
+						close()
+
+				if(10)
+					// Bolt lights
+					if(src.isWireCut(AIRLOCK_WIRE_LIGHT))
+						usr << text("Control to door bolt lights has been severed.</a>")
+					else if (!src.lights)
+						lights = 1
+						src.updateUsrDialog()
+					else
+						usr << text("Door bolt lights are already enabled!")
+
 	add_fingerprint(usr)
 	update_icon()
 	if(!nowindow)
@@ -1206,8 +1253,7 @@ About the new airlock wires panel:
 						src.density = 0
 						update_icon()
 
-						if(!glass)
-							src.sd_SetOpacity(0)
+						src.SetOpacity(0)	//ugh...lots of lag for something so trivial
 						src.operating = 0
 					return
 				user << "\red You need to be wielding the Fire axe to do that."
@@ -1223,8 +1269,7 @@ About the new airlock wires panel:
 					src.density = 0
 					update_icon()
 
-					if(!glass)
-						src.sd_SetOpacity(0)
+					src.SetOpacity(0)	//ugh...lots of lag for something so trivial
 					src.operating = 0
 					return
 
@@ -1242,8 +1287,7 @@ About the new airlock wires panel:
 							sleep(15)
 							update_icon()
 
-							if((src.visible) && (!glass))
-								src.sd_SetOpacity(1)
+							src.SetOpacity(initial(opacity))
 							src.operating = 0
 					else
 						user << "\red You need to be wielding the Fire axe to do that."
@@ -1257,8 +1301,7 @@ About the new airlock wires panel:
 						sleep(15)
 						update_icon()
 
-						if((src.visible) && (!glass))
-							src.sd_SetOpacity(1)
+						src.SetOpacity(initial(opacity))
 						src.operating = 0
 
 	else

code/game/machinery/doors/door.dm

@@ -204,12 +204,12 @@
 
 		animate("opening")
 		icon_state = "door0"
-		src.sd_SetOpacity(0)
+		src.SetOpacity(0)
 		sleep(10)
 		src.layer = 2.7
 		src.density = 0
 		update_icon()
-		src.sd_SetOpacity(0)
+//		src.SetOpacity(0)
 		update_nearby_tiles()
 
 		if(operating)	operating = 0
@@ -235,8 +235,7 @@
 		sleep(10)
 		update_icon()
 
-		if(visible && !glass)
-			src.sd_SetOpacity(1)
+		src.SetOpacity(initial(opacity))
 		operating = 0
 		update_nearby_tiles()
 		return
@@ -265,6 +264,8 @@
 		close()
 	return
 
+/obj/machinery/door/morgue
+	icon = 'icons/obj/doors/doormorgue.dmi'
 
 /*
 /obj/machinery/door/airlock/proc/ion_act()

code/game/machinery/doors/poddoor.dm

@@ -20,9 +20,9 @@
 			src.operating = 1
 			flick("pdoorc0", src)
 			src.icon_state = "pdoor0"
+			src.SetOpacity(0)
 			sleep(15)
 			src.density = 0
-			src.sd_SetOpacity(0)
 			src.operating = 0
 			return
 	return
@@ -36,9 +36,9 @@
 		src.operating = 1
 	flick("pdoorc0", src)
 	src.icon_state = "pdoor0"
+	src.SetOpacity(0)
 	sleep(10)
 	src.density = 0
-	src.sd_SetOpacity(0)
 	update_nearby_tiles()
 
 	if(operating == 1) //emag again
@@ -55,15 +55,14 @@
 	flick("pdoorc1", src)
 	src.icon_state = "pdoor1"
 	src.density = 1
-	if (src.visible)
-		src.sd_SetOpacity(1)
+	src.SetOpacity(initial(opacity))
 	update_nearby_tiles()
 
 	sleep(10)
 	src.operating = 0
 	return
 
-
+/*
 /obj/machinery/door/poddoor/two_tile_hor/open()
 	if (src.operating == 1) //doors can still open when emag-disabled
 		return
@@ -73,14 +72,14 @@
 		src.operating = 1
 	flick("pdoorc0", src)
 	src.icon_state = "pdoor0"
+	src.SetOpacity(0)
+	f1.SetOpacity(0)
+	f2.SetOpacity(0)
+
 	sleep(10)
 	src.density = 0
-	src.sd_SetOpacity(0)
-
 	f1.density = 0
-	f1.sd_SetOpacity(0)
 	f2.density = 0
-	f2.sd_SetOpacity(0)
 
 	update_nearby_tiles()
 
@@ -97,18 +96,18 @@
 	src.operating = 1
 	flick("pdoorc1", src)
 	src.icon_state = "pdoor1"
+
 	src.density = 1
-
 	f1.density = 1
-	f1.sd_SetOpacity(1)
 	f2.density = 1
-	f2.sd_SetOpacity(1)
-
-	if (src.visible)
-		src.sd_SetOpacity(1)
-	update_nearby_tiles()
 
 	sleep(10)
+	src.SetOpacity(initial(opacity))
+	f1.SetOpacity(initial(opacity))
+	f2.SetOpacity(initial(opacity))
+
+	update_nearby_tiles()
+
 	src.operating = 0
 	return
 
@@ -370,7 +369,7 @@
 		del f3
 		del f4
 		..()
-
+*/
 /obj/machinery/door/poddoor/filler_object
 	name = ""
 	icon_state = ""

code/game/machinery/doors/shutters.dm

@@ -11,15 +11,15 @@
 	src.add_fingerprint(user)
 	if (!( istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))
 		return
-	if ((src.density && (stat & NOPOWER) && !( src.operating )))
-		spawn( 0 )
-			src.operating = 1
+	if(src.density && (stat & NOPOWER) && !src.operating)
+		operating = 1
+		spawn(-1)
 			flick("shutterc0", src)
-			src.icon_state = "shutter0"
+			icon_state = "shutter0"
 			sleep(15)
-			src.density = 0
-			src.sd_SetOpacity(0)
-			src.operating = 0
+			density = 0
+			SetOpacity(0)
+			operating = 0
 			return
 	return
 
@@ -28,20 +28,20 @@
 		return
 	if (!ticker)
 		return 0
-	if(!src.operating) //in case of emag
-		src.operating = 1
+	if(!operating) //in case of emag
+		operating = 1
 	flick("shutterc0", src)
 	src.icon_state = "shutter0"
 	sleep(10)
 	src.density = 0
-	src.sd_SetOpacity(0)
+	SetOpacity(0)
 	update_nearby_tiles()
 
 	if(operating == 1) //emag again
-		src.operating = 0
+		operating = 0
 	if(autoclose)
 		spawn(150)
-			autoclose()
+			autoclose()		//TODO: note to self: look into this ~Carn
 	return 1
 
 /obj/machinery/door/poddoor/shutters/close()
@@ -51,8 +51,8 @@
 	flick("shutterc1", src)
 	src.icon_state = "shutter1"
 	src.density = 1
-	if (src.visible)
-		src.sd_SetOpacity(1)
+	if(src.visible)
+		SetOpacity(1)
 	update_nearby_tiles()
 
 	sleep(10)

code/game/machinery/doors/windowdoor.dm

@@ -94,7 +94,7 @@
 	sleep(10)
 
 	src.density = 0
-	src.sd_SetOpacity(0)
+//	src.sd_SetOpacity(0)	//TODO: why is this here? Opaque windoors? ~Carn
 	update_nearby_tiles()
 
 	if(operating == 1) //emag again
@@ -110,8 +110,8 @@
 	src.icon_state = text("[]", src.base_state)
 
 	src.density = 1
-	if (src.visible)
-		src.sd_SetOpacity(1)
+//	if(src.visible)
+//		SetOpacity(1)	//TODO: why is this here? Opaque windoors? ~Carn
 	update_nearby_tiles()
 
 	sleep(10)

code/game/machinery/flasher.dm

@@ -22,19 +22,20 @@
 	base_state = "pflash"
 	density = 1
 
+/*
 /obj/machinery/flasher/New()
-	sleep(4)
+	sleep(4)					//<--- What the fuck are you doing? D=
 	src.sd_SetLuminosity(2)
-
+*/
 /obj/machinery/flasher/power_change()
 	if ( powered() )
 		stat &= ~NOPOWER
 		icon_state = "[base_state]1"
-		src.sd_SetLuminosity(2)
+//		src.sd_SetLuminosity(2)
 	else
 		stat |= ~NOPOWER
 		icon_state = "[base_state]1-p"
-		src.sd_SetLuminosity(0)
+//		src.sd_SetLuminosity(0)
 
 //Don't want to render prison breaks impossible
 /obj/machinery/flasher/attackby(obj/item/weapon/W as obj, mob/user as mob)

code/game/machinery/hologram.dm

@@ -11,6 +11,7 @@ Possible to do for anyone motivated enough:
 	Give an AI variable for different hologram icons.
 	Itegrate EMP effect to disable the unit.
 */
+
 /obj/machinery/hologram/holopad/attack_hand(var/mob/living/carbon/human/user) //Carn: Hologram requests.
 	if(!istype(user))
 		return
@@ -31,9 +32,8 @@ Possible to do for anyone motivated enough:
 	/*There are pretty much only three ways to interact here.
 	I don't need to check for client since they're clicking on an object.
 	This may change in the future but for now will suffice.*/
-	if(user.client.eye!=src)//Set client eye on the object if it's not already.
-		user.current = src
-		user.reset_view(src)
+	if(user.eyeobj.loc != src.loc)//Set client eye on the object if it's not already.
+		user.eyeobj.setLoc(get_turf(src))
 	else if(!hologram)//If there is no hologram, possibly make one.
 		activate_holo(user)
 	else if(master==user)//If there is a hologram, remove it. But only if the user is the master. Otherwise do nothing.
@@ -41,7 +41,7 @@ Possible to do for anyone motivated enough:
 	return
 
 /obj/machinery/hologram/holopad/proc/activate_holo(mob/living/silicon/ai/user)
-	if(!(stat & NOPOWER)&&user.client.eye==src)//If the projector has power and client eye is on it.
+	if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it.
 		if(!hologram)//If there is not already a hologram.
 			create_holo(user)//Create one.
 			for(var/mob/M in viewers())
@@ -71,28 +71,31 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	hologram.icon = A.holo_icon
 	hologram.mouse_opacity = 0//So you can't click on it.
 	hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
-	hologram.sd_SetLuminosity(1)//To make it glowy.
 	hologram.anchored = 1//So space wind cannot drag it.
 	hologram.name = "AI hologram"//If someone decides to right click.
-	sd_SetLuminosity(1)//To make the pad glowy.
+	hologram.SetLuminosity(2)	//hologram lighting
+	SetLuminosity(2)			//pad lighting
 	icon_state = "holopad1"
+	A.current = src
 	master = A//AI is the master.
 	use_power = 2//Active power usage.
 	return 1
 
 /obj/machinery/hologram/holopad/proc/clear_holo()
-	hologram.sd_SetLuminosity(0)//Clear lighting.
+//	hologram.SetLuminosity(0)//Clear lighting.	//handled by the lighting controller when its ower is deleted
 	del(hologram)//Get rid of hologram.
+	if(master.current == src)
+		master.current = null
 	master = null//Null the master, since no-one is using it now.
-	sd_SetLuminosity(0)//Clear lighting for the parent.
+	SetLuminosity(0)			//pad lighting (hologram lighting will be handled automatically since its owner was deleted)
 	icon_state = "holopad0"
 	use_power = 1//Passive power usage.
 	return 1
 
 /obj/machinery/hologram/holopad/process()
 	if(hologram)//If there is a hologram.
-		if(master&&!master.stat&&master.client&&master.client.eye==src)//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
-			if( !(get_dist(src,hologram.loc)>3||stat & NOPOWER) )//If the hologram is not out of bounds and the machine has power.
+		if(master && !master.stat && master.client && master.eyeobj.loc == src.loc)//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
+			if(!(stat & NOPOWER))//If the  machine has power.
 				return 1
 		clear_holo()//If not, we want to get rid of the hologram.
 	return 1

code/game/machinery/hydroponics.dm

@@ -30,6 +30,18 @@
 			if(src.planted && src.myseed.yield < 2)
 				src.myseed.yield += 1
 
+/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	..()
+	if (istype(O, /obj/item/weapon/plantbag))
+		src.attack_hand(user)
+		var/obj/item/weapon/plantbag/S = O
+		for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
+			if (S.contents.len < S.capacity)
+				S.contents += G;
+			else
+				user << "\blue The plant bag is full."
+				return
+
 obj/machinery/hydroponics/process()
 
 	if(myseed && !(myseed in contents))
@@ -176,14 +188,11 @@ obj/machinery/hydroponics/proc/updateicon()
 		if(src.harvest)
 			overlays += image('icons/obj/hydroponics.dmi', icon_state="over_harvest3")
 
-	if(myseed)
-		if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom)) //revert luminosity to 0
-			sd_SetLuminosity(0)
-		else if(!luminosity && istype(myseed,/obj/item/seeds/glowshroom)) //update luminosity
-			sd_SetLuminosity(myseed.potency/10)
+	if(!luminosity)
+		if(istype(myseed,/obj/item/seeds/glowshroom))
+			SetLuminosity(round(myseed.potency/10))
 	else
-		if(luminosity)
-			sd_SetLuminosity(0)
+		SetLuminosity(0)
 	return
 
 
@@ -978,7 +987,6 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 	updateicon()
 
 ///////////////////////////////////////////////////////////////////////////////
-
 /obj/machinery/hydroponics/soil //Not actually hydroponics at all! Honk!
 	name = "soil"
 	icon = 'icons/obj/hydroponics.dmi'
@@ -1003,12 +1011,9 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
 			else
 				overlays += image('icons/obj/hydroponics.dmi', icon_state="[src.myseed.species]-grow[src.myseed.growthstages]")
 
-		if(myseed)
-			if(luminosity && !istype(myseed,/obj/item/seeds/glowshroom))
-				sd_SetLuminosity(0)
-			else if(!luminosity && istype(myseed,/obj/item/seeds/glowshroom))
-				sd_SetLuminosity(myseed.potency/10)
+		if(!luminosity)
+			if(istype(myseed,/obj/item/seeds/glowshroom))
+				SetLuminosity(round(myseed.potency/10))
 		else
-			if(luminosity)
-				sd_SetLuminosity(0)
+			SetLuminosity(0)
 		return

code/game/machinery/igniter.dm

@@ -53,11 +53,11 @@
 	if ( powered() && disable == 0 )
 		stat &= ~NOPOWER
 		icon_state = "[base_state]"
-		src.sd_SetLuminosity(2)
+//		src.sd_SetLuminosity(2)
 	else
 		stat |= ~NOPOWER
 		icon_state = "[base_state]-p"
-		src.sd_SetLuminosity(0)
+//		src.sd_SetLuminosity(0)
 
 /obj/machinery/sparker/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	if(istype(W, /obj/item/device/detective_scanner))

code/game/machinery/kitchen/smartfridge.dm

@@ -1,48 +1,3 @@
-
-/**********************Plant Bag**************************/
-
-/obj/item/weapon/plantbag
-	icon = 'icons/obj/hydroponics.dmi'
-	icon_state = "plantbag"
-	name = "Plant Bag"
-	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 50; //the number of plant pieces it can carry.
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 1
-
-/obj/item/weapon/plantbag/attack_self(mob/user as mob)
-	for (var/obj/item/weapon/reagent_containers/food/snacks/grown/O in contents)
-		contents -= O
-		O.loc = user.loc
-	user << "\blue You empty the plant bag."
-	return
-
-/obj/item/weapon/plantbag/verb/toggle_mode()
-	set name = "Switch Bagging Method"
-	set category = "Object"
-
-	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The bag now picks up all plants in a tile at once."
-		if(0)
-			usr << "The bag now picks up one plant at a time."
-
-
-/obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	..()
-	if (istype(O, /obj/item/weapon/plantbag))
-		src.attack_hand(user)
-		var/obj/item/weapon/plantbag/S = O
-		for (var/obj/item/weapon/reagent_containers/food/snacks/grown/G in locate(user.x,user.y,user.z))
-			if (S.contents.len < S.capacity)
-				S.contents += G;
-			else
-				user << "\blue The plant bag is full."
-				return
-
-
 /* SmartFridge.  Much todo
 */
 /obj/machinery/smartfridge

code/game/machinery/machinery.dm

@@ -184,7 +184,13 @@ Class Procs:
 	return 0
 
 /obj/machinery/attack_ai(mob/user as mob)
-	return src.attack_hand(user)
+	if(isrobot(user))
+		// For some reason attack_robot doesn't work
+		// This is to stop robots from using cameras to remotely control machines.
+		if(user.client && user.client.eye == user)
+			return src.attack_hand(user)
+	else
+		return src.attack_hand(user)
 
 /obj/machinery/attack_paw(mob/user as mob)
 	return src.attack_hand(user)

code/game/machinery/shieldgen.dm

@@ -570,6 +570,7 @@
 		anchored = 1
 		density = 1
 		unacidable = 1
+		luminosity = 3
 		var/needs_power = 0
 		var/active = 1
 //		var/power = 10
@@ -585,8 +586,6 @@
 	src.gen_secondary = B
 	if(A && B)
 		needs_power = 1
-	spawn(1)
-		src.sd_SetLuminosity(3)
 
 /obj/machinery/shieldwall/attack_hand(mob/user as mob)
 	return

code/game/machinery/status_display.dm

@@ -89,14 +89,14 @@
 		if(mode==4)		// supply shuttle timer
 			var/disp1
 			var/disp2
-			if(supply_shuttle_moving)
+			if(supply_shuttle.moving)
 				disp1 = "SPPLY"
 				disp2 = get_supply_shuttle_timer()
 				if(lentext(disp1) > 5)
 					disp1 = "**~**"
 
 			else
-				if(supply_shuttle_at_station)
+				if(supply_shuttle.at_station)
 					disp1 = "SPPLY"
 					disp2 = "STATN"
 				else
@@ -185,8 +185,8 @@
 		return ""
 
 	proc/get_supply_shuttle_timer()
-		if(supply_shuttle_moving)
-			var/timeleft = round((supply_shuttle_time - world.timeofday) / 10,1)
+		if(supply_shuttle.moving)
+			var/timeleft = round((supply_shuttle.eta_timeofday - world.timeofday) / 10,1)
 			return "[add_zero(num2text((timeleft / 60) % 60),2)]~[add_zero(num2text(timeleft % 60), 2)]"
 			// note ~ translates into a blinking :
 		return ""

code/game/machinery/telecomms/machine_interactions.dm

@@ -244,9 +244,9 @@
 	// Let's double check
 	if(!issilicon(user) && istype(user.get_active_hand(), /obj/item/device/multitool))
 		P = user.get_active_hand()
-	//else if(isAI(user))
-	//	var/mob/living/silicon/ai/U = user
-	//	P = U.aiMulti
+	else if(isAI(user))
+		var/mob/living/silicon/ai/U = user
+		P = U.aiMulti
 	else if(isrobot(user) && in_range(user, src))
 		if(istype(user.get_active_hand(), /obj/item/device/multitool))
 			P = user.get_active_hand()

code/game/machinery/telecomms/telecomunications.dm

@@ -210,7 +210,7 @@ var/global/list/obj/machinery/telecomms/telecomms_list = list()
 	if(prob(100/severity))
 		if(!(stat & EMPED))
 			stat |= EMPED
-			spawn(1200/severity)
+			spawn(1600/severity)
 				stat &= ~EMPED
 	..()
 

code/game/mecha/mecha.dm

@@ -944,14 +944,11 @@
 	set category = "Exosuit Interface"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
-		return
+	if(usr!=occupant)	return
 	lights = !lights
-	if(lights)
-		src.sd_SetLuminosity(src.luminosity + src.lights_power)
-	else
-		src.sd_SetLuminosity(src.luminosity - src.lights_power)
-	src.log_message("Toggled lights.")
+	if(lights)	SetLuminosity(luminosity + lights_power)
+	else		SetLuminosity(luminosity - lights_power)
+	log_message("Toggled lights.")
 	return
 
 

code/game/objects/devices/infra_sensor.dm

@@ -1,70 +0,0 @@
-/obj/item/device/infra_sensor/process()
-	if (src.passive)
-		for(var/obj/effect/beam/i_beam/I in range(2, src.loc))
-			I.left = 2
-		return 1
-
-	else
-		processing_objects.Remove(src)
-		return null
-
-/obj/item/device/infra_sensor/proc/burst()
-	for(var/obj/effect/beam/i_beam/I in range(src.loc))
-		I.left = 8
-/*	for(var/obj/item/device/infra/I in range(src.loc))ugh will have to fix this
-		I.visible = 1
-		spawn( 0 )
-			if ((I && I.first))
-				I.first.vis_spread(1)
-			return
-	for(var/obj/item/assembly/rad_infra/I in range(src.loc))
-		I.part2.visible = 1
-		spawn( 0 )
-			if ((I.part2 && I.part2.first))
-				I.part2.first.vis_spread(1)
-			return*/
-	return
-
-/obj/item/device/infra_sensor/attack_self(mob/user as mob)
-	user.machine = src
-	var/dat = text("<TT><B>Infrared Sensor</B><BR>\n<B>Passive Emitter</B>: []<BR>\n<B>Active Emitter</B>: <A href='?src=\ref[];active=0'>Burst Fire</A>\n</TT>", (src.passive ? text("<A href='?src=\ref[];passive=0'>On</A>", src) : text("<A href='?src=\ref[];passive=1'>Off</A>", src)), src)
-	user << browse(dat, "window=infra_sensor")
-	onclose(user, "infra_sensor")
-	return
-
-/obj/item/device/infra_sensor/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained())
-		return
-	if ((usr.contents.Find(src) || (usr.contents.Find(src.master) || ((get_dist(src, usr) <= 1) && istype(src.loc, /turf)))))
-		usr.machine = src
-		if (href_list["passive"])
-			src.passive = !( src.passive )
-			if(passive)
-				processing_objects.Add(src)
-		if (href_list["active"])
-			spawn( 0 )
-				src.burst()
-				return
-		if (!( src.master ))
-			if (istype(src.loc, /mob))
-				attack_self(src.loc)
-			else
-				for(var/mob/M in viewers(1, src))
-					if (M.client)
-						src.attack_self(M)
-		else
-			if (istype(src.master.loc, /mob))
-				src.attack_self(src.master.loc)
-			else
-				for(var/mob/M in viewers(1, src.master))
-					if (M.client)
-						src.attack_self(M)
-		src.add_fingerprint(usr)
-	else
-		usr << browse(null, "window=infra_sensor")
-		onclose(usr, "infra_sensor")
-		return
-	return
-
-

code/game/objects/devices/shields.dm

@@ -1,58 +0,0 @@
-/*/obj/item/device/shield I have not see this thing used in quite some time and it just clutters up some of the mob code, also I am fairly sure it makes you invis with the newer cloaking icons
-	name = "shield"
-	desc = "This is an item which is specially crafted to shield you. It is much like a visible version of the outdated cloaking device."
-	icon_state = "shield0"
-	var/active = 0.0
-	flags = FPRINT | TABLEPASS| CONDUCT
-	item_state = "electronic"
-	throwforce = 5.0
-	throw_speed = 1
-	throw_range = 5
-	w_class = 2.0
-
-
-/obj/item/device/shield/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
-		user << "\blue The shield is now active."
-		src.icon_state = "shield1"
-	else
-		user << "\blue The shield is now inactive."
-		src.icon_state = "shield0"
-	src.add_fingerprint(user)
-	return
-*/
-
-
-/obj/item/weapon/cloaking_device
-	name = "cloaking device"
-	desc = "Use this to become invisible to the human eyesocket."
-	icon = 'icons/obj/device.dmi'
-	icon_state = "shield0"
-	var/active = 0.0
-	flags = FPRINT | TABLEPASS| CONDUCT
-	item_state = "electronic"
-	throwforce = 10.0
-	throw_speed = 2
-	throw_range = 10
-	w_class = 2.0
-	origin_tech = "magnets=3;syndicate=4"
-
-
-/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
-	src.active = !( src.active )
-	if (src.active)
-		user << "\blue The cloaking device is now active."
-		src.icon_state = "shield1"
-	else
-		user << "\blue The cloaking device is now inactive."
-		src.icon_state = "shield0"
-	src.add_fingerprint(user)
-	return
-
-/obj/item/weapon/cloaking_device/emp_act(severity)
-	active = 0
-	icon_state = "shield0"
-	if(ismob(loc))
-		loc:update_icons()
-	..()

code/game/objects/effects/aliens.dm

@@ -175,6 +175,7 @@
 		icon_state = "weednode"
 		name = "purple sac"
 		desc = "Weird purple octopus-like thing."
+		luminosity = NODERANGE
 
 /obj/effect/alien/weeds/New()
 	..()
@@ -187,11 +188,6 @@
 			Life()
 	return
 
-/obj/effect/alien/weeds/node/New()
-	..()
-	sd_SetLuminosity(NODERANGE)
-	return
-
 /obj/effect/alien/weeds/proc/Life()
 	set background = 1
 	var/turf/U = get_turf(src)

code/game/objects/effects/decals/blood.dm

@@ -60,7 +60,5 @@
 
 	New()
 		..()
-		sd_SetLuminosity(1)
-
 		spawn(1200)		// 2 minutes
 			del(src)

code/game/objects/effects/decals/crayon.dm

@@ -0,0 +1,35 @@
+/obj/effect/decal/cleanable/crayon
+	name = "rune"
+	desc = "A rune drawn in crayon."
+	icon = 'icons/obj/rune.dmi'
+	layer = 2.1
+	anchored = 1
+
+
+	examine()
+		set src in view(2)
+		..()
+		return
+
+
+	New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
+		..()
+		loc = location
+
+		name = type
+		desc = "A [type] drawn in crayon."
+
+		switch(type)
+			if("rune")
+				type = "rune[rand(1,6)]"
+			if("graffiti")
+				type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
+
+		var/icon/mainOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]",2.1)
+		var/icon/shadeOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]s",2.1)
+
+		mainOverlay.Blend(main,ICON_ADD)
+		shadeOverlay.Blend(shade,ICON_ADD)
+
+		overlays += mainOverlay
+		overlays += shadeOverlay

code/game/objects/effects/effect_system.dm

@@ -936,7 +936,7 @@ steam.start() -- spawns the effect
 	icon = 'icons/effects/effects.dmi'
 	icon_state = "metalfoam"
 	density = 1
-	opacity = 0 	// changed in New()
+	opacity = 1 	// changed in New()
 	anchored = 1
 	name = "foamed metal"
 	desc = "A lightweight foamed metal wall."
@@ -945,11 +945,11 @@ steam.start() -- spawns the effect
 	New()
 		..()
 		update_nearby_tiles(1)
-		spawn(1)
-			sd_NewOpacity(1)
+
+
 
 	Del()
-		sd_NewOpacity(0)
+
 		density = 0
 		update_nearby_tiles(1)
 		..()

code/game/objects/effects/gibs.dm

@@ -62,41 +62,4 @@
 					if(directions.len)
 						gib.streak(directions)
 
-		del(src)
-
-/obj/effect/gibspawner
-	generic
-		gibtypes = list(/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/core)
-		gibamounts = list(2,2,1)
-
-		New()
-			gibdirections = list(list(WEST, NORTHWEST, SOUTHWEST, NORTH),list(EAST, NORTHEAST, SOUTHEAST, SOUTH), list())
-			..()
-
-	human
-		gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up,/obj/effect/decal/cleanable/blood/gibs/down,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/body,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/effect/decal/cleanable/blood/gibs/core)
-		gibamounts = list(1,1,1,1,1,1,1)
-
-		New()
-			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
-			gibamounts[6] = pick(0,1,2)
-			..()
-
-	xeno
-		gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs/up,/obj/effect/decal/cleanable/xenoblood/xgibs/down,/obj/effect/decal/cleanable/xenoblood/xgibs,/obj/effect/decal/cleanable/xenoblood/xgibs,/obj/effect/decal/cleanable/xenoblood/xgibs/body,/obj/effect/decal/cleanable/xenoblood/xgibs/limb,/obj/effect/decal/cleanable/xenoblood/xgibs/core)
-		gibamounts = list(1,1,1,1,1,1,1)
-
-		New()
-			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
-			gibamounts[6] = pick(0,1,2)
-			..()
-
-	robot
-		sparks = 1
-		gibtypes = list(/obj/effect/decal/cleanable/robot_debris/up,/obj/effect/decal/cleanable/robot_debris/down,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris/limb)
-		gibamounts = list(1,1,1,1,1,1)
-
-		New()
-			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs)
-			gibamounts[6] = pick(0,1,2)
-			..()
+		del(src)

code/game/objects/effects/glowshroom.dm

@@ -21,7 +21,7 @@
 	spreadChance = 0
 
 /obj/effect/glowshroom/New()
-	set background = 1
+
 	..()
 
 	dir = CalcDir()
@@ -40,11 +40,9 @@
 	else //if on the floor, glowshroom on-floor sprite
 		icon_state = "glowshroomf"
 
-	spawn(2) //allows the luminosity and spread rate to be affected by potency at the moment of creation
-		sd_SetLuminosity(potency/10)
-		spawn(delay)
-			if(src)
-				Spread()
+	spawn(delay)
+		SetLuminosity(round(potency/10))
+		Spread()
 
 /obj/effect/glowshroom/proc/Spread()
 	set background = 1

code/game/objects/effects/manifest.dm

@@ -0,0 +1,17 @@
+
+
+/obj/effect/manifest/New()
+
+	src.invisibility = 101
+	return
+
+/obj/effect/manifest/proc/manifest()
+	var/dat = "<B>Crew Manifest</B>:<BR>"
+	for(var/mob/living/carbon/human/M in mob_list)
+		dat += text("    <B>[]</B> -  []<BR>", M.name, M.get_assignment())
+	var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc )
+	P.info = dat
+	P.name = "paper- 'Crew Manifest'"
+	//SN src = null
+	del(src)
+	return

code/game/objects/effects/signs.dm

@@ -33,4 +33,183 @@
 
 /obj/effect/sign/blob_act()
 	del(src)
-	return
+	return
+
+
+/obj/effect/sign/map
+	desc = "A framed picture of the station."
+	name = "station map"
+	icon = 'icons/obj/decals.dmi'
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/map/left
+	icon_state = "map-left"
+
+/obj/effect/sign/map/right
+	icon_state = "map-right"
+
+/obj/effect/sign/securearea
+	desc = "A warning sign which reads 'SECURE AREA'. This obviously applies to a nun-Clown."
+	name = "SECURE AREA"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "securearea"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/biohazard
+	desc = "A warning sign which reads 'BIOHAZARD'"
+	name = "BIOHAZARD"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "bio"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/electricshock
+	desc = "A warning sign which reads 'HIGH VOLTAGE'"
+	name = "HIGH VOLTAGE"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "shock"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/examroom
+	desc = "A guidance sign which reads 'EXAM ROOM'"
+	name = "EXAM"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "examroom"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/vacuum
+	desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
+	name = "HARD VACUUM AHEAD"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "space"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/deathsposal
+	desc = "A warning sign which reads 'DISPOSAL LEADS TO SPACE'"
+	name = "DISPOSAL LEADS TO SPACE"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "deathsposal"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/pods
+	desc = "A warning sign which reads 'ESCAPE PODS'"
+	name = "ESCAPE PODS"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "pods"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/fire
+	desc = "A warning sign which reads 'DANGER: FIRE'"
+	name = "DANGER: FIRE"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "fire"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+
+/obj/effect/sign/nosmoking_1
+	desc = "A warning sign which reads 'NO SMOKING'"
+	name = "NO SMOKING"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "nosmoking"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+
+/obj/effect/sign/nosmoking_2
+	desc = "A warning sign which reads 'NO SMOKING'"
+	name = "NO SMOKING"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "nosmoking2"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/redcross
+	desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
+	name = "Med-Bay"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "redcross"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/goldenplaque
+	desc = "To be Robust is not an action or a way of life, but a mental state. Only those with the force of Will strong enough to act during a crisis, saving friend from foe, are truly Robust. Stay Robust my friends."
+	name = "The Most Robust Men Award for Robustness"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "goldenplaque"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/atmosplaque
+	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
+	name = "FEA Atmospherics Division"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "atmosplaque"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/maltesefalcon1         //The sign is 64x32, so it needs two tiles. ;3
+	desc = "The Maltese Falcon, Space Bar and Grill."
+	name = "The Maltese Falcon"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "maltesefalcon1"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/maltesefalcon2
+	desc = "The Maltese Falcon, Space Bar and Grill."
+	name = "The Maltese Falcon"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "maltesefalcon2"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/science//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
+	desc = "A warning sign which reads 'SCIENCE!'"
+	name = "SCIENCE!"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "science1"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/chemistry
+	desc = "A warning sign which reads 'CHEMISTY'"
+	name = "CHEMISTRY"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "chemistry1"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
+/obj/effect/sign/botany
+	desc = "A warning sign which reads 'HYDROPONICS'"
+	name = "HYDROPONICS"
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "hydro1"
+	anchored = 1.0
+	opacity = 0
+	density = 0

code/game/objects/effects/spawners/gibspawner.dm

@@ -0,0 +1,36 @@
+/obj/effect/gibspawner
+	generic
+		gibtypes = list(/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/core)
+		gibamounts = list(2,2,1)
+
+		New()
+			gibdirections = list(list(WEST, NORTHWEST, SOUTHWEST, NORTH),list(EAST, NORTHEAST, SOUTHEAST, SOUTH), list())
+			..()
+
+	human
+		gibtypes = list(/obj/effect/decal/cleanable/blood/gibs/up,/obj/effect/decal/cleanable/blood/gibs/down,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs,/obj/effect/decal/cleanable/blood/gibs/body,/obj/effect/decal/cleanable/blood/gibs/limb,/obj/effect/decal/cleanable/blood/gibs/core)
+		gibamounts = list(1,1,1,1,1,1,1)
+
+		New()
+			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
+			gibamounts[6] = pick(0,1,2)
+			..()
+
+	xeno
+		gibtypes = list(/obj/effect/decal/cleanable/xenoblood/xgibs/up,/obj/effect/decal/cleanable/xenoblood/xgibs/down,/obj/effect/decal/cleanable/xenoblood/xgibs,/obj/effect/decal/cleanable/xenoblood/xgibs,/obj/effect/decal/cleanable/xenoblood/xgibs/body,/obj/effect/decal/cleanable/xenoblood/xgibs/limb,/obj/effect/decal/cleanable/xenoblood/xgibs/core)
+		gibamounts = list(1,1,1,1,1,1,1)
+
+		New()
+			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs, list())
+			gibamounts[6] = pick(0,1,2)
+			..()
+
+	robot
+		sparks = 1
+		gibtypes = list(/obj/effect/decal/cleanable/robot_debris/up,/obj/effect/decal/cleanable/robot_debris/down,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris,/obj/effect/decal/cleanable/robot_debris/limb)
+		gibamounts = list(1,1,1,1,1,1)
+
+		New()
+			gibdirections = list(list(NORTH, NORTHEAST, NORTHWEST),list(SOUTH, SOUTHEAST, SOUTHWEST),list(WEST, NORTHWEST, SOUTHWEST),list(EAST, NORTHEAST, SOUTHEAST), alldirs, alldirs)
+			gibamounts[6] = pick(0,1,2)
+			..()

code/game/objects/explosion.dm

@@ -8,6 +8,7 @@
 
 
 proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
+	src = null
 	spawn(0)
 		var/start = world.timeofday
 		epicenter = get_turf(epicenter)
@@ -20,6 +21,10 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		playsound(epicenter, 'sound/effects/explosionfar.ogg', 100, 1, round(devastation_range*2,1) )
 		playsound(epicenter, "explosion", 100, 1, round(devastation_range,1) )
 
+
+		var/lighting_controller_was_processing = lighting_controller.processing	//Pause the lighting updates for a bit
+		lighting_controller.processing = 0
+		var/powernet_rebuild_was_deferred_already = defer_powernet_rebuild
 		if(defer_powernet_rebuild != 2)
 			defer_powernet_rebuild = 1
 
@@ -35,25 +40,26 @@ proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impa
 		for(var/turf/T in range(epicenter, max(devastation_range, heavy_impact_range, light_impact_range)))
 			var/dist = cheap_pythag(T.x - x0,T.y - y0)
 
-			if(dist < devastation_range)
-				dist = 1
-			else if(dist < heavy_impact_range)
-				dist = 2
-			else if(dist < light_impact_range)
-				dist = 3
-			else
-				continue
+			if(dist < devastation_range)		dist = 1
+			else if(dist < heavy_impact_range)	dist = 2
+			else if(dist < light_impact_range)	dist = 3
+			else								continue
 
 			T.ex_act(dist)
 			if(T)
-				for(var/atom/object in T.contents)
-					object.ex_act(dist)
-
-		if(defer_powernet_rebuild != 2)
-			defer_powernet_rebuild = 0
+				for(var/atom_movable in T.contents)
+					var/atom/movable/AM = atom_movable
+					AM.ex_act(dist)
 
 		//here util we get explosions to be less laggy, might help us identify issues after changes to splosions (because let's face it we've had a few)
-		world.log << "## Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [(world.timeofday-start)/10] seconds."
+		world.log << "## DEBUG: Explosion([x0],[y0],[z0])(d[devastation_range],h[heavy_impact_range],l[light_impact_range]): Took [(world.timeofday-start)/10] seconds."
+
+		sleep(8)
+
+		if(!lighting_controller.processing)	lighting_controller.processing = lighting_controller_was_processing
+		if(!powernet_rebuild_was_deferred_already)
+			if(defer_powernet_rebuild != 2)
+				defer_powernet_rebuild = 0
 
 	return 1
 

code/game/objects/explosion2.dm

@@ -1,4 +1,6 @@
 //TODO: Flash range does nothing currently
+//NOTE: This has not yet been updated with the lighting deferal stuff. ~Carn
+//Needs some work anyway.
 
 proc/explosion(turf/epicenter, devastation_range, heavy_impact_range, light_impact_range, flash_range, adminlog = 1)
 	spawn(0)

code/game/objects/facehugger.dm

@@ -1,258 +0,0 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-//Moving this here for now.. it might end up in modules/mob/ later
-
-var/const/MIN_IMPREGNATION_TIME = 100 //time it takes to impregnate someone
-var/const/MAX_IMPREGNATION_TIME = 150
-
-var/const/MIN_ACTIVE_TIME = 300 //time between being dropped and going idle
-var/const/MAX_ACTIVE_TIME = 600
-
-/obj/item/clothing/mask/facehugger
-	name = "alien"
-	desc = "It has some sort of a tube at the end of its tail."
-	icon_state = "facehugger"
-	item_state = "facehugger"
-	w_class = 1 //note: can be picked up by aliens unlike most other items of w_class below 4
-	flags = FPRINT|TABLEPASS|MASKCOVERSMOUTH|MASKCOVERSEYES
-
-	var/stat = UNCONSCIOUS //UNCONSCIOUS is the idle state in this case
-
-	var/sterile = 0
-
-	var/strength = 5
-
-	var/attached = 0
-
-	attack_paw(user as mob) //can be picked up by aliens
-		if(isalien(user))
-			attack_hand(user)
-			return
-		else
-			..()
-			return
-
-	attack_hand(user as mob)
-		if(stat == CONSCIOUS && !isalien(user))
-			Attach(user)
-			return
-		else
-			..()
-			return
-
-	attack(mob/living/M as mob, mob/user as mob)
-		..()
-		user.drop_from_inventory(src)
-		Attach(M)
-
-	New()
-		if(aliens_allowed)
-			..()
-		else
-			del(src)
-
-	examine()
-		..()
-		switch(stat)
-			if(DEAD,UNCONSCIOUS)
-				usr << "\red \b [src] is not moving."
-			if(CONSCIOUS)
-				usr << "\red \b [src] seems to be active."
-		if (sterile)
-			usr << "\red \b It looks like the proboscis has been removed."
-		return
-
-	attackby()
-		Die()
-		return
-
-	bullet_act()
-		Die()
-		return
-
-	temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
-		if(exposed_temperature > 300)
-			Die()
-		return
-
-	equipped(mob/M)
-		Attach(M)
-
-	HasEntered(atom/target)
-		Attach(target)
-		return
-
-	dropped()
-		..()
-		GoActive()
-		return
-
-	throw_impact(atom/hit_atom)
-		Attach(hit_atom)
-		return
-
-	proc/Attach(M as mob)
-		if(!isliving(M) || isalien(M))
-			return
-		if(attached)
-			return
-		else
-			attached++
-			spawn(MAX_IMPREGNATION_TIME)
-				attached = 0
-
-		var/mob/living/L = M //just so I don't need to use :
-
-		if(stat != CONSCIOUS)	return
-		if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
-
-		if(issilicon(L))
-			for(var/mob/O in viewers(src, null))
-				O.show_message("\red \b [src] smashes against [L]'s frame!", 1)
-			Die()
-			return
-
-		var/mob/living/carbon/target = L
-
-		for(var/mob/O in viewers(target, null))
-			O.show_message("\red \b [src] leaps at [target]'s face!", 1)
-
-		if(ishuman(target))
-			var/mob/living/carbon/human/H = target
-			if(H.head && H.head.flags & HEADCOVERSMOUTH)
-				for(var/mob/O in viewers(H, null))
-					O.show_message("\red \b [src] smashes against [H]'s [H.head]!", 1)
-				Die()
-				return
-
-		if(target.wear_mask)
-			if(prob(20))	return
-			var/obj/item/clothing/W = target.wear_mask
-			if(!W.canremove)	return
-			target.drop_from_inventory(W)
-
-			for(var/mob/O in viewers(target, null))
-				O.show_message("\red \b [src] tears [W] off of [target]'s face!", 1)
-
-		loc = target
-		layer = 20
-		target.wear_mask = src
-		target.update_inv_wear_mask()
-
-		GoIdle() //so it doesn't jump the people that tear it off
-
-		if(!sterile) target.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
-
-		spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
-			Impregnate(target)
-
-		return
-
-	proc/Impregnate(mob/living/carbon/target as mob)
-		if(!target || target.wear_mask != src || target.stat == DEAD) //was taken off or something
-			return
-
-		if(!sterile)
-			target.contract_disease(new /datum/disease/alien_embryo(0)) //so infection chance is same as virus infection chance
-			for(var/datum/disease/alien_embryo/A in target.viruses)
-				target.status_flags |= XENO_HOST
-				break
-
-			for(var/mob/O in viewers(target,null))
-				O.show_message("\red \b [src] falls limp after violating [target]'s face!", 1)
-
-			Die()
-		else
-			for(var/mob/O in viewers(target,null))
-				O.show_message("\red \b [src] violates [target]'s face!", 1)
-		target.update_inv_wear_mask()
-		return
-
-	proc/GoActive()
-		if(stat == DEAD || stat == CONSCIOUS)
-			return
-
-		stat = CONSCIOUS
-
-/*		for(var/mob/living/carbon/alien/alien in world)
-			var/image/activeIndicator = image('icons/mob/alien.dmi', loc = src, icon_state = "facehugger_active")
-			activeIndicator.override = 1
-			if(alien && alien.client)
-				alien.client.images += activeIndicator	*/
-
-		spawn(rand(MIN_ACTIVE_TIME,MAX_ACTIVE_TIME))
-			GoIdle()
-
-		return
-
-	proc/GoIdle()
-		if(stat == DEAD || stat == UNCONSCIOUS)
-			return
-
-/*		RemoveActiveIndicators()	*/
-
-		stat = UNCONSCIOUS
-
-		return
-
-	proc/Die()
-		if(stat == DEAD)
-			return
-
-/*		RemoveActiveIndicators()	*/
-
-		icon_state = "facehugger_dead"
-		stat = DEAD
-
-		for(var/mob/O in viewers(src, null))
-			O.show_message("\red \b[src] curls up into a ball!", 1)
-
-		return
-
-/*	proc/RemoveActiveIndicators() //removes the "active" facehugger indicator from all aliens in the world for this hugger
-		for(var/mob/living/carbon/alien/alien in world)
-			if(alien.client)
-				for(var/image/image in alien.client.images)
-					if(image.icon_state == "facehugger_active" && image.loc == src)
-						del(image)
-
-		return	*/
-
-/obj/item/clothing/mask/facehugger/angry
-	stat = CONSCIOUS
-
-/obj/item/clothing/mask/facehugger/angry/HasProximity(atom/movable/AM as mob|obj)
-	if(istype(AM , /mob/living/))
-		Attach(AM)
-
-
-/*
-/obj/item/clothing/mask/facehugger/angry/New()
-	processing_objects.Add(src)
-
-/obj/item/clothing/mask/facehugger/angry/process()
-	if(!src || src.stat == (DEAD))
-		return
-
-	for(var/mob/living/carbon/C in range(1,src))
-		Attach(C)
-		return
-
-	for(var/mob/living/carbon/C in range(5,src))
-		if(isInSight(C,src))
-			step_to(src,C,0)
-			spawn(5)
-				if(C in range(1,src))
-					Attach(C)
-			return
-
-	step_rand(src)
-
-	return
-
-/obj/item/clothing/mask/facehugger/angry/Attach(var/mob/M as mob)
-
-	..(M)
-	processing_objects.Remove(src)
-
-*/

code/game/objects/items/blueprints.dm

@@ -235,33 +235,4 @@ move an amendment</a> to the drawing.</p>
 				if(BORDER_SPACE)
 					return ROOM_ERR_SPACE
 		found+=T
-	return found
-
-/*
-/proc/check_apc(var/area/A)
-	for(var/area/RA in A.related)
-		for(var/obj/machinery/power/apc/FINDME in RA)
-			return 1
-	return 0
-
-/proc/fuckingfreemachinery()
-	for(var/obj/machinery/machine in machines)
-		if (istype(machine,/obj/machinery/power/solar))
-			continue
-		var/area/A = machine.loc.loc		// make sure it's in an area
-		if (istype(A,/area/tdome))
-			continue
-		if (istype(A,/area/shuttle))
-			continue
-		if(!A || !isarea(A))
-			world << "DEBUG: @[machine.x],[machine.y],[machine.z] ([A.name]) machine \"[machine.name]\" ([machine.type]) hasnt area!"
-			continue
-		A = A.master
-		if (A.name=="Space")
-			world << "DEBUG: @[machine.x],[machine.y],[machine.z] ([A.name]) machine \"[machine.name]\" ([machine.type]) work in space!"
-			continue
-		if (!check_apc(A))
-			world << "DEBUG: @[machine.x],[machine.y],[machine.z] ([A.name]) machine \"[machine.name]\" ([machine.type]) work without APC!"
-	world << "\red END ====="
-
-*/
+	return found

code/game/objects/items/bodybag.dm

@@ -1,3 +1,5 @@
+//Also contains /obj/structure/closet/body_bag because I doubt anyone would think to look for bodybags in /object/structures
+
 /obj/item/bodybag
 	name = "body bag"
 	desc = "A folded bag designed to contain dead things."

code/game/objects/items/candle.dm

@@ -1,7 +1,3 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-#define CANDLE_LUM 3
-
 /obj/item/candle
 	name = "red candle"
 	desc = "a candle"
@@ -52,7 +48,7 @@
 			//src.damtype = "fire"
 			for(var/mob/O in viewers(usr, null))
 				O.show_message(flavor_text, 1)
-			sd_SetLuminosity(CANDLE_LUM)
+			SetLuminosity(CANDLE_LUM)
 			processing_objects.Add(src)
 
 
@@ -75,17 +71,17 @@
 		if(lit)
 			lit = 0
 			update_icon()
-			sd_SetLuminosity(0)
-			user.total_luminosity -= CANDLE_LUM
+			SetLuminosity(0)
+			user.SetLuminosity(user.luminosity - CANDLE_LUM)
 
 
 	pickup(mob/user)
 		if(lit)
-			src.sd_SetLuminosity(0)
-			user.total_luminosity += CANDLE_LUM
+			SetLuminosity(0)
+			user.SetLuminosity(user.luminosity + CANDLE_LUM)
 
 
 	dropped(mob/user)
 		if(lit)
-			user.total_luminosity -= CANDLE_LUM
-			src.sd_SetLuminosity(CANDLE_LUM)
+			user.SetLuminosity(user.luminosity - CANDLE_LUM)
+			SetLuminosity(CANDLE_LUM)

code/game/objects/items/crayons.dm

@@ -1,34 +1,3 @@
-/*--------
-//CONTAINS
-CRAYONS
---------*/
-/obj/item/weapon/storage/crayonbox/New()
-	..()
-	new /obj/item/toy/crayon/red(src)
-	new /obj/item/toy/crayon/orange(src)
-	new /obj/item/toy/crayon/yellow(src)
-	new /obj/item/toy/crayon/green(src)
-	new /obj/item/toy/crayon/blue(src)
-	new /obj/item/toy/crayon/purple(src)
-	update_icon()
-
-/obj/item/weapon/storage/crayonbox/update_icon()
-	overlays = list() //resets list
-	overlays += image('icons/obj/crayons.dmi',"crayonbox")
-	for(var/obj/item/toy/crayon/crayon in contents)
-		overlays += image('icons/obj/crayons.dmi',crayon.colourName)
-
-/obj/item/weapon/storage/crayonbox/attackby(obj/item/W as obj, mob/user as mob)
-	if(istype(W,/obj/item/toy/crayon))
-		switch(W:colourName)
-			if("mime")
-				usr << "This crayon is too sad to be contained in this box."
-				return
-			if("rainbow")
-				usr << "This crayon is too powerful to be contained in this box."
-				return
-	..()
-
 /obj/item/toy/crayon/red
 	icon_state = "crayonred"
 	colour = "#DA0000"
@@ -127,40 +96,4 @@ CRAYONS
 				user << "\red You ate your crayon!"
 				del(src)
 	else
-		..()
-
-/obj/effect/decal/cleanable/crayon
-	name = "rune"
-	desc = "A rune drawn in crayon."
-	icon = 'icons/obj/rune.dmi'
-	layer = 2.1
-	anchored = 1
-
-
-	examine()
-		set src in view(2)
-		..()
-		return
-
-
-	New(location,main = "#FFFFFF",shade = "#000000",var/type = "rune")
-		..()
-		loc = location
-
-		name = type
-		desc = "A [type] drawn in crayon."
-
-		switch(type)
-			if("rune")
-				type = "rune[rand(1,6)]"
-			if("graffiti")
-				type = pick("amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa")
-
-		var/icon/mainOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]",2.1)
-		var/icon/shadeOverlay = new/icon('icons/effects/crayondecal.dmi',"[type]s",2.1)
-
-		mainOverlay.Blend(main,ICON_ADD)
-		shadeOverlay.Blend(shade,ICON_ADD)
-
-		overlays += mainOverlay
-		overlays += shadeOverlay
+		..()

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

@@ -193,20 +193,19 @@ var/global/list/obj/item/device/pda/PDAs = list()
  *	The Actual PDA
  */
 /obj/item/device/pda/pickup(mob/user)
-	if (fon)
-		sd_SetLuminosity(0)
-		user.total_luminosity += f_lum
+	if(fon)
+		SetLuminosity(0)
+		user.SetLuminosity(user.luminosity + f_lum)
 
 /obj/item/device/pda/dropped(mob/user)
-	if (fon)
-		user.total_luminosity -= f_lum
-		sd_SetLuminosity(f_lum)
+	if(fon)
+		user.SetLuminosity(user.luminosity - f_lum)
+		SetLuminosity(f_lum)
 
 /obj/item/device/pda/New()
 	..()
 	PDAs += src
-	spawn(3)
-	if (default_cartridge)
+	if(default_cartridge)
 		cartridge = new default_cartridge(src)
 
 /obj/item/device/pda/proc/can_use()
@@ -496,14 +495,14 @@ var/global/list/obj/item/device/pda/PDAs = list()
 //MAIN FUNCTIONS===================================
 
 				if("Light")
-					fon = (!fon)
-					if (src in U.contents)
-						if (fon)
-							U.total_luminosity += f_lum
-						else
-							U.total_luminosity -= f_lum
+					if(fon)
+						fon = 0
+						if(src in U.contents)	U.SetLuminosity(U.luminosity - f_lum)
+						else					SetLuminosity(0)
 					else
-						sd_SetLuminosity(fon * f_lum)
+						fon = 1
+						if(src in U.contents)	U.SetLuminosity(U.luminosity + f_lum)
+						else					SetLuminosity(f_lum)
 				if("Medical Scan")
 					if(scanmode == 1)
 						scanmode = 0

code/game/objects/items/devices/PDA/cart.dm

@@ -468,17 +468,17 @@ Code:
 				menu = "<h4><img src=pda_crate.png> Supply Record Interlink</h4>"
 
 				menu += "<BR><B>Supply shuttle</B><BR>"
-				menu += "Location: [supply_shuttle_moving ? "Moving to station ([supply_shuttle_timeleft] Mins.)":supply_shuttle_at_station ? "Station":"Dock"]<BR>"
+				menu += "Location: [supply_shuttle.moving ? "Moving to station ([supply_shuttle.eta] Mins.)":supply_shuttle.at_station ? "Station":"Dock"]<BR>"
 				menu += "Current approved orders: <BR><ol>"
-				for(var/S in supply_shuttle_shoppinglist)
+				for(var/S in supply_shuttle.shoppinglist)
 					var/datum/supply_order/SO = S
-					menu += "<li>[SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]</li>"
+					menu += "<li>#[SO.ordernum] - [SO.object.name] approved by [SO.orderedby] [SO.comment ? "([SO.comment])":""]</li>"
 				menu += "</ol>"
 
 				menu += "Current requests: <BR><ol>"
-				for(var/S in supply_shuttle_requestlist)
+				for(var/S in supply_shuttle.requestlist)
 					var/datum/supply_order/SO = S
-					menu += "<li>[SO.object.name] requested by [SO.orderedby]</li>"
+					menu += "<li>#[SO.ordernum] - [SO.object.name] requested by [SO.orderedby]</li>"
 				menu += "</ol><font size=\"-3\">Upgrade NOW to Space Parts & Space Vendors PLUS for full remote order control and inventory management."
 
 			if (48) //mulebot control

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

@@ -1,46 +1,3 @@
-/obj/effect/dummy/chameleon
-	name = ""
-	desc = ""
-	density = 0
-	anchored = 1
-	var/can_move = 1
-	var/obj/item/device/chameleon/master = null
-	attackby()
-		for(var/mob/M in src)
-			M << "\red Your chameleon-projector deactivates."
-		master.disrupt()
-	attack_hand()
-		for(var/mob/M in src)
-			M << "\red Your chameleon-projector deactivates."
-		master.disrupt()
-	ex_act()
-		for(var/mob/M in src)
-			M << "\red Your chameleon-projector deactivates."
-		master.disrupt()
-	bullet_act()
-		for(var/mob/M in src)
-			M << "\red Your chameleon-projector deactivates."
-		..()
-		master.disrupt()
-	relaymove(var/mob/user, direction)
-		if(istype(loc, /turf/space)) return //No magical space movement!
-
-		if(can_move)
-			can_move = 0
-			switch(usr.bodytemperature)
-				if(300 to INFINITY)
-					spawn(10) can_move = 1
-				if(295 to 300)
-					spawn(13) can_move = 1
-				if(280 to 295)
-					spawn(16) can_move = 1
-				if(260 to 280)
-					spawn(20) can_move = 1
-				else
-					spawn(25) can_move = 1
-			step(src,direction)
-		return
-
 /obj/item/device/chameleon
 	name = "chameleon-projector"
 	icon_state = "shield0"
@@ -119,3 +76,47 @@
 			active_dummy = null
 			can_use = 0
 			spawn(100) can_use = 1
+
+
+/obj/effect/dummy/chameleon
+	name = ""
+	desc = ""
+	density = 0
+	anchored = 1
+	var/can_move = 1
+	var/obj/item/device/chameleon/master = null
+	attackby()
+		for(var/mob/M in src)
+			M << "\red Your chameleon-projector deactivates."
+		master.disrupt()
+	attack_hand()
+		for(var/mob/M in src)
+			M << "\red Your chameleon-projector deactivates."
+		master.disrupt()
+	ex_act()
+		for(var/mob/M in src)
+			M << "\red Your chameleon-projector deactivates."
+		master.disrupt()
+	bullet_act()
+		for(var/mob/M in src)
+			M << "\red Your chameleon-projector deactivates."
+		..()
+		master.disrupt()
+	relaymove(var/mob/user, direction)
+		if(istype(loc, /turf/space)) return //No magical space movement!
+
+		if(can_move)
+			can_move = 0
+			switch(usr.bodytemperature)
+				if(300 to INFINITY)
+					spawn(10) can_move = 1
+				if(295 to 300)
+					spawn(13) can_move = 1
+				if(280 to 295)
+					spawn(16) can_move = 1
+				if(260 to 280)
+					spawn(20) can_move = 1
+				else
+					spawn(25) can_move = 1
+			step(src,direction)
+		return

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

@@ -18,25 +18,24 @@
 	..()
 	if (on)
 		icon_state = icon_on
-		src.sd_SetLuminosity(brightness_on)
+		src.SetLuminosity(brightness_on)
 	else
 		icon_state = icon_off
-		src.sd_SetLuminosity(0)
+		src.SetLuminosity(0)
 
 /obj/item/device/flashlight/proc/update_brightness(var/mob/user = null)
-	if (on)
+	if(on)
 		icon_state = icon_on
 		if(src.loc == user)
-			user.total_luminosity += brightness_on
-		else if (isturf(src.loc))
-			src.sd_SetLuminosity(brightness_on)
-
+			user.SetLuminosity(user.luminosity + brightness_on)
+		else if(isturf(loc))
+			SetLuminosity(brightness_on)
 	else
 		icon_state = icon_off
 		if(src.loc == user)
-			user.total_luminosity -= brightness_on
-		else if (isturf(src.loc))
-			src.sd_SetLuminosity(0)
+			user.SetLuminosity(user.luminosity - brightness_on)
+		else if(isturf(loc))
+			SetLuminosity(0)
 
 /obj/item/device/flashlight/attack_self(mob/user)
 	if(!isturf(user.loc))
@@ -85,14 +84,14 @@
 
 /obj/item/device/flashlight/pickup(mob/user)
 	if(on)
-		user.total_luminosity += brightness_on
-		src.sd_SetLuminosity(0)
+		user.SetLuminosity(user.luminosity + brightness_on)
+		SetLuminosity(0)
 
 
 /obj/item/device/flashlight/dropped(mob/user)
 	if(on)
-		user.total_luminosity -= brightness_on
-		src.sd_SetLuminosity(brightness_on)
+		user.SetLuminosity(user.luminosity - brightness_on)
+		SetLuminosity(brightness_on)
 
 
 /obj/item/device/flashlight/pen

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

@@ -50,7 +50,7 @@
 				for(var/mob/M in viewers(user))
 					if(M == user) continue
 					M << "[user] detaches the power sink from the cable."
-				sd_SetLuminosity(0)
+				SetLuminosity(0)
 				icon_state = "powersink0"
 
 				return
@@ -85,7 +85,7 @@
 					if(M == user) continue
 					M << "[user] deactivates the power sink!"
 				mode = 1
-				sd_SetLuminosity(0)
+				SetLuminosity(0)
 				icon_state = "powersink0"
 				processing_objects.Remove(src)
 
@@ -93,9 +93,7 @@
 		if(attached)
 			var/datum/powernet/PN = attached.get_powernet()
 			if(PN)
-				if(!luminosity)
-					sd_SetLuminosity(12)
-
+				SetLuminosity(12)
 
 				// found a powernet, so drain up to max power from it
 

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

@@ -0,0 +1,32 @@
+/obj/item/weapon/cloaking_device
+	name = "cloaking device"
+	desc = "Use this to become invisible to the human eyesocket."
+	icon = 'icons/obj/device.dmi'
+	icon_state = "shield0"
+	var/active = 0.0
+	flags = FPRINT | TABLEPASS| CONDUCT
+	item_state = "electronic"
+	throwforce = 10.0
+	throw_speed = 2
+	throw_range = 10
+	w_class = 2.0
+	origin_tech = "magnets=3;syndicate=4"
+
+
+/obj/item/weapon/cloaking_device/attack_self(mob/user as mob)
+	src.active = !( src.active )
+	if (src.active)
+		user << "\blue The cloaking device is now active."
+		src.icon_state = "shield1"
+	else
+		user << "\blue The cloaking device is now inactive."
+		src.icon_state = "shield0"
+	src.add_fingerprint(user)
+	return
+
+/obj/item/weapon/cloaking_device/emp_act(severity)
+	active = 0
+	icon_state = "shield0"
+	if(ismob(loc))
+		loc:update_icons()
+	..()

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

@@ -276,6 +276,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	name = "Hidden Uplink."
 	desc = "There is something wrong if you're examining this."
 	var/active = 0
+	var/list/purchase_log = list()
 
 // The hidden uplink MUST be inside an obj/item's contents.
 /obj/item/device/uplink/hidden/New()
@@ -336,6 +337,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 			if(ishuman(usr))
 				var/mob/living/carbon/human/A = usr
 				A.put_in_any_hand_if_possible(I)
+			purchase_log += "[usr] ([usr.ckey]) bought [I]."
 	interact(usr)
 	return
 

code/game/objects/items/helper_procs.dm

@@ -1,120 +0,0 @@
-/proc/parse_zone(zone)
-	if(zone == "r_hand") return "right hand"
-	else if (zone == "l_hand") return "left hand"
-	else if (zone == "l_arm") return "left arm"
-	else if (zone == "r_arm") return "right arm"
-	else if (zone == "l_leg") return "left leg"
-	else if (zone == "r_leg") return "right leg"
-	else if (zone == "l_foot") return "left foot"
-	else if (zone == "r_foot") return "right foot"
-	else return zone
-
-/proc/text2dir(direction)
-	switch(uppertext(direction))
-		if("NORTH")
-			return 1
-		if("SOUTH")
-			return 2
-		if("EAST")
-			return 4
-		if("WEST")
-			return 8
-		if("NORTHEAST")
-			return 5
-		if("NORTHWEST")
-			return 9
-		if("SOUTHEAST")
-			return 6
-		if("SOUTHWEST")
-			return 10
-		else
-	return
-
-/proc/get_turf(turf/location)
-	while(location)
-		if(isturf(location))
-			return location
-		location = location.loc
-	return null
-
-/proc/get_turf_or_move(turf/location)
-	return get_turf(location)
-
-
-
-/proc/dir2text(direction)
-	switch(direction)
-		if(1.0)
-			return "north"
-		if(2.0)
-			return "south"
-		if(4.0)
-			return "east"
-		if(8.0)
-			return "west"
-		if(5.0)
-			return "northeast"
-		if(6.0)
-			return "southeast"
-		if(9.0)
-			return "northwest"
-		if(10.0)
-			return "southwest"
-		else
-	return
-
-/proc/is_type_in_list(var/atom/A, var/list/L)
-	for(var/type in L)
-		if(istype(A, type))
-			return 1
-	return 0
-
-//Quick type checks for some tools
-var/global/list/common_tools = list(
-/obj/item/weapon/cable_coil,
-/obj/item/weapon/wrench,
-/obj/item/weapon/weldingtool,
-/obj/item/weapon/screwdriver,
-/obj/item/weapon/wirecutters,
-/obj/item/device/multitool,
-/obj/item/weapon/crowbar)
-
-/proc/istool(O)
-	if(O && is_type_in_list(O, common_tools))
-		return 1
-	return 0
-
-/proc/iswrench(O)
-	if(istype(O, /obj/item/weapon/wrench))
-		return 1
-	return 0
-
-/proc/iswelder(O)
-	if(istype(O, /obj/item/weapon/weldingtool))
-		return 1
-	return 0
-
-/proc/iscoil(O)
-	if(istype(O, /obj/item/weapon/cable_coil))
-		return 1
-	return 0
-
-/proc/iswirecutter(O)
-	if(istype(O, /obj/item/weapon/wirecutters))
-		return 1
-	return 0
-
-/proc/isscrewdriver(O)
-	if(istype(O, /obj/item/weapon/screwdriver))
-		return 1
-	return 0
-
-/proc/ismultitool(O)
-	if(istype(O, /obj/item/device/multitool))
-		return 1
-	return 0
-
-/proc/iscrowbar(O)
-	if(istype(O, /obj/item/weapon/crowbar))
-		return 1
-	return 0

code/game/objects/items/latexballoon.dm

@@ -0,0 +1,48 @@
+/obj/item/latexballon
+	name = "Latex glove"
+	desc = "" //todo
+	icon_state = "latexballon"
+	item_state = "lgloves"
+	force = 0
+	throwforce = 0
+	w_class = 1.0
+	throw_speed = 1
+	throw_range = 15
+	var/state
+	var/datum/gas_mixture/air_contents = null
+
+/obj/item/latexballon/proc/blow(obj/item/weapon/tank/tank)
+	if (icon_state == "latexballon_bursted")
+		return
+	src.air_contents = tank.remove_air_volume(3)
+	icon_state = "latexballon_blow"
+	item_state = "latexballon"
+
+/obj/item/latexballon/proc/burst()
+	if (!air_contents)
+		return
+	playsound(src, 'sound/weapons/Gunshot.ogg', 100, 1)
+	icon_state = "latexballon_bursted"
+	item_state = "lgloves"
+	loc.assume_air(air_contents)
+
+/obj/item/latexballon/ex_act(severity)
+	burst()
+	switch(severity)
+		if (1)
+			del(src)
+		if (2)
+			if (prob(50))
+				del(src)
+
+/obj/item/latexballon/bullet_act()
+	burst()
+
+/obj/item/latexballon/temperature_expose(datum/gas_mixture/air, temperature, volume)
+	if(temperature > T0C+100)
+		burst()
+	return
+
+/obj/item/latexballon/attackby(obj/item/W as obj, mob/user as mob)
+	if (is_sharp(W))
+		burst()

code/game/objects/items/shock_kit.dm

@@ -1,56 +0,0 @@
-/obj/item/assembly/shock_kit
-	name = "Shock Kit"
-	desc = "This appears to be made from both an Electric Pack and a Helmet."
-	icon_state = "shock_kit"
-	var/obj/item/clothing/head/helmet/part1 = null
-	var/obj/item/device/radio/electropack/part2 = null
-	var/status = 0.0
-	w_class = 5.0
-	flags = FPRINT | TABLEPASS| CONDUCT
-
-/obj/item/assembly/shock_kit/Del()
-	//src.part1 = null
-	del(src.part1)
-	//src.part2 = null
-	del(src.part2)
-	..()
-	return
-
-/obj/item/assembly/shock_kit/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if ((istype(W, /obj/item/weapon/wrench) && !( src.status )))
-		var/turf/T = src.loc
-		if (ismob(T))
-			T = T.loc
-		src.part1.loc = T
-		src.part2.loc = T
-		src.part1.master = null
-		src.part2.master = null
-		src.part1 = null
-		src.part2 = null
-		del(src)
-		return
-	if (!( istype(W, /obj/item/weapon/screwdriver) ))
-		return
-	src.status = !( src.status )
-	if (!src.status)
-		user.show_message("\blue The shock pack is now secured!", 1)
-	else
-		user.show_message("\blue The shock pack is now unsecured!", 1)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/shock_kit/attack_self(mob/user as mob)
-	src.part1.attack_self(user, src.status)
-	src.part2.attack_self(user, src.status)
-	src.add_fingerprint(user)
-	return
-
-/obj/item/assembly/shock_kit/receive_signal()
-	//*****
-	//world << "Shock kit got r_signal"
-	if (istype(src.loc, /obj/structure/stool/bed/chair/e_chair))
-		var/obj/structure/stool/bed/chair/e_chair/C = src.loc
-		//world << "Shock kit sending shock to EC"
-		C.shock()
-	return

code/game/objects/items/stacks/medical.dm

@@ -1,10 +1,3 @@
-/*
-CONTAINS:
-MEDICAL
-
-
-*/
-
 
 /obj/item/stack/medical/attack(mob/living/carbon/M as mob, mob/user as mob)
 	if (M.stat == 2)

code/game/objects/items/trash.dm

@@ -1,3 +1,6 @@
+//Items labled as 'trash' for the trash bag.
+//TODO: Make this an item var or something...
+
 //Added by Jack Rost
 /obj/item/trash
 	icon = 'icons/obj/trash.dmi'
@@ -51,80 +54,4 @@
 		icon_state = "liquidfood"
 
 /obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
-	return
-
-/obj/item/weapon/trashbag
-	icon = 'icons/obj/trash.dmi'
-	icon_state = "trashbag0"
-	item_state = "trashbag"
-	name = "Trash bag"
-	desc = "A heavy-duty, no fun allowed trash bag."
-	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
-	var/capacity = 25; //the number of trash it can carry.
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT
-	w_class = 2.0
-
-/obj/item/weapon/trashbag/update_icon()
-	if(contents.len == 0)
-		icon_state = "trashbag0"
-	else if(contents.len < 12)
-		icon_state = "trashbag1"
-	else if(contents.len < 25)
-		icon_state = "trashbag2"
-	else icon_state = "trashbag3"
-
-/obj/item/weapon/trashbag/attackby(obj/item/W as obj, mob/living/user as mob)
-	..()
-	if (contents.len < capacity)
-		if (istype(W, /obj/item))
-			if (W.w_class <= 2)
-				var/obj/item/O = W
-				src.contents += O
-	else
-		user << "\blue The bag is full!"
-
-/obj/item/weapon/trashbag/attack_self(mob/living/user as mob)
-
-	if(contents.len > 0)
-		for(var/obj/item/I in src.contents)
-			I.loc = user.loc
-		update_icon()
-		user << "\blue You drop all the trash onto the floor."
-
-/obj/item/weapon/trashbag/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
-	if(istype(target, /obj/item))
-		var/obj/item/W = target
-		if(W.w_class <= 2)
-			if(mode == 1)
-				if(contents.len < capacity)	//slightly redundant, but it makes it prettier in the chatbox. -Pete
-					user << "\blue You pick up all the trash."
-					for(var/obj/item/O in get_turf(W))
-						if(istype(O, /obj/item/weapon/disk/nuclear)) continue //No nuke disks - Nodrak
-						if(contents.len < capacity)
-							if(O.w_class <= 2)
-								contents += O;
-						else
-							user << "\blue The bag is full!"
-							break
-				else
-					user << "\blue The bag is full!"
-			else
-				if(istype(W, /obj/item/weapon/disk/nuclear)) return //No nuke disks - Nodrak
-				if(contents.len < capacity)
-					contents += W;
-				else
-					user << "\blue The bag is full!"
-			update_icon()
-		return
-
-/obj/item/weapon/trashbag/verb/toggle_mode()
-	set name = "Switch Bag Method"
-	set category = "Object"
-
-	mode = !mode
-	switch (mode)
-		if(1)
-			usr << "The bag now picks up all trash in a tile at once."
-		else
-			usr << "The bag now picks up one piece of trash at a time."
+	return

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

@@ -0,0 +1,14 @@
+/obj/item/weapon/bedsheet/ex_act(severity)
+	if (severity <= 2)
+		del(src)
+		return
+	return
+
+/obj/item/weapon/bedsheet/attack_self(mob/user as mob)
+	user.drop_item()
+	if(layer == initial(layer))
+		layer = 5
+	else
+		layer = initial(layer)
+	add_fingerprint(user)
+	return

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

@@ -1,17 +1,16 @@
+/* Cards
+ * Contains:
+ *		DATA CARD
+ *		ID CARD
+ *		FINGERPRINT CARD HOLDER
+ *		FINGERPRINT CARD
+ */
+
+
+
 /*
-CONTAINS:
-DATA CARD
-ID CARD
-FINGERPRINT CARD HOLDER
-FINGERPRINT CARD
-
-*/
-
-
-
-
-// DATA CARDS
-
+ * DATA CARDS - Used for the teleporter
+ */
 /obj/item/weapon/card/data/verb/label(t as text)
 	set name = "Label Disk"
 	set category = "Object"
@@ -25,10 +24,9 @@ FINGERPRINT CARD
 	return
 
 
-
-
-// ID CARDS
-
+/*
+ * ID CARDS
+ */
 /obj/item/weapon/card/id/attack_self(mob/user as mob)
 	for(var/mob/O in viewers(user, null))
 		O.show_message(text("[] shows you: \icon[] []: assignment: []", user, src, src.name, src.assignment), 1)
@@ -73,8 +71,9 @@ FINGERPRINT CARD
 		..()
 
 
-// FINGERPRINT HOLDER
-
+/*
+ * FINGERPRINT HOLDER
+ */
 /obj/item/weapon/fcardholder/attack_self(mob/user as mob)
 	var/dat = "<B>Clipboard</B><BR>"
 	for(var/obj/item/weapon/f_card/P in src)
@@ -168,10 +167,9 @@ FINGERPRINT CARD
 
 
 
-
-// FINGERPRINT CARD
-
-
+/*
+ * FINGERPRINT CARD
+ */
 /obj/item/weapon/f_card/examine()
 	set src in view(2)
 
@@ -191,25 +189,6 @@ FINGERPRINT CARD
 		return dat
 	return
 
-/*
-/obj/item/weapon/f_card/attack_hand(mob/user as mob)
-
-	if ((user.r_hand == src || user.l_hand == src))
-		src.add_fingerprint(user)
-		var/obj/item/weapon/f_card/F = new /obj/item/weapon/f_card( user )
-		F.amount = 1
-		src.amount--
-		user.put_in_hands(F)
-		F.add_fingerprint(user)
-		if (src.amount < 1)
-			//SN src = null
-			del(src)
-			return
-	else
-		..()
-	return
-*/
-
 /obj/item/weapon/f_card/attackby(obj/item/weapon/W as obj, mob/user as mob)
 	..()
 	if (istype(W, /obj/item/weapon/f_card))

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

@@ -106,9 +106,6 @@ ZIPPO
 		if(M.lit > 0)
 			light("\red [user] lights their [name] with their [W].")
 
-	else if(istype(W, /obj/item/device/assembly/igniter))
-		light("\red [user] fiddles with [W], and manages to light their [name].")
-
 	//can't think of any other way to update the overlays :<
 	user.update_inv_wear_mask(0)
 	user.update_inv_l_hand(0)
@@ -456,7 +453,7 @@ ZIPPO
 						for(var/mob/O in viewers(user, null))
 							O.show_message("\red After a few attempts, [user] manages to light the [src], they however burn their finger in the process.", 1)
 
-				user.total_luminosity += 2
+				user.SetLuminosity(user.luminosity + 2)
 				processing_objects.Add(src)
 			else
 				src.lit = 0
@@ -469,7 +466,7 @@ ZIPPO
 					for(var/mob/O in viewers(user, null))
 						O.show_message("\red [user] quietly shuts off the [src].", 1)
 
-				user.total_luminosity -= 2
+				user.SetLuminosity(user.luminosity - 2)
 				processing_objects.Remove(src)
 		else
 			return ..()
@@ -498,13 +495,13 @@ ZIPPO
 
 	pickup(mob/user)
 		if(lit)
-			src.sd_SetLuminosity(0)
-			user.total_luminosity += 2
+			src.SetLuminosity(0)
+			user.SetLuminosity(user.luminosity+2)
 		return
 
 
 	dropped(mob/user)
 		if(lit)
-			user.total_luminosity -= 2
-			src.sd_SetLuminosity(2)
+			user.SetLuminosity(user.luminosity-2)
+			src.SetLuminosity(2)
 		return