Merges upstream/dev to ref, resolves merge conflicts

code/_onclick/click.dm

@@ -330,15 +330,7 @@
 
 // Simple helper to face what you clicked on, in case it should be needed in more than one place
 /mob/proc/face_atom(var/atom/A)
-	// Snowflake for space vines.
-	var/is_buckled = 0
-	if(buckled)
-		if(istype(buckled))
-			if(!buckled.movable)
-				is_buckled = 1
-		else
-			is_buckled = 0
-	if( is_buckled || !A || !x || !y || !A.x || !A.y || (stat && !isobserver(src))) return
+	if(!A || !x || !y || !A.x || !A.y) return
 	var/dx = A.x - x
 	var/dy = A.y - y
 	if(!dx && !dy) return

code/_onclick/other_mobs.dm

@@ -175,7 +175,7 @@
 		return
 
 	if(melee_damage_upper == 0 && istype(A,/mob/living))
-		custom_emote(1,"[friendly] [src]!")
+		custom_emote(1,"[friendly] [A]!")
 		return
 
 	var/damage = rand(melee_damage_lower, melee_damage_upper)

code/controllers/configuration.dm

@@ -504,11 +504,6 @@
 				if("python_path")
 					if(value)
 						config.python_path = value
-					else
-						if(world.system_type == UNIX)
-							config.python_path = "/usr/bin/env python2"
-						else //probably windows, if not this should work anyway
-							config.python_path = "python"
 
 				if("use_lib_nudge")
 					config.use_lib_nudge = 1
@@ -741,3 +736,11 @@
 			runnable_modes[M] = probabilities[M.config_tag]
 			//world << "DEBUG: runnable_mode\[[runnable_modes.len]\] = [M.config_tag]"
 	return runnable_modes
+
+/datum/configuration/proc/post_load()
+	//apply a default value to config.python_path, if needed
+	if (!config.python_path)
+		if(world.system_type == UNIX)
+			config.python_path = "/usr/bin/env python2"
+		else //probably windows, if not this should work anyway
+			config.python_path = "python"

code/controllers/lighting_controller.dm

@@ -65,7 +65,7 @@ datum/controller/lighting/proc/process()
 //Does not loop. Should be run prior to process() being called for the first time.
 //Note: if we get additional z-levels at runtime (e.g. if the gateway thin ever gets finished) we can initialize specific
 //z-levels with the z_level argument
-datum/controller/lighting/proc/Initialize(var/z_level)
+datum/controller/lighting/proc/initializeLighting(var/z_level)
 	processing = 0
 	spawn(-1)
 		set background = 1

code/controllers/master_controller.dm

@@ -84,7 +84,7 @@ datum/controller/game_controller/proc/setup()
 		if(ticker)
 			ticker.pregame()
 
-	lighting_controller.Initialize()
+	lighting_controller.initializeLighting()
 
 
 datum/controller/game_controller/proc/setup_objects()

code/controllers/voting.dm

@@ -9,6 +9,7 @@ datum/controller/vote
 	var/mode = null
 	var/question = null
 	var/list/choices = list()
+	var/list/gamemode_names = list()
 	var/list/voted = list()
 	var/list/voting = list()
 	var/list/current_votes = list()
@@ -217,8 +218,10 @@ datum/controller/vote
 						for (var/T in L)
 							var/datum/game_mode/M = new T()
 							if (M.config_tag == F)
+								gamemode_names[M.config_tag] = capitalize(M.name) //It's ugly to put this here but it works
 								additional_text.Add("<td align = 'center'>[M.required_players]</td>")
 								break
+					gamemode_names["secret"] = "Secret"
 				if("crew_transfer")
 					if(check_rights(R_ADMIN|R_MOD, 0))
 						question = "End the shift?"
@@ -307,11 +310,16 @@ datum/controller/vote
 				var/votes = choices[choices[i]]
 				if(!votes)	votes = 0
 				. += "<tr>"
-				if(current_votes[C.ckey] == i)
-					. += "<td><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
+				if(mode == "gamemode")
+					if(current_votes[C.ckey] == i)
+						. += "<td><b><a href='?src=\ref[src];vote=[i]'>[gamemode_names[choices[i]]]</a></b></td><td align = 'center'>[votes]</td>"
+					else
+						. += "<td><a href='?src=\ref[src];vote=[i]'>[gamemode_names[choices[i]]]</a></b></td><td align = 'center'>[votes]</td>"
 				else
-					. += "<td><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
-
+					if(current_votes[C.ckey] == i)
+						. += "<td><b><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
+					else
+						. += "<td><a href='?src=\ref[src];vote=[i]'>[choices[i]]</a></b></td><td align = 'center'>[votes]</td>"
 				if (additional_text.len >= i)
 					. += additional_text[i]
 				. += "</tr>"

code/datums/helper_datums/teleport.dm

@@ -16,11 +16,11 @@
 
 	New(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
 		..()
-		if(!Init(arglist(args)))
+		if(!initTeleport(arglist(args)))
 			return 0
 		return 1
 
-	proc/Init(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout)
+	proc/initTeleport(ateleatom,adestination,aprecision,afteleport,aeffectin,aeffectout,asoundin,asoundout)
 		if(!setTeleatom(ateleatom))
 			return 0
 		if(!setDestination(adestination))

code/datums/supplypacks.dm

@@ -380,7 +380,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
 	containername = "Medical crate"
 	group = "Medical"
 
-/datum/supply_packs/medical
+/datum/supply_packs/bloodpack
 	name = "BloodPack crate"
 	contains = list(/obj/item/weapon/storage/box/bloodpacks,
                     /obj/item/weapon/storage/box/bloodpacks,

code/datums/wires/robot.dm

@@ -51,36 +51,17 @@ var/const/BORG_WIRE_CAMERA = 16
 
 
 /datum/wires/robot/UpdatePulsed(var/index)
-
 	var/mob/living/silicon/robot/R = holder
 	switch(index)
 		if (BORG_WIRE_AI_CONTROL) //pulse the AI wire to make the borg reselect an AI
 			if(!R.emagged)
-				var/new_ai = select_active_ai(R)
+				var/mob/living/silicon/ai/new_ai = select_active_ai(R)
 				if(new_ai && (new_ai != R.connected_ai))
+					R.connected_ai.connected_robots -= src
 					R.connected_ai = new_ai
+					new_ai.connected_robots += src
 					R.notify_ai(1)
-				var/numberer = 1  // Send images the Cyborg has taken to the AI's album upon sync.
-				for(var/datum/picture/z in R.aiCamera.aipictures)
-					if(R.connected_ai.aiCamera.aipictures.len == 0)
-						var/datum/picture/p = new/datum/picture()
-						p = z
-						p.fields["name"] = "Uploaded Image [numberer] (synced from [R.name])"
-						R.connected_ai.aiCamera.aipictures += p
-						numberer++
-						continue
-					for(var/datum/picture/t in R.connected_ai.aiCamera.aipictures) //Hopefully to prevent someone spamming images to silicons, by spamming this wire
-						if((z.fields["pixel_y"] != t.fields["pixel_y"]) && (z.fields["pixel_x"] != t.fields["pixel_x"])) //~2.26 out of 1000 chance this will stop something it shouldn't
-							var/datum/picture/p = new/datum/picture()
-							p = z
-							p.fields["name"] = "Uploaded Image [numberer] (synced from [R.name])"
-							R.connected_ai.aiCamera.aipictures += p
-						else
-							continue
-					numberer++
-				if(R.aiCamera.aipictures.len > 0)
-					R << "<span class='notice'>Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI.</span>"
-
+					R.sync()
 		if (BORG_WIRE_CAMERA)
 			if(!isnull(R.camera) && R.camera.can_use() && !R.scrambledcodes)
 				R.camera.kick_viewers() // Kick anyone watching the Cyborg's camera

code/game/area/areas.dm

@@ -57,7 +57,7 @@
 						a.triggerAlarm("Power", src, cameras, source)
 	return
 
-/area/proc/atmosalert(danger_level)
+/area/proc/atmosalert(danger_level, var/set_firelocks=1)
 //	if(type==/area) //No atmos alarms in space
 //		return 0 //redudant
 
@@ -68,7 +68,7 @@
 				danger_level = max(danger_level, AA.danger_level)
 
 	if(danger_level != atmosalm)
-		if (danger_level < 1 && atmosalm >= 1)
+		if (set_firelocks && danger_level < 1 && atmosalm >= 1)
 			//closing the doors on red and opening on green provides a bit of hysteresis that will hopefully prevent fire doors from opening and closing repeatedly due to noise
 			air_doors_open()
 
@@ -92,7 +92,8 @@
 				aiPlayer.triggerAlarm("Atmosphere", src, cameras, src)
 			for(var/obj/machinery/computer/station_alert/a in machines)
 				a.triggerAlarm("Atmosphere", src, cameras, src)
-			air_doors_close()
+			if (set_firelocks)
+				air_doors_close()
 
 		atmosalm = danger_level
 		for(var/area/RA in related)

code/game/gamemodes/calamity/calamity.dm

@@ -91,7 +91,7 @@
 
 	// Add the cortical borer event
 	var/list/moderate_event_list = EModerate.available_events
-	var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, one_shot = 1)
+	var/event = new /datum/event_meta(EVENT_LEVEL_MODERATE, "Borer Infestation", /datum/event/borer_infestation, 400, is_one_shot = 1)
 	moderate_event_list.Add(event)
 
 	if(chosen_atypes)

code/game/gamemodes/cult/ritual.dm

@@ -331,11 +331,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 
 		if(istype(M,/mob/dead))
 			var/mob/dead/D = M
-			D.manifest()
-			user.visible_message( \
-				"\red [user] drags the ghost to our plan of reality!", \
-				"\red You drag the ghost to our plan of reality!" \
-			)
+			D.manifest(user)
 			return
 		if(!istype(M))
 			return

code/game/gamemodes/events/space_ninja.dm

@@ -531,7 +531,6 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 	else
 		equip_to_slot_or_del(new /obj/item/clothing/under/color/black(src), slot_w_uniform)
 
-	equip_to_slot_or_del(new /obj/item/clothing/mask/gas/voice/space_ninja(src), slot_wear_mask)
 	equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_belt)
 
 	var/obj/item/weapon/rig/light/ninja/ninjasuit = new(src)
@@ -546,16 +545,16 @@ As such, it's hard-coded for now. No reason for it not to be, really.
 
 	equip_to_slot_or_del(ninjasuit,slot_back)
 
-	if(istype(wear_suit,/obj/item/weapon/rig))
-		var/obj/item/weapon/rig/rig = wear_suit
-		if(rig.air_supply)
-			internal = rig.air_supply
-	if(!internal && s_store)
-		internal = s_store
-	if(internal)
-		internals.icon_state = "internal1"
-
 	spawn(10)
 		ninjasuit.toggle_seals(src,1)
 
+		if(istype(back,/obj/item/weapon/rig))
+			var/obj/item/weapon/rig/rig = back
+			if(rig.air_supply)
+				internal = rig.air_supply
+		if(!internal && s_store)
+			internal = s_store
+		if(internal)
+			internals.icon_state = "internal1"
+
 	return 1

code/game/gamemodes/game_mode.dm

@@ -56,7 +56,7 @@
 		"Devices and Tools" = list(
 			new/datum/uplink_item(/obj/item/weapon/card/emag, 3, "Cryptographic Sequencer", "EC"),
 			new/datum/uplink_item(/obj/item/weapon/storage/toolbox/syndicate, 1, "Fully Loaded Toolbox", "ST"),
-			new/datum/uplink_item(/obj/item/weapon/stamp/chameleon, 3, "Morphic Chameleon Stmap", "CS"),
+			new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/clerical, 3, "Morphic Clerical Kit", "CK"),
 			new/datum/uplink_item(/obj/item/weapon/storage/box/syndie_kit/space, 3, "Space Suit", "SS"),
 			new/datum/uplink_item(/obj/item/clothing/glasses/thermal/syndi, 3, "Thermal Imaging Glasses", "TM"),
 			new/datum/uplink_item(/obj/item/device/encryptionkey/binary, 3, "Binary Translator Key", "BT"),
@@ -154,16 +154,14 @@
 	var/pltext = "<font size=2><b>Player list:</b></font>"
 
 	for(var/mob/M in player_list)
-		if(M.mind)
-			pltext += print_player_lite(M.mind)
 		if(M.client)
 			clients++
 			if(ishuman(M))
-				if(!M.stat)
+				if(M.stat != DEAD)
 					surviving_humans++
 					if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations)
 						escaped_humans++
-			if(!M.stat)
+			if(M.stat != DEAD)
 				surviving_total++
 				if(M.loc && M.loc.loc && M.loc.loc.type in escape_locations)
 					escaped_total++

code/game/machinery/alarm.dm

@@ -117,6 +117,18 @@
 
 	first_run()
 
+/obj/machinery/alarm/Del()
+	//If there's an active alarm, clear it after minute so that alarms don't keep going forver
+	delayed_reset()
+	..()
+
+//needed to cancel the alarm after it is deleted
+/obj/machinery/alarm/proc/delayed_reset()
+	var/area/A = alarm_area
+	src = null
+	spawn(600)
+		//It makes sense not to touch firelocks here. The alarm itself is gone, we have no idea what the atmos is like.
+		A.atmosalert(0, set_firelocks=0)
 
 /obj/machinery/alarm/proc/first_run()
 	alarm_area = get_area(src)
@@ -1282,6 +1294,20 @@ FIRE ALARM
 		pixel_x = (dir & 3)? 0 : (dir == 4 ? -24 : 24)
 		pixel_y = (dir & 3)? (dir ==1 ? -24 : 24) : 0
 
+/obj/machinery/firealarm/Del()
+	//so fire alarms don't keep going forever
+	delayed_reset()
+	..()
+
+//needed to cancel the alarm after it is deleted
+/obj/machinery/firealarm/proc/delayed_reset()
+	var/area/A = get_area(src)
+	if (!A) return
+	
+	src = null
+	spawn(600)
+		A.firereset()
+
 /obj/machinery/firealarm/initialize()
 	if(z in config.contact_levels)
 		if(security_level)

code/game/machinery/atmoalter/canister.dm

@@ -108,6 +108,7 @@ update_flag
 	if (src.destroyed)
 		src.overlays = 0
 		src.icon_state = text("[]-1", src.canister_color)
+		return
 
 	if(icon_state != "[canister_color]")
 		icon_state = "[canister_color]"

code/game/machinery/bots/secbot.dm

@@ -643,6 +643,9 @@ Auto Patrol: []"},
 		return
 	src.anchored = 0
 	for(var/mob/living/M in view(search_range,src)) //Let's find us a criminal
+		if(M.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
+			continue
+
 		if(istype(M, /mob/living/carbon))
 			var/mob/living/carbon/C = M
 			if(C.stat || C.handcuffed)

code/game/machinery/camera/camera.dm

@@ -55,9 +55,7 @@
 	if(!alarm_on)
 		triggerCameraAlarm()
 	
-	spawn(50)
-		src = null
-		cancelCameraAlarm() //so camera alarms don't just go on forever
+	cancelCameraAlarm()
 	..()
 
 /obj/machinery/camera/emp_act(severity)

code/game/machinery/cloning.dm

@@ -33,7 +33,7 @@
 	var/datum/dna2/record/buf=null
 	var/read_only = 0 //Well,it's still a floppy disk
 
-/obj/item/weapon/disk/data/proc/Initialize()
+/obj/item/weapon/disk/data/proc/initializeDisk()
 	buf = new
 	buf.dna=new
 
@@ -42,7 +42,7 @@
 	read_only = 1
 
 	New()
-		Initialize()
+		initializeDisk()
 		buf.types=DNA2_BUF_UE|DNA2_BUF_UI
 		//data = "066000033000000000AF00330660FF4DB002690"
 		//data = "0C80C80C80C80C80C8000000000000161FBDDEF" - Farmer Jeff
@@ -57,7 +57,7 @@
 	read_only = 1
 
 	New()
-		Initialize()
+		initializeDisk()
 		buf.types=DNA2_BUF_SE
 		var/list/new_SE=list(0x098,0x3E8,0x403,0x44C,0x39F,0x4B0,0x59D,0x514,0x5FC,0x578,0x5DC,0x640,0x6A4)
 		for(var/i=new_SE.len;i<=DNA_SE_LENGTH;i++)

code/game/machinery/computer/HolodeckControl.dm

@@ -444,7 +444,7 @@ var/global/list/holodeck_programs = list(
 	throw_range = 5
 	throwforce = 0
 	w_class = 2.0
-	flags = FPRINT | TABLEPASS | NOSHIELD
+	flags = FPRINT | TABLEPASS | NOSHIELD | NOBLOODY
 	var/active = 0
 
 /obj/item/weapon/holo/esword/green

code/game/machinery/computer/camera.dm

@@ -23,6 +23,69 @@
 		user.reset_view(current)
 		return 1
 
+	ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
+		if(src.z > 6) return
+		if(stat & (NOPOWER|BROKEN)) return
+		if(user.stat) return
+
+		var/data[0]
+
+		data["current"] = null
+
+		var/list/L = list()
+		for (var/obj/machinery/camera/C in cameranet.cameras)
+			if(can_access_camera(C))
+				L.Add(C)
+
+		camera_sort(L)
+
+		var/cameras[0]
+		for(var/obj/machinery/camera/C in L)
+			var/cam[0]
+			cam["name"] = C.c_tag
+			cam["deact"] = !C.can_use()
+			cam["camera"] = "\ref[C]"
+			cam["x"] = C.x
+			cam["y"] = C.y
+			cam["z"] = C.z
+
+			cameras[++cameras.len] = cam
+
+			if(C == current)
+				data["current"] = cam
+
+		data["cameras"] = cameras
+
+		ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+		if (!ui)
+			ui = new(user, src, ui_key, "sec_camera.tmpl", "Camera Console", 900, 800)
+
+			// adding a template with the key "mapContent" enables the map ui functionality
+			ui.add_template("mapContent", "sec_camera_map_content.tmpl")
+			// adding a template with the key "mapHeader" replaces the map header content
+			ui.add_template("mapHeader", "sec_camera_map_header.tmpl")
+
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		if(href_list["switchTo"])
+			if(src.z>6 || stat&(NOPOWER|BROKEN)) return
+			if(usr.stat || ((get_dist(usr, src) > 1 || !( usr.canmove ) || usr.blinded) && !istype(usr, /mob/living/silicon))) return
+			var/obj/machinery/camera/C = locate(href_list["switchTo"]) in cameranet.cameras
+			if(!C) return
+
+			switch_to_camera(usr, C)
+			return 1
+		else if(href_list["reset"])
+			if(src.z>6 || stat&(NOPOWER|BROKEN)) return
+			if(usr.stat || ((get_dist(usr, src) > 1 || !( usr.canmove ) || usr.blinded) && !istype(usr, /mob/living/silicon))) return
+			current = null
+			usr.check_eye(current)
+			return 1
+		else
+			. = ..()
 
 	attack_hand(var/mob/user as mob)
 		if (src.z > 6)
@@ -32,35 +95,7 @@
 
 		if(!isAI(user))
 			user.set_machine(src)
-
-		var/list/L = list()
-		for (var/obj/machinery/camera/C in cameranet.cameras)
-			L.Add(C)
-
-		camera_sort(L)
-
-		var/list/D = list()
-		D["Cancel"] = "Cancel"
-		for(var/obj/machinery/camera/C in L)
-			if(can_access_camera(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)
-			user.unset_machine()
-			return 0
-
-		var/obj/machinery/camera/C = D[t]
-
-		if(t == "Cancel")
-			user.unset_machine()
-			return 0
-
-		if(C)
-			switch_to_camera(user, C)
-			spawn(5)
-				attack_hand(user)
-		return
+		ui_interact(user)
 
 	proc/can_access_camera(var/obj/machinery/camera/C)
 		var/list/shared_networks = src.network & C.network
@@ -79,6 +114,7 @@
 		if (!C.can_use() || user.stat || (get_dist(user, src) > 1 || user.machine != src || user.blinded || !( user.canmove ) && !istype(user, /mob/living/silicon)))
 			return 0
 		src.current = C
+		check_eye(user)
 		use_power(50)
 		return 1
 

code/game/machinery/computer/crew.dm

@@ -75,6 +75,8 @@
 			if(istype(C.loc, /mob/living/carbon/human))
 
 				var/mob/living/carbon/human/H = C.loc
+				if(H.w_uniform != C)
+					continue
 
 				var/list/crewmemberData = list()
 

code/game/machinery/computer/security.dm

@@ -576,9 +576,9 @@ What a mess.*/
 		return photo.img
 	if(istype(user, /mob/living/silicon))
 		var/mob/living/silicon/tempAI = usr
-		var/datum/picture/selection = tempAI.GetPicture()
+		var/obj/item/weapon/photo/selection = tempAI.GetPicture()
 		if (selection)
-			return selection.fields["img"]
+			return selection.img
 
 /obj/machinery/computer/secure_data/emp_act(severity)
 	if(stat & (BROKEN|NOPOWER))

code/game/machinery/cryopod.dm

@@ -381,7 +381,7 @@
 			// Delete the mob.
 			del(occupant)
 			occupant = null
-
+			name = initial(name)
 
 	return
 
@@ -442,7 +442,6 @@
 			src.add_fingerprint(M)
 
 /obj/machinery/cryopod/verb/eject()
-
 	set name = "Eject Pod"
 	set category = "Object"
 	set src in oview(1)
@@ -464,6 +463,8 @@
 
 	src.go_out()
 	add_fingerprint(usr)
+
+	name = initial(name)
 	return
 
 /obj/machinery/cryopod/verb/move_inside()
@@ -511,6 +512,7 @@
 		time_entered = world.time
 
 		src.add_fingerprint(usr)
+		name = "[name] ([usr.name])"
 
 	return
 

code/game/machinery/doors/airlock.dm

@@ -913,9 +913,9 @@ About the new airlock wires panel:
 				if(operating == -1)
 					new /obj/item/weapon/circuitboard/broken(src.loc)
 					operating = 0
-				else 
+				else
 					if (!electronics) create_electronics()
-					
+
 					electronics.loc = src.loc
 					electronics = null
 
@@ -1059,13 +1059,17 @@ About the new airlock wires panel:
 /obj/machinery/door/airlock/New(var/newloc, var/obj/structure/door_assembly/assembly=null)
 	..()
 
+	//High-sec airlocks are much harder to completely break by emitters.
+	if(secured_wires)
+		emitter_resistance *= 3
+
 	//if assembly is given, create the new door from the assembly
 	if (assembly)
 		assembly_type = assembly.type
-		
+
 		electronics = assembly.electronics
 		electronics.loc = src
-		
+
 		//update the door's access to match the electronics'
 		secured_wires = electronics.secure
 		if(electronics.one_access)
@@ -1073,7 +1077,7 @@ About the new airlock wires panel:
 			req_one_access = src.electronics.conf_access
 		else
 			req_access = src.electronics.conf_access
-		
+
 		//get the name from the assembly
 		if(assembly.created_name)
 			name = assembly.created_name
@@ -1093,8 +1097,8 @@ About the new airlock wires panel:
 					src.closeOther = A
 					break
 
-// Most doors will never be deconstructed over the course of a round, 
-// so as an optimization defer the creation of electronics until 
+// Most doors will never be deconstructed over the course of a round,
+// so as an optimization defer the creation of electronics until
 // the airlock is deconstructed
 /obj/machinery/door/airlock/proc/create_electronics()
 	//create new electronics
@@ -1102,7 +1106,7 @@ About the new airlock wires panel:
 		src.electronics = new/obj/item/weapon/airlock_electronics/secure( src.loc )
 	else
 		src.electronics = new/obj/item/weapon/airlock_electronics( src.loc )
-	
+
 	//update the electronics to match the door's access
 	if(!src.req_access)
 		src.check_access()

code/game/machinery/doors/door.dm

@@ -25,6 +25,8 @@
 	var/air_properties_vary_with_direction = 0
 	var/maxhealth = 300
 	var/health
+	var/emitter_hits = 0 // For use when tracking amount of emitter hits taken.
+	var/emitter_resistance = 10 // Amount of emitter hits doors whistand
 	var/min_force = 10 //minimum amount of force needed to damage the door with a melee weapon
 	var/hitsound = 'sound/weapons/smash.ogg' //sound door makes when hit with a weapon
 
@@ -133,9 +135,22 @@
 	if(!(Proj.damage_type == BRUTE || Proj.damage_type == BURN))
 		return
 
+	// Emitter Blasts - these will eventually completely destroy the door, given enough time.
+	if (istype(Proj, /obj/item/projectile/beam/emitter))
+		if(health > 0)
+			Proj.damage /= 4
+		else
+			emitter_hits ++
+			if(emitter_hits >= emitter_resistance)
+				visible_message("\red <B>[src.name] breaks apart!</B>", 1)
+				new /obj/effect/decal/cleanable/ash(src.loc) // Turn it to ashes!
+				del(src)
+
 	if(Proj.damage)
 		take_damage(Proj.damage)
 
+
+
 /obj/machinery/door/hitby(AM as mob|obj)
 
 	..()

code/game/machinery/doors/poddoor.dm

@@ -6,6 +6,7 @@
 	var/id = 1.0
 	dir = 1
 	explosion_resistance = 25
+	emitter_resistance = 50 // Lots of emitter blasts, it's blast door after all.
 
 /obj/machinery/door/poddoor/New()
 	. = ..()
@@ -28,6 +29,7 @@
 		icon_state = "pdoor0"
 	return
 
+
 /obj/machinery/door/poddoor/attackby(obj/item/weapon/C as obj, mob/user as mob)
 	src.add_fingerprint(user)
 	if (!( istype(C, /obj/item/weapon/crowbar) || (istype(C, /obj/item/weapon/twohanded/fireaxe) && C:wielded == 1) ))

code/game/machinery/portable_turret.dm

@@ -55,6 +55,8 @@
 
 	var/datum/effect/effect/system/spark_spread/spark_system	//the spark system, used for generating... sparks?
 
+	var/wrenching = 0
+
 /obj/machinery/porta_turret/stationary
 	lethal = 1
 	installation = /obj/item/weapon/gun/energy/laser
@@ -223,7 +225,7 @@
 		else
 			usr << "<span class='notice'>It has to be secured first!</span>"
 
-		updateUsrDialog()
+		attack_hand(usr)
 		return
 
 	switch(href_list["operation"])	//toggles customizable behavioural protocols
@@ -242,7 +244,7 @@
 			check_access = !check_access
 		if("checkxenos")
 			check_anomalies = !check_anomalies
-	updateUsrDialog()
+	attack_hand(usr)
 
 
 /obj/machinery/porta_turret/power_change()
@@ -288,19 +290,32 @@
 		sleep(60) //6 seconds for the traitor to gtfo of the area before the turret decides to ruin his shit
 		on = 1 //turns it back on. The cover popUp() popDown() are automatically called in process(), no need to define it here
 
-	else if((istype(I, /obj/item/weapon/wrench)) && (!on))
-		if(raised) return
+	else if((istype(I, /obj/item/weapon/wrench)))
+		if(on || raised)
+			user << "<span class='warning'You cannot unsecure an active turret!</span>"
+			return
+		if(wrenching)
+			user << "<span class='warning'>Someone is already [anchored ? "un" : ""]securing the turret!</span>"
+			return
+		if(!anchored && isinspace())
+			user << "<span class='warning'>Cannot secure turrets in space!</span>"
+			return
 
+		user.visible_message( \
+				"<span class='warning'>[user] begins [anchored ? "un" : ""]securing the turret.</span>", \
+				"<span class='notice'>You begin [anchored ? "un" : ""]securing the turret.</span>" \
+			)
+
+		wrenching = 1
 		if(do_after(user, 50))
 			//This code handles moving the turret around. After all, it's a portable turret!
-			if(!anchored && !isinspace())
+			if(!anchored)
 				playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
 				anchored = 1
 				invisibility = INVISIBILITY_LEVEL_TWO
 				update_icon()
 				user << "<span class='notice'>You secure the exterior bolts on the turret.</span>"
-				cover = new /obj/machinery/porta_turret_cover(loc) //create a new turret. While this is handled in process(), this is to workaround a bug where the turret becomes invisible for a split second
-				cover.Parent_Turret = src //make the cover's parent src
+				create_cover()
 			else if(anchored)
 				playsound(loc, 'sound/items/Ratchet.ogg', 100, 1)
 				anchored = 0
@@ -308,6 +323,7 @@
 				invisibility = 0
 				update_icon()
 				del(cover) //deletes the cover, and the turret instance itself becomes its own cover. - qdel
+		wrenching = 0
 
 	else if(istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda))
 		//Behavior lock/unlock mangement
@@ -348,7 +364,7 @@
 			spawn()
 				sleep(60)
 				attacked = 0
-	
+
 	..()
 
 	if((Proj.damage_type == BRUTE || Proj.damage_type == BURN))
@@ -395,7 +411,10 @@
 	update_icon()
 	del(cover)	//deletes the cover - no need on keeping it there! - del
 
-
+/obj/machinery/porta_turret/proc/create_cover()
+	if(cover == null && anchored)
+		cover = new /obj/machinery/porta_turret_cover(loc)	//if the turret has no cover and is anchored, give it a cover
+		cover.Parent_Turret = src	//assign the cover its Parent_Turret, which would be this (src)
 
 /obj/machinery/porta_turret/process()
 	//the main machinery process
@@ -406,9 +425,7 @@
 		if(stat & BROKEN)	//if the turret is borked
 			del(cover)	//delete its cover, assuming it has one. Workaround for a pesky little bug - qdel
 		else
-
-			cover = new /obj/machinery/porta_turret_cover(loc)	//if the turret has no cover and is anchored, give it a cover
-			cover.Parent_Turret = src	//assign the cover its Parent_Turret, which would be this (src)
+			create_cover()
 
 	if(stat & (NOPOWER|BROKEN))
 		//if the turret has no power or is broken, make the turret pop down if it hasn't already
@@ -445,6 +462,9 @@
 			secondarytargets += L
 
 /obj/machinery/porta_turret/proc/assess_living(var/mob/living/L)
+	if(L.invisibility >= INVISIBILITY_LEVEL_ONE) // Cannot see him. see_invisible is a mob-var
+		return TURRET_NOT_TARGET
+
 	if(!L)
 		return TURRET_NOT_TARGET
 
@@ -464,7 +484,7 @@
 
 	if(check_synth)	//If it's set to attack all non-silicons, target them!
 		if(L.lying)
-			return TURRET_SECONDARY_TARGET
+			return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
 		return TURRET_PRIORITY_TARGET
 
 	if(iscuffed(L)) // If the target is handcuffed, leave it alone
@@ -480,7 +500,7 @@
 			return TURRET_NOT_TARGET	//if threat level < 4, keep going
 
 	if(L.lying)		//if the perp is lying down, it's still a target but a less-important target
-		return TURRET_SECONDARY_TARGET
+		return lethal ? TURRET_SECONDARY_TARGET : TURRET_NOT_TARGET
 
 	return TURRET_PRIORITY_TARGET	//if the perp has passed all previous tests, congrats, it is now a "shoot-me!" nominee
 
@@ -840,11 +860,6 @@
 	density = 0
 	var/obj/machinery/porta_turret/Parent_Turret = null
 
-
-//The below code is pretty much just recoded from the initial turret object. It's necessary but uncommented because it's exactly the same!
-//>necessary
-//I'm not fixing it because i'm fucking bored of this code already, but someone should just reroute these to the parent turret's procs.
-
 /obj/machinery/porta_turret_cover/attack_ai(mob/user)
 	return attack_hand(user)
 
@@ -853,7 +868,6 @@
 
 /obj/machinery/porta_turret_cover/Topic(href, href_list)
 	Parent_Turret.Topic(href, href_list, 1)	// Calling another object's Topic requires that we claim to not have a window, otherwise BYOND's base proc will runtime.
-	updateUsrDialog()
 
 /obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user)
 	Parent_Turret.attackby(I, user)

code/game/machinery/vending.dm

@@ -26,7 +26,6 @@
 	var/vend_power_usage = 150 //actuators and stuff
 
 	var/active = 1 //No sales pitches if off!
-	var/delay_product_spawn // If set, uses sleep() in product spawn proc (mostly for seeds to retrieve correct names).
 	var/vend_ready = 1 //Are we ready to vend?? Is it time??
 	var/vend_delay = 10 //How long does it take to vend?
 	var/datum/data/vending_product/currently_vending = null // A /datum/data/vending_product instance of what we're paying for right now.
@@ -122,9 +121,6 @@
 
 /obj/machinery/vending/proc/build_inventory(var/list/productlist,hidden=0,req_coin=0)
 
-	if(delay_product_spawn)
-		sleep(15) //Make ABSOLUTELY SURE the seed datum is properly populated.
-
 	for(var/typepath in productlist)
 		var/amount = productlist[typepath]
 		var/price = prices[typepath]
@@ -147,9 +143,6 @@
 			R.category=CAT_NORMAL
 			product_records += R
 
-		if(delay_product_spawn)
-			sleep(5) //sleep(1) did not seem to cut it, so here we are.
-
 		var/atom/temp = typepath
 		R.product_name = initial(temp.name)
 
@@ -791,7 +784,6 @@
 	product_slogans = "THIS'S WHERE TH' SEEDS LIVE! GIT YOU SOME!;Hands down the best seed selection on the station!;Also certain mushroom varieties available, more for experts! Get certified today!"
 	product_ads = "We like plants!;Grow some crops!;Grow, baby, growww!;Aw h'yeah son!"
 	icon_state = "seeds"
-	delay_product_spawn = 1
 
 	products = list(/obj/item/seeds/bananaseed = 3,/obj/item/seeds/berryseed = 3,/obj/item/seeds/carrotseed = 3,/obj/item/seeds/chantermycelium = 3,/obj/item/seeds/chiliseed = 3,
 					/obj/item/seeds/cornseed = 3, /obj/item/seeds/eggplantseed = 3, /obj/item/seeds/potatoseed = 3, /obj/item/seeds/replicapod = 3,/obj/item/seeds/soyaseed = 3,
@@ -803,6 +795,34 @@
 					  /obj/item/seeds/nettleseed = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/reishimycelium = 2,/obj/item/seeds/shandseed = 2,)
 	premium = list(/obj/item/toy/waterflower = 1)
 
+/obj/machinery/vending/hydroseeds/build_inventory(var/list/productlist,hidden=0,req_coin=0)
+
+	for(var/typepath in productlist)
+		var/amount = productlist[typepath]
+		var/price = prices[typepath]
+		if(isnull(amount)) amount = 1
+
+		var/datum/data/vending_product/R = new /datum/data/vending_product()
+
+		R.product_path = typepath
+		R.amount = amount
+		R.price = price
+		R.display_color = pick("red","blue","green")
+
+		if(hidden)
+			R.category=CAT_HIDDEN
+			hidden_records += R
+		else if(req_coin)
+			R.category=CAT_COIN
+			coin_records += R
+		else
+			R.category=CAT_NORMAL
+			product_records += R
+
+		var/obj/item/seeds/S = new typepath(src)
+		R.product_name = S.name
+		del(S)
+	return
 
 /obj/machinery/vending/magivend
 	name = "MagiVend"
@@ -877,7 +897,7 @@
 	icon_state = "robotics"
 	icon_deny = "robotics-deny"
 	req_access_txt = "29"
-	products = list(/obj/item/clothing/suit/storage/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4,
+	products = list(/obj/item/clothing/suit/storage/toggle/labcoat = 4,/obj/item/clothing/under/rank/roboticist = 4,/obj/item/stack/cable_coil = 4,/obj/item/device/flash = 4,
 					/obj/item/weapon/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3,/obj/item/device/assembly/signaler = 3,/obj/item/device/healthanalyzer = 3,
 					/obj/item/weapon/scalpel = 2,/obj/item/weapon/circular_saw = 2,/obj/item/weapon/tank/anesthetic = 2,/obj/item/clothing/mask/breath/medical = 5,
 					/obj/item/weapon/screwdriver = 5,/obj/item/weapon/crowbar = 5)

code/game/mecha/mech_bay.dm

@@ -46,8 +46,8 @@
 	return
 
 // temporary fix for broken icon until somebody gets around to make these player-buildable
-/turf/simulated/floor/mech_bay_recharge_floor/attackby(obj/item/C as obj, mob/user as mob)	
-	..()	
+/turf/simulated/floor/mech_bay_recharge_floor/attackby(obj/item/C as obj, mob/user as mob)
+	..()
 	if(floor_type)
 		icon_state = "recharge_floor"
 	else
@@ -190,45 +190,28 @@
 		var/turf/simulated/floor/mech_bay_recharge_floor/F = locate() in range(1,src)
 		if(F)
 			F.init_devices()
-	
-	var/output = "<html><head><title>[src.name]</title></head><body>"
-	if(!recharge_floor)
-		output += "<font color='red'>Mech Bay Recharge Station not initialized.</font><br>"
+	ui_interact(user)
+
+/obj/machinery/computer/mech_bay_power_console/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/list/data = list()
+	data["has_floor"] = recharge_floor
+	data["has_port"] = recharge_port
+	if(recharge_floor && recharge_floor.recharging_mecha && recharge_floor.recharging_mecha.cell)
+		data["has_mech"] = 1
+		data["mecha_name"] = recharge_floor.recharging_mecha || "None"
+		data["mecha_charge"] = isnull(recharge_floor.recharging_mecha) ? 0 : recharge_floor.recharging_mecha.cell.charge
+		data["mecha_maxcharge"] = isnull(recharge_floor.recharging_mecha) ? 0 : recharge_floor.recharging_mecha.cell.maxcharge
+		data["mecha_charge_percentage"] = isnull(recharge_floor.recharging_mecha) ? 0 : round(recharge_floor.recharging_mecha.cell.percent())
 	else
-		output += {"<b>Mech Bay Recharge Station Data:</b><div style='margin-left: 15px;'>
-						<b>Mecha: </b>[recharge_floor.recharging_mecha||"None"]<br>"}
-		if(recharge_floor.recharging_mecha)
-			var/cell_charge = recharge_floor.recharging_mecha.get_charge()
-			output += "<b>Cell charge: </b>[isnull(cell_charge)?"No powercell found":"[recharge_floor.recharging_mecha.cell.charge]/[recharge_floor.recharging_mecha.cell.maxcharge]"]<br>"
-		output += "</div>"
-	if(!recharge_port)
-		output += "<font color='red'>Mech Bay Power Port not initialized.</font><br>"
-	else
-		output += "<b>Mech Bay Power Port Status: </b>[recharge_port.active()?"Now charging":"On hold"]<br>"
-
-	/*
-	output += {"<hr>
-					<b>Settings:</b>
-					<div style='margin-left: 15px;'>
-					<b>Start sequence on succesful init: </b><a href='?src=\ref[src];autostart=1'>[autostart?"On":"Off"]</a><br>
-					<b>Recharge Port Voltage: </b><a href='?src=\ref[src];voltage=30'>Low</a> - <a href='?src=\ref[src];voltage=45'>Medium</a> - <a href='?src=\ref[src];voltage=60'>High</a><br>
-					</div>"}
-	*/
-
-	output += "</ body></html>"
-	user << browse(output, "window=mech_bay_console")
-	onclose(user, "mech_bay_console")
-	return
-
-// unused at the moment, also lacks any kind of exploit prevention
-/* 
-/obj/machinery/computer/mech_bay_power_console/Topic(href, href_list)
-	if(href_list["autostart"])
-		autostart = !autostart
-	if(href_list["voltage"])
-		voltage = text2num(href_list["voltage"])
-		if(recharge_port)
-			recharge_port.set_voltage(voltage)
-	updateUsrDialog()
-	return
-*/
+		data["has_mech"] = 0
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		// the ui does not exist, so we'll create a new() one
+        // for a list of parameters and their descriptions see the code docs in \code\modules\nano\nanoui.dm
+		ui = new(user, src, ui_key, "mech_bay_console.tmpl", "Mech Bay Control Console", 500, 325)
+		// when the ui is first opened this is the data it will use
+		ui.set_initial_data(data)
+		// open the new ui window
+		ui.open()
+		// auto update every Master Controller tick
+		ui.set_auto_update(1)

code/game/mecha/mech_fabricator.dm

@@ -453,10 +453,10 @@
 	for(var/datum/design/D in files.known_designs)
 		if(D.build_type&16)
 			if(D.category in part_sets)//Checks if it's a valid category
-				if(add_part_to_set(D.category, text2path(D.build_path)))//Adds it to said category
+				if(add_part_to_set(D.category, D.build_path))//Adds it to said category
 					i++
 			else
-				if(add_part_to_set("Misc", text2path(D.build_path)))//If in doubt, chunk it into the Misc
+				if(add_part_to_set("Misc", D.build_path))//If in doubt, chunk it into the Misc
 					i++
 	return i
 

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

@@ -1,23 +1,28 @@
-/obj/effect/decal/remains/human
+/obj/effect/decal/remains
 	name = "remains"
-	desc = "They look like human remains. They have a strange aura about them."
 	gender = PLURAL
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "remains"
-	anchored = 1
+	anchored = 0
+
+/obj/effect/decal/remains/human
+	desc = "They look like human remains. They have a strange aura about them."
 
 /obj/effect/decal/remains/xeno
-	name = "remains"
 	desc = "They look like the remains of something... alien. They have a strange aura about them."
-	gender = PLURAL
-	icon = 'icons/effects/blood.dmi'
 	icon_state = "remainsxeno"
-	anchored = 1
 
 /obj/effect/decal/remains/robot
-	name = "remains"
 	desc = "They look like the remains of something mechanical. They have a strange aura about them."
-	gender = PLURAL
 	icon = 'icons/mob/robots.dmi'
 	icon_state = "remainsrobot"
-	anchored = 1
+
+/obj/effect/decal/remains/attack_hand(mob/user as mob)
+	user << "<span class='notice'>[src] sinks together into a pile of ash.</span>"
+	var/turf/simulated/floor/F = get_turf(src)
+	if (istype(F))
+		new /obj/effect/decal/cleanable/ash(F)
+	del(src)
+
+/obj/effect/decal/remains/robot/attack_hand(mob/user as mob)
+	return

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

@@ -1052,7 +1052,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/new_message(var/sending_unit, var/sender, var/sender_job, var/message)
 	var/reception_message = "\icon[src] <b>Message from [sender] ([sender_job]), </b>\"[message]\" (<a href='byond://?src=\ref[src];choice=Message;notap=[istype(loc, /mob/living/silicon)];skiprefresh=1;target=\ref[sending_unit]'>Reply</a>)"
-	new_info(news_silent, newstone, reception_message)
+	new_info(message_silent, newstone, reception_message)
 
 	log_pda("[usr] (PDA: [sending_unit]) sent \"[message]\" to [name]")
 	new_message = 1

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

@@ -1,6 +1,5 @@
 /*********************MANUALS (BOOKS)***********************/
 
-//Oh god what the fuck I am not good at computer
 /obj/item/weapon/book/manual
 	icon = 'icons/obj/library.dmi'
 	due_date = 0 // Game time in 1/10th seconds
@@ -13,26 +12,29 @@
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Station Repairs and Construction"
 
+/obj/item/weapon/book/manual/engineering_construction/New()
+	..()
 	dat = {"
 
 		<html><head>
 		</head>
 
 		<body>
-		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Guide_to_construction&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<iframe width='100%' height='97%' src="[config.wikiurl]Guide_to_construction&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
 		</body>
 
 		</html>
 
 		"}
 
-
 /obj/item/weapon/book/manual/engineering_particle_accelerator
 	name = "Particle Accelerator User's Guide"
 	icon_state ="bookParticleAccelerator"
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Particle Accelerator User's Guide"
 
+/obj/item/weapon/book/manual/engineering_particle_accelerator/New()
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -78,6 +80,8 @@
 	author = "Waleed Asad"
 	title = "Supermatter Engine User's Guide"
 
+/obj/item/weapon/book/manual/supermatter_engine/New()
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -188,13 +192,15 @@
 	author = "Engineering Encyclopedia"		 // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
 	title = "Hacking"
 
+/obj/item/weapon/book/manual/engineering_hacking/New()
+	..()
 	dat = {"
 
 		<html><head>
 		</head>
 
 		<body>
-		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Hacking&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<iframe width='100%' height='97%' src="[config.wikiurl]Hacking&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
 		</body>
 
 		</html>
@@ -743,13 +749,15 @@
 	author = "NanoTrasen"
 	title = "Corporate Regulations"
 
+/obj/item/weapon/book/manual/security_space_law/New()
+	..()
 	dat = {"
 
 		<html><head>
 		</head>
 
 		<body>
-		<iframe width='100%' height='97%' src="http://baystation12.net/wiki/index.php?title=Corporate_Regulations&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
+		<iframe width='100%' height='97%' src="[config.wikiurl]Corporate_Regulations&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>
 		</body>
 
 		</html>
@@ -765,6 +773,8 @@
 	author = "NanoTrasen Medicine Department"
 	title = "NT Medical Diagnostics Manual"
 
+/obj/item/weapon/book/manual/medical_diagnostics_manual/New()
+	..()
 	dat = {"<html>
 				<head>
 				<style>
@@ -797,7 +807,7 @@
 
 				<HR COLOR="steelblue" WIDTH="60%" ALIGN="LEFT">
 
-				<iframe width='100%' height='100%' src="http://baystation12.net/wiki/index.php?title=Guide_to_Medicine&printable=yes&removelinks=1" frameborder="0" id="main_frame"></iframe>
+				<iframe width='100%' height='100%' src="[config.wikiurl]Guide_to_Medicine&printable=yes&removelinks=1" frameborder="0" id="main_frame"></iframe>
 				</body>
 			</html>
 
@@ -810,13 +820,15 @@
 	author = "Engineering Encyclopedia"
 	title = "Engineering Textbook"
 
+/obj/item/weapon/book/manual/engineering_guide/New()
+	..()
 	dat = {"
 
 		<html><head>
 		</head>
 
 		<body>
-		<iframe width='100%' height='100%' src="http://baystation12.net/wiki/index.php?title=Guide_to_Engineering&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>		</body>
+		<iframe width='100%' height='100%' src="[config.wikiurl]Guide_to_Engineering&printable=yes&remove_links=1" frameborder="0" id="main_frame"></iframe>		</body>
 
 		</html>
 

code/game/objects/items/weapons/storage/belt.dm

@@ -14,6 +14,7 @@
 	icon_state = "utilitybelt"
 	item_state = "utility"
 	can_hold = list(
+		"/obj/item/weapon/combitool",
 		"/obj/item/weapon/crowbar",
 		"/obj/item/weapon/screwdriver",
 		"/obj/item/weapon/weldingtool",

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -140,3 +140,12 @@
 	new /obj/item/clothing/glasses/chameleon(src)
 	new /obj/item/weapon/gun/projectile/chameleon(src)
 	new /obj/item/ammo_magazine/chameleon(src)
+
+/obj/item/weapon/storage/box/syndie_kit/clerical
+	name = "clerical kit"
+	desc = "Comes with all you need to fake paperwork. Assumes you have passed basic writing lessons."
+
+/obj/item/weapon/storage/box/syndie_kit/clerical/New()
+	..()
+	new /obj/item/weapon/stamp/chameleon(src)
+	new /obj/item/weapon/pen/chameleon(src)

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

@@ -478,6 +478,7 @@
 	desc = "It even has one of those nubbins for doing the thingy."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "combitool"
+	w_class = 2
 
 	var/list/spawn_tools = list(
 		/obj/item/weapon/screwdriver,
@@ -511,11 +512,17 @@
 		user << "You switch \the [src] to the [tool.name] fitting."
 	return 1
 
-/obj/item/weapon/combitool/attack(var/atom/target, var/mob/living/user)
+/obj/item/weapon/combitool/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
 	var/obj/item/tool = tools[current_tool]
-	if(!tool)
-		return ..()
+	if(!tool) return 0
+	return (tool ? tool.attack(M,user) : 0)
+
+/obj/item/weapon/combitool/afterattack(var/atom/target, var/mob/living/user, proximity, params)
+	var/obj/item/tool = tools[current_tool]
+	if(!tool) return 0
+	tool.loc = user
 	var/resolved = target.attackby(tool,user)
 	if(!resolved && tool && target)
 		tool.afterattack(target,user,1)
-	return 1
+	if(tool)
+		tool.loc = src

code/game/objects/structures/coathanger.dm

@@ -4,7 +4,7 @@
 	icon = 'icons/obj/coatrack.dmi'
 	icon_state = "coatrack0"
 	var/obj/item/clothing/suit/coat
-	var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/det_suit)
+	var/list/allowed = list(/obj/item/clothing/suit/storage/labcoat, /obj/item/clothing/suit/storage/toggle/labcoat, /obj/item/clothing/suit/storage/det_suit)
 
 /obj/structure/coatrack/attack_hand(mob/user as mob)
 	user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src]")

code/game/objects/structures/tables_racks.dm

@@ -353,6 +353,9 @@
 	if(isrobot(user))
 		return
 
+	if(W.loc != user) // This should stop mounted modules ending up outside the module.
+		return
+
 	if(istype(W, /obj/item/weapon/melee/energy/blade))
 		var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
 		spark_system.set_up(5, 0, src.loc)
@@ -582,6 +585,8 @@
 		return
 	if(isrobot(user))
 		return
+	if(W.loc != user) // This should stop mounted modules ending up outside the module.
+		return
 	user.drop_item()
 	if(W && W.loc)	W.loc = src.loc
 	return

code/game/objects/structures/transit_tubes.dm

@@ -117,7 +117,7 @@ obj/structure/ex_act(severity)
 	if(!pod_moving && icon_state == "open" && istype(AM, /mob))
 		for(var/obj/structure/transit_tube_pod/pod in loc)
 			if(pod.contents.len)
-				AM << "<span class=The pod is already occupied.</span>"
+				AM << "<span class='notice'>The pod is already occupied.</span>"
 				return
 			else if(!pod.moving && pod.dir in directions())
 				AM.loc = pod

code/game/turfs/simulated/floor.dm

@@ -218,29 +218,16 @@ turf/simulated/floor/proc/update_icon()
 			return 0
 
 /turf/simulated/floor/attack_hand(mob/user as mob)
-	if (is_light_floor())
-		toggle_lightfloor_on()
-		update_icon()
-	if ((!( user.canmove ) || user.restrained() || !( user.pulling )))
+	. = ..()
+	if(.)
 		return
-	if (user.pulling.anchored || !isturf(user.pulling.loc))
-		return
-	if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
-		return
-	if (ismob(user.pulling))
-		var/mob/M = user.pulling
 
-//		if(M==user)					//temporary hack to stop runtimes. ~Carn
-//			user.stop_pulling()		//but...fixed the root of the problem
-//			return					//shoudn't be needed now, unless somebody fucks with pulling again.
-
-		var/mob/t = M.pulling
-		M.stop_pulling()
-		step(user.pulling, get_dir(user.pulling.loc, src))
-		M.start_pulling(t)
-	else
-		step(user.pulling, get_dir(user.pulling.loc, src))
-	return
+	if(is_light_floor())
+		if(user.canmove && !user.restrained())
+			toggle_lightfloor_on()
+			update_icon()
+			return 1
+	return 0
 
 /turf/simulated/floor/proc/gets_drilled()
 	return

code/game/turfs/simulated/floor_types.dm

@@ -12,13 +12,6 @@
 /turf/simulated/floor/airless/ceiling
 	icon_state = "rockvault"
 
-/turf/simulated/floor/airless/catwalk
-	name = "catwalk"
-	icon = 'icons/turf/catwalks.dmi'
-	icon_state = "catwalk0"
-	floor_type = null
-	intact = 0
-
 /turf/simulated/floor/light
 	name = "Light floor"
 	luminosity = 5
@@ -33,8 +26,6 @@
 				update_icon()
 				name = n
 
-
-
 /turf/simulated/floor/wood
 	name = "floor"
 	icon_state = "wood"
@@ -225,10 +216,4 @@
 	icon_state = "snow"
 
 /turf/simulated/floor/plating/snow/ex_act(severity)
-	return
-
-/turf/simulated/floor/plating/airless/catwalk
-	icon = 'icons/turf/catwalks.dmi'
-	icon_state = "Floor3"
-	name = "catwalk"
-	desc = "Cats really don't like these things."
+	return

code/game/turfs/simulated/walls.dm

@@ -7,6 +7,7 @@
 
 	var/damage = 0
 	var/damage_cap = 100 //Wall will break down to girders if damage reaches this point
+	var/armor = 0.5 // Damage is multiplied by this
 
 	var/damage_overlay
 	var/global/damage_overlays[8]
@@ -22,6 +23,21 @@
 
 	var/walltype = "metal"
 
+/turf/simulated/wall/bullet_act(var/obj/item/projectile/Proj)
+
+	// Tasers and stuff? No thanks.
+	if(Proj.damage_type == HALLOSS)
+		return
+
+	// Emitter blasts are somewhat weaker as emitters have large rate of fire and don't require limited power cell to run
+	if(istype(Proj, /obj/item/projectile/beam/emitter))
+		Proj.damage /= 4
+
+	take_damage(Proj.damage * armor)
+	return
+
+
+
 /turf/simulated/wall/Del()
 	for(var/obj/effect/E in src) if(E.name == "Wallrot") del E
 	..()
@@ -225,28 +241,38 @@
 		ReplaceWithLattice()
 	return 0
 
+/turf/simulated/wall
+	var/hulk_destroy_prob = 40
+	var/hulk_take_damage = 1
+	var/rotting_destroy_touch = 1
+	var/rotting_touch_message = "\blue The wall crumbles under your touch."
+
 //Interactions
 /turf/simulated/wall/attack_hand(mob/user as mob)
 	if (HULK in user.mutations)
-		if (prob(40) || rotting)
+		if (prob(hulk_destroy_prob) || rotting)
 			usr << text("\blue You smash through the wall.")
 			usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
 			dismantle_wall(1)
-			return
+			return 1
 		else
 			usr << text("\blue You punch the wall.")
-			take_damage(rand(25, 75))
-			return
+			if(hulk_take_damage)
+				take_damage(rand(25, 75))
+			return 1
 
 	if(rotting)
-		user << "\blue The wall crumbles under your touch."
-		dismantle_wall()
-		return
+		user << rotting_touch_message
+		if(rotting_destroy_touch)
+			dismantle_wall()
+		return 1
+
+	if(..()) return 1
 
 	user << "\blue You push the wall but nothing happens!"
 	playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
 	src.add_fingerprint(user)
-	return
+	return 0
 
 /turf/simulated/wall/attack_generic(var/mob/user, var/damage, var/attack_message, var/wallbreaker)
 

code/game/turfs/simulated/walls_reinforced.dm

@@ -7,31 +7,17 @@
 
 	damage_cap = 200
 	max_temperature = 6000
+	armor = 0.1 // Only 10% damage from gunfire, it's made from strong alloys and stuff.
 
 	walltype = "rwall"
 
 	var/d_state = 0
 
-/turf/simulated/wall/r_wall/attack_hand(mob/user as mob)
-	if (HULK in user.mutations)
-		if (prob(10) || rotting)
-			usr << text("\blue You smash through the wall.")
-			usr.say(pick(";RAAAAAAAARGH!", ";HNNNNNNNNNGGGGGGH!", ";GWAAAAAAAARRRHHH!", "NNNNNNNNGGGGGGGGHH!", ";AAAAAAARRRGH!" ))
-			dismantle_wall(1)
-			return
-		else
-			usr << text("\blue You punch the wall.")
-			return
-
-	if(rotting)
-		user << "\blue This wall feels rather unstable."
-		return
-
-	user << "\blue You push the wall but nothing happens!"
-	playsound(src, 'sound/weapons/Genhit.ogg', 25, 1)
-	src.add_fingerprint(user)
-	return
-
+/turf/simulated/wall/r_wall
+	hulk_destroy_prob = 10
+	hulk_take_damage = 0
+	rotting_destroy_touch = 0
+	rotting_touch_message = "\blue This wall feels rather unstable."
 
 /turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob)
 

code/game/turfs/space/space.dm

@@ -11,23 +11,6 @@
 	if(!istype(src, /turf/space/transit))
 		icon_state = "[((x + y) ^ ~(x * y) + z) % 25]"
 
-/turf/space/attack_hand(mob/user as mob)
-	if ((user.restrained() || !( user.pulling )))
-		return
-	if (user.pulling.anchored || !isturf(user.pulling.loc))
-		return
-	if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
-		return
-	if (ismob(user.pulling))
-		var/mob/M = user.pulling
-		var/atom/movable/t = M.pulling
-		M.stop_pulling()
-		step(user.pulling, get_dir(user.pulling.loc, src))
-		M.start_pulling(t)
-	else
-		step(user.pulling, get_dir(user.pulling.loc, src))
-	return
-
 /turf/space/attackby(obj/item/C as obj, mob/user as mob)
 
 	if (istype(C, /obj/item/stack/rods))

code/game/turfs/turf.dm

@@ -37,6 +37,22 @@
 /turf/ex_act(severity)
 	return 0
 
+/turf/attack_hand(mob/user)
+	if(!(user.canmove) || user.restrained() || !(user.pulling))
+		return 0
+	if(user.pulling.anchored || !isturf(user.pulling.loc))
+		return 0
+	if(user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1)
+		return 0
+	if(ismob(user.pulling))
+		var/mob/M = user.pulling
+		var/atom/movable/t = M.pulling
+		M.stop_pulling()
+		step(user.pulling, get_dir(user.pulling.loc, src))
+		M.start_pulling(t)
+	else
+		step(user.pulling, get_dir(user.pulling.loc, src))
+	return 1
 
 /turf/bullet_act(var/obj/item/projectile/Proj)
 	if(istype(Proj ,/obj/item/projectile/beam/pulse))

code/game/turfs/unsimulated/floor.dm

@@ -2,20 +2,3 @@
 	name = "floor"
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "Floor3"
-
-/turf/unsimulated/floor/attack_hand(var/mob/user as mob)
-	if ((!( user.canmove ) || user.restrained() || !( user.pulling )))
-		return
-	if (user.pulling.anchored || !isturf(user.pulling.loc))
-		return
-	if ((user.pulling.loc != user.loc && get_dist(user, user.pulling) > 1))
-		return
-	if (ismob(user.pulling))
-		var/mob/M = user.pulling
-		var/mob/t = M.pulling
-		M.stop_pulling()
-		step(user.pulling, get_dir(user.pulling.loc, src))
-		M.start_pulling(t)
-	else
-		step(user.pulling, get_dir(user.pulling.loc, src))
-	return

code/modules/awaymissions/corpse.dm

@@ -139,7 +139,7 @@
 	name = "Doctor"
 	corpseradio = /obj/item/device/radio/headset/headset_med
 	corpseuniform = /obj/item/clothing/under/rank/medical
-	corpsesuit = /obj/item/clothing/suit/storage/labcoat
+	corpsesuit = /obj/item/clothing/suit/storage/toggle/labcoat
 	corpseback = /obj/item/weapon/storage/backpack/medic
 	corpsepocket1 = /obj/item/device/flashlight/pen
 	corpseshoes = /obj/item/clothing/shoes/black

code/modules/client/preferences_gear.dm

@@ -507,7 +507,7 @@ var/global/list/gear_datums = list()
 
 /datum/gear/labcoat
 	display_name = "labcoat"
-	path = /obj/item/clothing/suit/storage/labcoat
+	path = /obj/item/clothing/suit/storage/toggle/labcoat
 	cost = 3
 	slot = slot_wear_suit
 
@@ -815,6 +815,11 @@ var/global/list/gear_datums = list()
 	sort_category = "misc"
 	cost = 2
 
+/datum/gear/combitool
+	display_name = "combi-tool"
+	path = /obj/item/weapon/combitool
+	cost = 3
+
 // Stuff worn on the ears. Items here go in the "ears" sort_category but they must not use
 // the slot_r_ear or slot_l_ear as the slot, or else players will spawn with no headset.
 /datum/gear/skrell_chain

code/modules/clothing/masks/voice.dm

@@ -10,13 +10,22 @@
 	var/obj/item/voice_changer/changer
 	origin_tech = "syndicate=4"
 
+/obj/item/clothing/mask/gas/voice/verb/Toggle_Voice_Changer()
+	set category = "Object"
+	set src in usr
+
+	changer.active = !changer.active
+	usr << "<span class='notice'>You [changer.active ? "enable" : "disable"] the voice-changing module in \the [src].</span>"
+
+/obj/item/clothing/mask/gas/voice/verb/Set_Voice(name as text)
+	set category = "Object"
+	set src in usr
+
+	var/voice = sanitize(copytext(name,1,MAX_MESSAGE_LEN))
+	if(!voice || !length(voice)) return
+	changer.voice = voice
+	usr << "<span class='notice'>You are now mimicking <B>[changer.voice]</B>.</span>"
+
 /obj/item/clothing/mask/gas/voice/New()
 	..()
 	changer = new(src)
-
-/obj/item/clothing/mask/gas/voice/space_ninja
-	name = "ninja mask"
-	desc = "A close-fitting mask that acts both as an air filter and a post-modern fashion statement."
-	icon_state = "s-ninja"
-	item_state = "s-ninja_mask"
-	siemens_coefficient = 0.2

code/modules/clothing/spacesuits/alien.dm

@@ -17,7 +17,7 @@
 	item_color = "skrell_helmet_black"
 
 /obj/item/clothing/suit/space/skrell
-	name = "Skrellian hardsuit"
+	name = "Skrellian voidsuit"
 	desc = "Seems like a wetsuit with reinforced plating seamlessly attached to it. Very chic."
 	armor = list(melee = 20, bullet = 20, laser = 50,energy = 50, bomb = 50, bio = 100, rad = 100)
 	allowed = list(/obj/item/device/flashlight,/obj/item/weapon/tank,/obj/item/weapon/storage/bag/ore,/obj/item/device/t_scanner,/obj/item/weapon/pickaxe, /obj/item/weapon/rcd)

code/modules/clothing/spacesuits/rig/modules/modules.dm

@@ -147,7 +147,7 @@
 		usr << "<span class='warning'>The suit is not initialized.</span>"
 		return 0
 
-	if(holder.security_check_enabled && !(istype(usr,/mob/living/silicon) || holder.allowed(usr)))
+	if(holder.security_check_enabled && !holder.check_suit_access(usr))
 		usr << "<span class='danger'>Access denied.</span>"
 		return
 

code/modules/clothing/spacesuits/rig/modules/utility.dm

@@ -269,7 +269,7 @@
 			if(!raw_choice)
 				return 0
 			voice_holder.voice = sanitize(copytext(raw_choice,1,MAX_MESSAGE_LEN))
-			usr << "You are now mimicking <B>[voice_holder.voice]</B>.</font>"
+			usr << "<font color='blue'>You are now mimicking <B>[voice_holder.voice]</B>.</font>"
 	return 1
 
 /obj/item/rig_module/maneuvering_jets

code/modules/clothing/spacesuits/rig/rig.dm

@@ -20,8 +20,8 @@
 	armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 20)
 	min_cold_protection_temperature = SPACE_SUIT_MIN_COLD_PROTECTION_TEMPERATURE
 	max_heat_protection_temperature = SPACE_SUIT_MAX_HEAT_PROTECTION_TEMPERATURE
-	siemens_coefficient = 0
-	permeability_coefficient = 0
+	siemens_coefficient = 0.1
+	permeability_coefficient = 0.1
 
 	var/interface_path = "hardsuit.tmpl"
 	var/ai_interface_path = "hardsuit.tmpl"
@@ -278,7 +278,7 @@
 			module.deactivate()
 	for(var/obj/item/piece in list(helmet,boots,gloves,chest))
 		if(!piece) continue
-		if(canremove && (flags & AIRTIGHT))
+		if(canremove)
 			piece.flags &= ~STOPSPRESSUREDMAGE
 			piece.flags &= ~AIRTIGHT
 		else
@@ -595,6 +595,8 @@
 						H << "<font color='blue'><b>Your [use_obj.name] [use_obj.gender == PLURAL ? "retract" : "retracts"] swiftly.</b></font>"
 						use_obj.canremove = 1
 						holder.drop_from_inventory(use_obj)
+						use_obj.loc = get_turf(src)
+						use_obj.dropped()
 						use_obj.canremove = 0
 						use_obj.loc = src
 
@@ -648,10 +650,10 @@
 	for(var/piece in list("helmet","gauntlets","chest","boots"))
 		toggle_piece(piece, H, ONLY_DEPLOY)
 
-/obj/item/weapon/rig/dropped()
+/obj/item/weapon/rig/dropped(var/mob/user)
 	..()
 	for(var/piece in list("helmet","gauntlets","chest","boots"))
-		toggle_piece(piece, wearer, ONLY_RETRACT)
+		toggle_piece(piece, user, ONLY_RETRACT)
 	wearer = null
 
 //Todo

code/modules/clothing/spacesuits/rig/suits/ert.dm

@@ -7,7 +7,6 @@
 	desc = "A suit worn by the commander of a NanoTrasen Emergency Response Team. Has blue highlights. Armoured and space ready."
 	suit_type = "ERT commander"
 	icon_state = "ert_commander_rig"
-	siemens_coefficient = 0.6
 	offline_slowdown = 3
 
 	helm_type = /obj/item/clothing/head/helmet/space/rig/ert

code/modules/clothing/spacesuits/spacesuits.dm

@@ -70,27 +70,25 @@
 	check_limb_support()
 	..()
 
-/obj/item/clothing/suit/space/dropped()
-	check_limb_support()
+/obj/item/clothing/suit/space/dropped(var/mob/user)
+	check_limb_support(user)
 	..()
 
 // Some space suits are equipped with reactive membranes that support
 // broken limbs - at the time of writing, only the ninja suit, but
 // I can see it being useful for other suits as we expand them. ~ Z
 // The actual splinting occurs in /datum/organ/external/proc/fracture()
-/obj/item/clothing/suit/space/proc/check_limb_support()
+/obj/item/clothing/suit/space/proc/check_limb_support(var/mob/living/carbon/human/user)
 
 	// If this isn't set, then we don't need to care.
 	if(!supporting_limbs || !supporting_limbs.len)
 		return
 
-	var/mob/living/carbon/human/H = src.loc
-
-	// If the holder isn't human, or the holder IS and is wearing the suit, it keeps supporting the limbs.
-	if(!istype(H) || H.wear_suit == src)
+	if(!istype(user) || user.wear_suit == src)
 		return
 
 	// Otherwise, remove the splints.
 	for(var/datum/organ/external/E in supporting_limbs)
 		E.status &= ~ ORGAN_SPLINTED
+		user << "The suit stops supporting your [E.display_name]."
 	supporting_limbs = list()

code/modules/clothing/spacesuits/void/void.dm

@@ -154,9 +154,9 @@
 			helmet.loc = get_turf(src)
 			src.helmet = null
 		else if (boots)
-			user << "You detatch \the [helmet] from \the [src]'s helmet mount."
-			helmet.loc = get_turf(src)
-			src.helmet = null
+			user << "You detatch \the [boots] from \the [src]'s boot mounts."
+			boots.loc = get_turf(src)
+			src.boots = null
 		else
 			user << "\The [src] does not have anything installed."
 		return

code/modules/customitems/item_defines.dm

@@ -849,13 +849,17 @@
 		icon_state = "bottle[color]"
 
 //////////// Suits ////////////
+/obj/item/clothing/suit/storage/labcoat
+	name = "labcoat"
+	desc = "A plain labcoat."
+	icon_state = "labcoat"
+	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 
 /obj/item/clothing/suit/storage/labcoat/fluff/aeneas_rinil //Robotics Labcoat - Aeneas Rinil [APPR]
 	name = "Robotics labcoat"
 	desc = "A labcoat with a few markings denoting it as the labcoat of roboticist."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "aeneasrinil"
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
 
 /obj/item/clothing/suit/storage/labcoat/fluff/pink //spaceman96: Trenna Seber
 	name = "pink labcoat"

code/modules/economy/Accounts_DB.dm

@@ -11,6 +11,7 @@
 	var/obj/item/weapon/card/id/held_card
 	var/datum/money_account/detailed_account_view
 	var/creating_new_account = 0
+	var/const/fund_cap = 1000000
 
 	proc/get_access_level()
 		if (!held_card)
@@ -125,12 +126,12 @@
 			if("add_funds")
 				var/amount = input("Enter the amount you wish to add", "Silently add funds") as num
 				if(detailed_account_view)
-					detailed_account_view.money += amount
+					detailed_account_view.money = min(detailed_account_view.money + amount, fund_cap)
 
 			if("remove_funds")
 				var/amount = input("Enter the amount you wish to remove", "Silently remove funds") as num
 				if(detailed_account_view)
-					detailed_account_view.money -= amount
+					detailed_account_view.money = max(detailed_account_view.money - amount, -fund_cap)
 
 			if("toggle_suspension")
 				if(detailed_account_view)
@@ -141,6 +142,9 @@
 				var/account_name = href_list["holder_name"]
 				var/starting_funds = max(text2num(href_list["starting_funds"]), 0)
 				create_account(account_name, starting_funds, src)
+
+				starting_funds = Clamp(starting_funds, 0, station_account.money)	// Not authorized to put the station in debt.
+				starting_funds = min(starting_funds, fund_cap)						// Not authrorized to give more than the fund cap.
 				if(starting_funds > 0)
 					//subtract the money
 					station_account.money -= starting_funds

code/modules/events/event_manager.dm

@@ -106,7 +106,7 @@
 		html += "<td><A align='right' href='?src=\ref[src];set_name=\ref[new_event]'>[new_event.name ? new_event.name : "Enter Event"]</A></td>"
 		html += "<td><A align='right' href='?src=\ref[src];set_type=\ref[new_event]'>[new_event.event_type ? new_event.event_type : "Select Type"]</A></td>"
 		html += "<td><A align='right' href='?src=\ref[src];set_weight=\ref[new_event]'>[new_event.weight ? new_event.weight : 0]</A></td>"
-		html += "<td><A align='right' href='?src=\ref[src];set_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
+		html += "<td><A align='right' href='?src=\ref[src];toggle_oneshot=\ref[new_event]'>[new_event.one_shot]</A></td>"
 		html += "</tr>"
 		html += "</table>"
 		html += "<A align='right' href='?src=\ref[src];add=\ref[selected_event_container]'>Add</A><br>"
@@ -262,13 +262,14 @@
 			return
 		if(alert("This will add a new event to the rotation. Continue?","Add Event!","Yes","No") != "Yes")
 			return
+		new_event.severity = selected_event_container.severity
 		selected_event_container.available_events += new_event
 		admin_log_and_message_admins("has added \a [severity_to_string[new_event.severity]] event '[new_event.name]' of type [new_event.event_type] with weight [new_event.weight].")
 		new_event = new
 	else if(href_list["clear"])
 		var/datum/event_container/EC = locate(href_list["clear"])
 		if(EC.next_event)
-			admin_log_and_message_admins("has unqueued the [severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
+			admin_log_and_message_admins("has dequeued the [severity_to_string[EC.severity]] event '[EC.next_event.name]'.")
 			EC.next_event = null
 
 	Interact(usr)

code/modules/events/radiation_storm.dm

@@ -1,11 +1,11 @@
 /datum/event/radiation_storm
-	var/const/enterBelt 	= 60
-	var/const/leaveBelt 	= 170
-	var/const/revokeAccess	= 230
-
-	endWhen				= revokeAccess
-
-	var/postStartTicks
+	var/const/enterBelt		= 30
+	var/const/radIntervall 	= 5	// Enough time between enter/leave belt for 10 hits, as per original implementation
+	var/const/leaveBelt		= 80
+	var/const/revokeAccess	= 135
+	announceWhen			= 1
+	endWhen					= revokeAccess
+	var/postStartTicks 		= 0
 
 /datum/event/radiation_storm/announce()
 	command_announcement.Announce("High levels of radiation detected near the station. Please evacuate into one of the shielded maintenance tunnels.", "Anomaly Alert", new_sound = 'sound/AI/radiation.ogg')
@@ -18,10 +18,10 @@
 		command_announcement.Announce("The station has entered the radiation belt. Please remain in a sheltered area until we have passed the radiation belt.", "Anomaly Alert")
 		radiate()
 
-	if(activeFor > enterBelt && activeFor < leaveBelt)
+	if(activeFor >= enterBelt && activeFor <= leaveBelt)
 		postStartTicks++
 
-	if(postStartTicks == 10)
+	if(postStartTicks == radIntervall)
 		postStartTicks = 0
 		radiate()
 

code/modules/events/rogue_drones.dm

@@ -31,9 +31,6 @@
 		msg = "Unidentified hackers have targetted a combat drone wing deployed from the NMV Icarus. If any are sighted in the area, approach with caution."
 	command_announcement.Announce(msg, "Rogue drone alert")
 
-/datum/event/rogue_drone/tick()
-	return
-
 /datum/event/rogue_drone/end()
 	var/num_recovered = 0
 	for(var/mob/living/simple_animal/hostile/retaliate/malf_drone/D in drones_list)

code/modules/food/recipes_microwave.dm

@@ -878,7 +878,7 @@ I said no!
 
 /datum/recipe/poppypretzel
 	items = list(
-		/obj/item/seeds/poppyseed,
+		/obj/item/weapon/reagent_containers/food/snacks/grown/poppy,
 		/obj/item/weapon/reagent_containers/food/snacks/dough,
 	)
 	result = /obj/item/weapon/reagent_containers/food/snacks/poppypretzel

code/modules/hydroponics/hydro_tray.dm

@@ -88,7 +88,7 @@
 		"adminordrazine" =  1,
 		"milk" =            0.9,
 		"beer" =            0.7,
-		"flourine" =       -0.5,
+		"fluorine" =       -0.5,
 		"chlorine" =       -0.5,
 		"phosphorus" =     -0.5,
 		"water" =           1,

code/modules/hydroponics/seeds.dm

@@ -56,9 +56,6 @@
 /obj/item/seeds/replicapod
 	seed_type = "diona"
 
-/obj/item/seeds/poppyseed
-	seed_type = "poppies"
-
 /obj/item/seeds/chiliseed
 	seed_type = "chili"
 

code/modules/mining/mine_turfs.dm

@@ -14,6 +14,7 @@
 	var/mineral/mineral
 	var/mined_ore = 0
 	var/last_act = 0
+	var/emitter_blasts_taken = 0 // EMITTER MINING! Muhehe.
 
 	var/datum/geosample/geologic_data
 	var/excavation_level = 0
@@ -52,6 +53,16 @@
 			mined_ore = 2 //some of the stuff gets blown up
 			GetDrilled()
 
+/turf/simulated/mineral/bullet_act(var/obj/item/projectile/Proj)
+
+	// Emitter blasts
+	if(istype(Proj, /obj/item/projectile/beam/emitter))
+		emitter_blasts_taken++
+
+		if(emitter_blasts_taken > 2) // 3 blasts per tile
+			mined_ore = 1
+			GetDrilled()
+
 /turf/simulated/mineral/Bumped(AM)
 	. = ..()
 	if(istype(AM,/mob/living/carbon/human))

code/modules/mob/dead/observer/observer.dm

@@ -83,18 +83,7 @@
 /mob/dead/attackby(obj/item/W, mob/user)
 	if(istype(W,/obj/item/weapon/book/tome))
 		var/mob/dead/M = src
-		if(src.invisibility != 0)
-			M.invisibility = 0
-			user.visible_message( \
-				"\red [user] drags ghost, [M], to our plan of reality!", \
-				"\red You drag [M] to our plan of reality!" \
-			)
-		else
-			user.visible_message ( \
-				"\red [user] just tried to smash his book into that ghost!  It's not very effective", \
-				"\red You get the feeling that the ghost can't become any more visible." \
-			)
-
+		M.manifest(user)
 
 /mob/dead/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
 	return 1
@@ -556,9 +545,23 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	usr.visible_message("<span class='deadsay'><b>[src]</b> points to [A]</span>")
 	return 1
 
-/mob/dead/proc/manifest()
-	verbs += /mob/dead/proc/toggle_visibility
-	toggle_visibility()
+/mob/dead/proc/manifest(mob/user)
+	var/is_manifest = 0
+	if(!is_manifest)
+		is_manifest = 1
+		verbs += /mob/dead/proc/toggle_visibility
+
+	if(src.invisibility != 0)
+		user.visible_message( \
+			"<span class='warning'>[user] drags ghost, [src], to our plan of reality!</span>", \
+			"<span class='warning'>You drag [src] to our plan of reality!</span>" \
+		)
+		toggle_visibility(1)
+	else
+		user.visible_message ( \
+			"<span class='warning'>[user] just tried to smash his book into that ghost!  It's not very effective.</span>", \
+			"<span class='warning'>You get the feeling that the ghost can't become any more visible.</span>" \
+		)
 
 /mob/dead/proc/toggle_icon(var/icon)
 	if(!client)
@@ -574,22 +577,21 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		var/image/J = image('icons/mob/mob.dmi', loc = src, icon_state = icon)
 		client.images += J
 
-/mob/dead/proc/toggle_visibility()
+/mob/dead/proc/toggle_visibility(var/forced = 0)
 	set category = "Ghost"
 	set name = "Toggle Visibility"
 	set desc = "Allows you to turn (in)visible (almost) at will."
 
 	var/toggled_invisible
-
-	if(invisibility && world.time < toggled_invisible + 600)
+	if(!forced && invisibility && world.time < toggled_invisible + 600)
 		src << "You must gather strength before you can turn visible again..."
 		return
 
 	if(invisibility == 0)
 		toggled_invisible = world.time
-		visible_message("<span class='emote'>It fades from sight...</span>", "<span class='info'>You are now invisible</span>")
+		visible_message("<span class='emote'>It fades from sight...</span>", "<span class='info'>You are now invisible.</span>")
 	else
-		src << "<span class='info'>You are now visible</span>"
+		src << "<span class='info'>You are now visible!</span>"
 
 	invisibility = invisibility == INVISIBILITY_OBSERVER ? 0 : INVISIBILITY_OBSERVER
 	// Give the ghost a cult icon which should be visible only to itself
@@ -605,3 +607,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		src << "<span class='info'>Your key won't be shown when you speak in dead chat.</span>"
 	else
 		src << "<span class='info'>Your key will be publicly visible again.</span>"
+
+/mob/dead/observer/canface()
+	return 1

code/modules/mob/hear_say.dm

@@ -11,7 +11,7 @@
 
 	//make sure the air can transmit speech - hearer's side
 	var/turf/T = get_turf(src)
-	if (T)
+	if ((T) && (!(istype(src, /mob/dead/observer)))) //Ghosts can hear even in vacuum.
 		var/datum/gas_mixture/environment = T.return_air()
 		var/pressure = (environment)? environment.return_pressure() : 0
 		if(pressure < SOUND_MINIMUM_PRESSURE && get_dist(speaker, src) > 1)

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

@@ -101,7 +101,7 @@
 			if(!attack.is_usable(H))
 				return 0
 
-			var/damage = rand(1, 5) + attack.damage
+			var/damage = rand(1, 5)
 			var/block = 0
 			var/accurate = 0
 			var/hit_zone = H.zone_sel.selecting
@@ -110,7 +110,7 @@
 			switch(src.a_intent)
 				if("help")
 					// We didn't see this coming, so we get the full blow
-					damage = attack.damage
+					damage = 5
 					accurate = 1
 				if("hurt", "grab")
 					// We're in a fighting stance, there's a chance we block
@@ -128,21 +128,29 @@
 			var/miss_type = 0
 			var/attack_message
 			if(!accurate)
-				/*
-					This is kind of convoluted, but it seems to break down like this:
-					(note that the chance to miss is exaggerated here since ran_zone() might roll "chest"
+				/* ~Hubblenaut
+					This place is kind of convoluted and will need some explaining.
+					ran_zone() will pick out of 11 zones, thus the chance for hitting
+					our target where we want to hit them is circa 9.1%.
+
+					Now since we want to statistically hit our target organ a bit more
+					often than other organs, we add a base chance of 20% for hitting it.
+
+					This leaves us with the following chances:
 
 					If aiming for chest:
-						80% chance you hit your target
-						17% chance you hit a random zone
-						3% chance you miss
+						27.3% chance you hit your target organ
+						70.5% chance you hit a random other organ
+						 2.2% chance you miss
 
 					If aiming for something else:
-						68% chance you hit your target
-						17% chance you hit a random zone
-						15% chance you miss
+						23.2% chance you hit your target organ
+						56.8% chance you hit a random other organ
+						15.0% chance you miss
 
-					Why don't we just use get_zone_with_miss_chance() ???
+					Note: We don't use get_zone_with_miss_chance() here since the chances
+						  were made for projectiles.
+					TODO: proc for melee combat miss chances depending on organ?
 				*/
 				if(prob(80))
 					hit_zone = ran_zone(hit_zone)
@@ -163,14 +171,17 @@
 
 			playsound(loc, ((miss_type) ? (miss_type == 1 ? attack.miss_sound : 'sound/weapons/thudswoosh.ogg') : attack.attack_sound), 25, 1, -1)
 			H.attack_log += text("\[[time_stamp()]\] <font color='red'>[miss_type ? (miss_type == 1 ? "Missed" : "Blocked") : "[pick(attack.attack_verb)]"] [src.name] ([src.ckey])</font>")
-			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>[miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]ed"] by [H.name] ([H.ckey])</font>")
+			src.attack_log += text("\[[time_stamp()]\] <font color='orange'>[miss_type ? (miss_type == 1 ? "Was missed by" : "Has blocked") : "Has Been [pick(attack.attack_verb)]"] by [H.name] ([H.ckey])</font>")
 			msg_admin_attack("[key_name(H)] [miss_type ? (miss_type == 1 ? "has missed" : "was blocked by") : "has [pick(attack.attack_verb)]"] [key_name(src)]")
 
 			if(miss_type)
 				return 0
 
+			damage += attack.damage // Adding species attack base damage
+			damage *= damage_multiplier
 			if(HULK in H.mutations)
-				damage *= 2 // Hulks do twice the damage)
+				damage *= 2 // Hulks do twice the damage
+			damage = max(1, damage)
 
 			var/armour = run_armor_check(affecting, "melee")
 			// Apply additional unarmed effects.

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

@@ -94,8 +94,10 @@
 		//Disabilities
 		handle_disabilities()
 
-		//Organ failure.
+		//Organs and blood
 		handle_organs()
+		handle_blood()
+		stabilize_body_temperature() //Body temperature adjusts itself (self-regulation)
 
 		//Random events (vomiting etc)
 		handle_random_events()
@@ -1070,22 +1072,6 @@
 				take_overall_damage(2,0)
 				traumatic_shock++
 
-		if (drowsyness)
-			drowsyness--
-			eye_blurry = max(2, eye_blurry)
-			if (prob(5))
-				sleeping += 1
-				Paralyse(5)
-
-		confused = max(0, confused - 1)
-		// decrement dizziness counter, clamped to 0
-		if(resting)
-			dizziness = max(0, dizziness - 15)
-			jitteriness = max(0, jitteriness - 15)
-		else
-			dizziness = max(0, dizziness - 3)
-			jitteriness = max(0, jitteriness - 3)
-
 		if(!(species.flags & IS_SYNTHETIC)) handle_trace_chems()
 
 		updatehealth()
@@ -1101,10 +1087,6 @@
 			silent = 0
 		else				//ALIVE. LIGHTS ARE ON
 			updatehealth()	//TODO
-			if(!in_stasis)
-				stabilize_body_temperature()	//Body temperature adjusts itself
-				handle_organs()	//Optimized.
-				handle_blood()
 
 			if(health <= config.health_threshold_dead || (species.has_organ["brain"] && !has_brain()))
 				death()
@@ -1119,13 +1101,6 @@
 			if( (getOxyLoss() > 50) || (config.health_threshold_crit > health) )
 				Paralyse(3)
 
-				/* Done by handle_breath()
-				if( health <= 20 && prob(1) )
-					spawn(0)
-						emote("gasp")
-				if(!reagents.has_reagent("inaprovaline"))
-					adjustOxyLoss(1)*/
-
 			if(hallucination)
 				if(hallucination >= 20)
 					if(prob(3))
@@ -1168,22 +1143,17 @@
 				if( prob(2) && health && !hal_crit )
 					spawn(0)
 						emote("snore")
-			else if(resting)
-				if(halloss > 0)
-					adjustHalLoss(-3)
 			//CONSCIOUS
 			else
 				stat = CONSCIOUS
-				if(halloss > 0)
-					adjustHalLoss(-1)
 
+			//Periodically double-check embedded_flag
 			if(embedded_flag && !(life_tick % 10))
 				var/list/E
 				E = get_visible_implants(0)
 				if(!E.len)
 					embedded_flag = 0
 
-
 			//Eyes
 			//Check rig first because it's two-check and other checks will override it.
 			if(istype(back,/obj/item/weapon/rig))
@@ -1223,9 +1193,28 @@
 			else if(ear_damage < 25)	//ear damage heals slowly under this threshold. otherwise you'll need earmuffs
 				ear_damage = max(ear_damage-0.05, 0)
 
+			//Resting
+			if(resting)
+				dizziness = max(0, dizziness - 15)
+				jitteriness = max(0, jitteriness - 15)
+				adjustHalLoss(-3)
+			else
+				dizziness = max(0, dizziness - 3)
+				jitteriness = max(0, jitteriness - 3)
+				adjustHalLoss(-1)
+
 			//Other
 			handle_statuses()
 
+			if (drowsyness)
+				drowsyness--
+				eye_blurry = max(2, eye_blurry)
+				if (prob(5))
+					sleeping += 1
+					Paralyse(5)
+
+			confused = max(0, confused - 1)
+
 			// If you're dirty, your gloves will become dirty, too.
 			if(gloves && germ_level > gloves.germ_level && prob(10))
 				gloves.germ_level += 1

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

@@ -102,12 +102,10 @@
 	damage = 0
 
 /datum/unarmed_attack/punch/show_attack(var/mob/living/carbon/human/user, var/mob/living/carbon/human/target, var/zone, var/attack_damage)
-	var/skill = user.skills["combat"]
 	var/datum/organ/external/affecting = target.get_organ(zone)
 	var/organ = affecting.display_name
 
-	if(!skill)	skill = 1
-	attack_damage = Clamp(attack_damage, 1, 5)
+	attack_damage = Clamp(attack_damage, 1, 5) // We expect damage input of 1 to 5 for this proc. But we leave this check juuust in case.
 
 	if(target == user)
 		user.visible_message("<span class='danger'>[user] [pick(attack_verb)] \himself in the [organ]!</span>")

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

@@ -88,8 +88,12 @@
 	if(wrapped) //Already have an item.
 		//Temporary put wrapped into user so target's attackby() checks pass.
 		wrapped.loc = user
+
 		//Pass the attack on to the target. This might delete/relocate wrapped.
-		wrapped.afterattack(target,user)
+		var/resolved = target.attackby(wrapped,user)
+		if(!resolved && wrapped && target)
+			wrapped.afterattack(target,user,1)
+
 		//If wrapped was neither deleted nor put into target, put it back into the gripper.
 		if(wrapped && user && (wrapped.loc == user))
 			wrapped.loc = src

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

@@ -167,7 +167,7 @@
 		src.sight &= ~SEE_TURFS
 		src.sight &= ~SEE_OBJS
 		src.see_in_dark = 8
-		src.see_invisible = SEE_INVISIBLE_LEVEL_TWO
+		src.see_invisible = SEE_INVISIBLE_MINIMUM
 
 	regular_hud_updates()
 

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

@@ -1,13 +1,20 @@
-/mob/living/silicon/robot/proc/photosync()
-	var/obj/item/device/camera/siliconcam/master_cam = connected_ai ? connected_ai.aiCamera : null
-	if (!master_cam)
-		return
-
-	var/synced
-	synced = 0
-	for(var/datum/picture/z in aiCamera.aipictures)
-		if (!(master_cam.aipictures.Find(z)))
-			aiCamera.printpicture(null, z)
-			synced = 1
-	if(synced)
-		src << "<span class='notice'>Locally saved images synced with AI. Images were retained in local database in case of loss of connection with the AI.</span>"
+/mob/living/silicon/robot/proc/photosync()
+	var/obj/item/device/camera/siliconcam/master_cam = connected_ai ? connected_ai.aiCamera : null
+	if (!master_cam)
+		return
+
+	var/synced = 0
+	// Sync borg images to the master AI.
+	// We don't care about syncing the other way around
+	for(var/obj/item/weapon/photo/borg_photo in aiCamera.aipictures)
+		var/copied = 0
+		for(var/obj/item/weapon/photo/ai_photo in master_cam.aipictures)
+			if(borg_photo.id == ai_photo.id)
+				copied = 1
+				break
+		if(!copied)
+			master_cam.injectaialbum(borg_photo.copy(1), " (synced from [name])")
+			synced = 1
+
+	if(synced)
+		src << "<span class='notice'>Images synced with AI. Local images will be retained in the case of loss of connection with the AI.</span>"

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

@@ -159,9 +159,8 @@ var/list/robot_verbs_default = list(
 	connected_ai = select_active_ai_with_fewest_borgs()
 	if(connected_ai)
 		connected_ai.connected_robots += src
-		lawsync()
-		photosync()
 		lawupdate = 1
+		sync()
 	else
 		lawupdate = 0
 
@@ -178,6 +177,10 @@ var/list/robot_verbs_default = list(
 
 	playsound(loc, 'sound/mecha/nominalsyndi.ogg', 75, 0)
 
+/mob/living/silicon/robot/proc/sync()
+	if(lawupdate && connected_ai)
+		lawsync()
+		photosync()
 
 /mob/living/silicon/robot/drain_power(var/drain_check)
 
@@ -1031,10 +1034,10 @@ var/list/robot_verbs_default = list(
 
 
 /mob/living/silicon/robot/Topic(href, href_list)
-	if(usr != src)
-		return
 	if(..())
 		return
+	if(usr != src)
+		return
 
 	if (href_list["showalerts"])
 		robot_alerts()

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

@@ -60,10 +60,8 @@
 			for(var/mob/living/simple_animal/mouse/snack in oview(src))
 				if(isturf(snack.loc) && !snack.stat)
 					movement_target = snack
-					world << "[src]: mouse located."
 					break
 		if(movement_target)
-			world << "[src]: locking on [movement_target]"
 			stop_automated_movement = 1
 			walk_to(src,movement_target,0,3)
 

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

@@ -89,17 +89,17 @@
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
 	if(!Adjacent(target_mob))
 		return
-	//if(isliving(target_mob))
-		//var/mob/living/L = target_mob
-		//L.attack_animal(src)
-		//return L
-	//if(istype(target_mob,/obj/mecha))
-		//var/obj/mecha/M = target_mob
-		//M.attack_animal(src)
-		//return M
-	//if(istype(target_mob,/obj/machinery/bot))
-		//var/obj/machinery/bot/B = target_mob
-		//B.attack_animal(src)
+	if(isliving(target_mob))
+		var/mob/living/L = target_mob
+		L.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+		return L
+	if(istype(target_mob,/obj/mecha))
+		var/obj/mecha/M = target_mob
+		M.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+		return M
+	if(istype(target_mob,/obj/machinery/bot))
+		var/obj/machinery/bot/B = target_mob
+		B.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
 
 /mob/living/simple_animal/hostile/proc/LoseTarget()
 	stance = HOSTILE_STANCE_IDLE
@@ -193,10 +193,10 @@
 /mob/living/simple_animal/hostile/proc/DestroySurroundings()
 	if(prob(break_stuff_probability))
 		for(var/dir in cardinal) // North, South, East, West
-			//for(var/obj/structure/window/obstacle in get_step(src, dir))
-				//if(obstacle.dir == reverse_dir[dir]) // So that windows get smashed in the right order
-					//obstacle.attack_animal(src)
-					//return
-			//var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
-			//if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
-				//obstacle.attack_animal(src)
+			for(var/obj/structure/window/obstacle in get_step(src, dir))
+				if(obstacle.dir == reverse_dir[dir]) // So that windows get smashed in the right order
+					obstacle.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)
+					return
+			var/obj/structure/obstacle = locate(/obj/structure, get_step(src, dir))
+			if(istype(obstacle, /obj/structure/window) || istype(obstacle, /obj/structure/closet) || istype(obstacle, /obj/structure/table) || istype(obstacle, /obj/structure/grille))
+				obstacle.attack_generic(src,rand(melee_damage_lower,melee_damage_upper),attacktext)

code/modules/mob/mob_helpers.dm

@@ -535,7 +535,10 @@ proc/is_blind(A)
 			if(M.mind && M.mind.name)
 				name = M.mind.name
 			if(M.real_name && M.real_name != name)
-				name += " ([M.real_name])"
+				if(name)
+					name += " ([M.real_name])"
+				else
+					name = M.real_name
 		if(!name)
 			name = (C.holder && C.holder.fakekey) ? C.holder.fakekey : C.key
 		if(joined_ghosts)

code/modules/mob/new_player/new_player.dm

@@ -29,11 +29,10 @@
 		output += "<p><a href='byond://?src=\ref[src];show_preferences=1'>Setup Character</A></p>"
 
 		if(!ticker || ticker.current_state <= GAME_STATE_PREGAME)
-			var/readylink = "<a href='byond://?src=\ref[src];ready=[ready ? "2" : "1"]'>[ready ? "Not Ready" : "Ready"]</a>"
 			if(ready)
-				output += "<p>\[ <b>Ready</b> | [readylink] \]</p>"
+				output += "<p>\[ <b>Ready</b> | <a href='byond://?src=\ref[src];ready=0'>Not Ready</a> \]</p>"
 			else
-				output += "<p>\[ [readylink] | <b>Not Ready</b> \]</p>"
+				output += "<p>\[ <a href='byond://?src=\ref[src];ready=1'>Ready</a> | <b>Not Ready</b> \]</p>"
 
 		else
 			output += "<a href='byond://?src=\ref[src];manifest=1'>View the Crew Manifest</A><br><br>"
@@ -99,7 +98,7 @@
 
 		if(href_list["ready"])
 			if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) // Make sure we don't ready up after the round has started
-				ready = !ready
+				ready = text2num(href_list["ready"])
 			else
 				ready = 0
 

code/modules/organs/organ.dm

@@ -104,10 +104,17 @@
 							W.germ_level += 1
 
 /mob/living/carbon/human/proc/handle_stance()
-	if (lying || resting)
-		return // don't need to process any of this if they aren't standing anyways
+	// Don't need to process any of this if they aren't standing anyways
+	// unless their stance is damaged, and we want to check if they should stay down
+	if (!stance_damage && (lying || resting) && (life_tick % 4) == 0)
+		return 
 	
 	stance_damage = 0
+	
+	// Buckled to a bed/chair. Stance damage is forced to 0 since they're sitting on something solid
+	if (istype(buckled, /obj/structure/stool/bed))
+		return
+	
 	for (var/organ in list("l_leg","l_foot","r_leg","r_foot"))
 		var/datum/organ/external/E = organs_by_name[organ]
 		if (E.status & ORGAN_DESTROYED)
@@ -115,9 +122,18 @@
 		else if (E.is_malfunctioning() || (E.is_broken() && !(E.status & ORGAN_SPLINTED)) || !E.is_usable())
 			stance_damage += 1
 
+	// Canes and crutches help you stand (if the latter is ever added)
+	// One cane mitigates a broken leg+foot, or a missing foot.
+	// Two canes are needed for a lost leg. If you are missing both legs, canes aren't gonna help you.
+	if (istype(l_hand, /obj/item/weapon/cane))
+		stance_damage -= 2
+	if (istype(l_hand, /obj/item/weapon/cane))
+		stance_damage -= 2
+
 	// standing is poor
 	if(stance_damage >= 4 || (stance_damage >= 2 && prob(5)))
-		Weaken(5)
-		if(species && !(species.flags & NO_PAIN))
-			emote("scream")
-		emote("collapse")
+		if(!(lying || resting))
+			if(species && !(species.flags & NO_PAIN))
+				emote("scream")
+			custom_emote(1, "collapses!")
+		Weaken(5) //can't emote while weakened, apparently.

code/modules/paperwork/paper.dm

@@ -193,6 +193,10 @@
 	updateinfolinks()
 	update_icon()
 
+/obj/item/weapon/paper/proc/get_signature(var/obj/item/weapon/pen/P, mob/user as mob)
+	if(P)
+		return P.get_signature(user)
+	return (user && user.real_name) ? user.real_name : "Anonymous"
 
 /obj/item/weapon/paper/proc/parsepencode(var/t, var/obj/item/weapon/pen/P, mob/user as mob, var/iscrayon = 0)
 //	t = copytext(sanitize(t),1,MAX_MESSAGE_LEN)
@@ -208,7 +212,7 @@
 	t = replacetext(t, "\[/u\]", "</U>")
 	t = replacetext(t, "\[large\]", "<font size=\"4\">")
 	t = replacetext(t, "\[/large\]", "</font>")
-	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[user ? user.real_name : "Anonymous"]</i></font>")
+	t = replacetext(t, "\[sign\]", "<font face=\"[signfont]\"><i>[get_signature(P, user)]</i></font>")
 	t = replacetext(t, "\[field\]", "<span class=\"paper_field\"></span>")
 
 	t = replacetext(t, "\[h1\]", "<H1>")

code/modules/paperwork/pen.dm

@@ -1,114 +1,140 @@
-/* Pens!
- * Contains:
- *		Pens
- *		Sleepy Pens
- *		Parapens
- */
-
-
-/*
- * Pens
- */
-/obj/item/weapon/pen
-	desc = "It's a normal black ink pen."
-	name = "pen"
-	icon = 'icons/obj/bureaucracy.dmi'
-	icon_state = "pen"
-	item_state = "pen"
-	flags = FPRINT | TABLEPASS
-	slot_flags = SLOT_BELT | SLOT_EARS
-	throwforce = 0
-	w_class = 1.0
-	throw_speed = 7
-	throw_range = 15
-	matter = list("metal" = 10)
-	var/colour = "black"	//what colour the ink is!
-	pressure_resistance = 2
-
-
-/obj/item/weapon/pen/blue
-	desc = "It's a normal blue ink pen."
-	icon_state = "pen_blue"
-	colour = "blue"
-
-/obj/item/weapon/pen/red
-	desc = "It's a normal red ink pen."
-	icon_state = "pen_red"
-	colour = "red"
-
-/obj/item/weapon/pen/invisible
-	desc = "It's an invisble pen marker."
-	icon_state = "pen"
-	colour = "white"
-
-
-/obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
-	if(!ismob(M))
-		return
-	user << "<span class='warning'>You stab [M] with the pen.</span>"
-//	M << "\red You feel a tiny prick!" //That's a whole lot of meta!
-	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
-	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
-	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
-	return
-
-
-/*
- * Sleepy Pens
- */
-/obj/item/weapon/pen/sleepypen
-	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;syndicate=5"
-
-
-/obj/item/weapon/pen/sleepypen/New()
-	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
-	reagents = R
-	R.my_atom = src
-	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
-	..()
-	return
-
-
-/obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
-	if(!(istype(M,/mob)))
-		return
-	..()
-	if(reagents.total_volume)
-		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
-	return
-
-
-/*
- * Parapens
- */
- /obj/item/weapon/pen/paralysis
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
-	slot_flags = SLOT_BELT
-	origin_tech = "materials=2;syndicate=5"
-
-
-/obj/item/weapon/pen/paralysis/attack(mob/living/M as mob, mob/user as mob)
-
-	if(!(istype(M,/mob)))
-		return
-
-	..()
-
-
-	if(M.can_inject(user,1))
-		if(reagents.total_volume)
-			if(M.reagents) reagents.trans_to(M, 50)
-	return
-
-
-/obj/item/weapon/pen/paralysis/New()
-	var/datum/reagents/R = new/datum/reagents(50)
-	reagents = R
-	R.my_atom = src
-	R.add_reagent("zombiepowder", 10)
-	R.add_reagent("cryptobiolin", 15)
-	..()
-	return
+/* Pens!
+ * Contains:
+ *		Pens
+ *		Sleepy Pens
+ *		Parapens
+ */
+
+
+/*
+ * Pens
+ */
+/obj/item/weapon/pen
+	desc = "It's a normal black ink pen."
+	name = "pen"
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "pen"
+	item_state = "pen"
+	flags = FPRINT | TABLEPASS
+	slot_flags = SLOT_BELT | SLOT_EARS
+	throwforce = 0
+	w_class = 1.0
+	throw_speed = 7
+	throw_range = 15
+	matter = list("metal" = 10)
+	var/colour = "black"	//what colour the ink is!
+	pressure_resistance = 2
+
+
+/obj/item/weapon/pen/blue
+	desc = "It's a normal blue ink pen."
+	icon_state = "pen_blue"
+	colour = "blue"
+
+/obj/item/weapon/pen/red
+	desc = "It's a normal red ink pen."
+	icon_state = "pen_red"
+	colour = "red"
+
+/obj/item/weapon/pen/invisible
+	desc = "It's an invisble pen marker."
+	icon_state = "pen"
+	colour = "white"
+
+
+/obj/item/weapon/pen/attack(mob/M as mob, mob/user as mob)
+	if(!ismob(M))
+		return
+	user << "<span class='warning'>You stab [M] with the pen.</span>"
+//	M << "\red You feel a tiny prick!" //That's a whole lot of meta!
+	M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been stabbed with [name]  by [user.name] ([user.ckey])</font>")
+	user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [name] to stab [M.name] ([M.ckey])</font>")
+	msg_admin_attack("[user.name] ([user.ckey]) Used the [name] to stab [M.name] ([M.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[user.x];Y=[user.y];Z=[user.z]'>JMP</a>)")
+	return
+
+
+/*
+ * Sleepy Pens
+ */
+/obj/item/weapon/pen/sleepypen
+	desc = "It's a black ink pen with a sharp point and a carefully engraved \"Waffle Co.\""
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=2;syndicate=5"
+
+
+/obj/item/weapon/pen/sleepypen/New()
+	var/datum/reagents/R = new/datum/reagents(30) //Used to be 300
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("chloralhydrate", 22)	//Used to be 100 sleep toxin//30 Chloral seems to be fatal, reducing it to 22./N
+	..()
+	return
+
+
+/obj/item/weapon/pen/sleepypen/attack(mob/M as mob, mob/user as mob)
+	if(!(istype(M,/mob)))
+		return
+	..()
+	if(reagents.total_volume)
+		if(M.reagents) reagents.trans_to(M, 50) //used to be 150
+	return
+
+
+/*
+ * Parapens
+ */
+ /obj/item/weapon/pen/paralysis
+	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	slot_flags = SLOT_BELT
+	origin_tech = "materials=2;syndicate=5"
+
+
+/obj/item/weapon/pen/paralysis/attack(mob/living/M as mob, mob/user as mob)
+
+	if(!(istype(M,/mob)))
+		return
+
+	..()
+
+
+	if(M.can_inject(user,1))
+		if(reagents.total_volume)
+			if(M.reagents) reagents.trans_to(M, 50)
+	return
+
+
+/obj/item/weapon/pen/paralysis/New()
+	var/datum/reagents/R = new/datum/reagents(50)
+	reagents = R
+	R.my_atom = src
+	R.add_reagent("zombiepowder", 10)
+	R.add_reagent("cryptobiolin", 15)
+	..()
+	return
+
+/*
+ * Chameleon pen
+ */
+/obj/item/weapon/pen/chameleon
+	var/signature = ""
+
+/obj/item/weapon/pen/chameleon/attack_self(mob/user as mob)
+	/*
+	// Limit signatures to official crew members
+	var/personnel_list[] = list()
+	for(var/datum/data/record/t in data_core.locked) //Look in data core locked.
+		personnel_list.Add(t.fields["name"])
+	personnel_list.Add("Anonymous")
+
+	var/new_signature = input("Enter new signature pattern.", "New Signature") as null|anything in personnel_list
+	if(new_signature)
+		signature = new_signature
+	*/
+	signature = trim_strip_html_properly(input("Enter new signature. Leave blank for 'Anonymous'", "New Signature", signature))
+
+/obj/item/weapon/pen/proc/get_signature(var/mob/user)
+	return (user && user.real_name) ? user.real_name : "Anonymous"
+
+/obj/item/weapon/pen/chameleon/get_signature(var/mob/user)
+	return signature ? signature : "Anonymous"

code/modules/paperwork/photocopier.dm

@@ -43,11 +43,11 @@
 	if(href_list["copy"])
 		if(stat & (BROKEN|NOPOWER))
 			return
-		
+
 		for(var/i = 0, i < copies, i++)
 			if(toner <= 0)
 				break
-			
+
 			if (istype(copyitem, /obj/item/weapon/paper))
 				copy(copyitem)
 				sleep(15)
@@ -60,7 +60,7 @@
 			else
 				usr << "<span class='warning'>\The [copyitem] can't be copied by \the [src].</span>"
 				break
-			
+
 			use_power(active_power_usage)
 		updateUsrDialog()
 	else if(href_list["remove"])
@@ -81,19 +81,18 @@
 	else if(href_list["aipic"])
 		if(!istype(usr,/mob/living/silicon)) return
 		if(stat & (BROKEN|NOPOWER)) return
-		
+
 		if(toner >= 5)
 			var/mob/living/silicon/tempAI = usr
 			var/obj/item/device/camera/siliconcam/camera = tempAI.aiCamera
 
 			if(!camera)
 				return
-			var/datum/picture/selection = camera.selectpicture()
+			var/obj/item/weapon/photo/selection = camera.selectpicture()
 			if (!selection)
 				return
 
-			var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc)
-			p.construct(selection)
+			var/obj/item/weapon/photo/p = photocopy(selection)
 			if (p.desc == "")
 				p.desc += "Copied by [tempAI.name]"
 			else
@@ -195,6 +194,7 @@
 
 /obj/machinery/photocopier/proc/photocopy(var/obj/item/weapon/photo/photocopy)
 	var/obj/item/weapon/photo/p = photocopy.copy()
+	p.loc = src.loc
 
 	var/icon/I = icon(photocopy.icon, photocopy.icon_state)
 	if(toner > 10)	//plenty of toner, go straight greyscale
@@ -210,6 +210,7 @@
 	if(toner < 0)
 		toner = 0
 		visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>")
+
 	return p
 
 //If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner
@@ -220,7 +221,7 @@
 			toner = 0
 			visible_message("<span class='notice'>A red light on \the [src] flashes, indicating that it is out of toner.</span>")
 			break
-		
+
 		if(istype(W, /obj/item/weapon/paper))
 			W = copy(W)
 		else if(istype(W, /obj/item/weapon/photo))

code/modules/paperwork/photography.dm

@@ -21,17 +21,23 @@
 /********
 * photo *
 ********/
+var/global/photo_count = 0
+
 /obj/item/weapon/photo
 	name = "photo"
 	icon = 'icons/obj/items.dmi'
 	icon_state = "photo"
 	item_state = "paper"
 	w_class = 2.0
+	var/id
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
 	var/icon/tiny
 	var/photo_size = 3
 
+/obj/item/weapon/photo/New()
+	id = photo_count++
+
 /obj/item/weapon/photo/attack_self(mob/user as mob)
 	user.examinate(src)
 
@@ -270,8 +276,8 @@
 		y_c--
 		x_c = x_c - size
 
-	var/datum/picture/P = createpicture(target, user, turfs, mobs, flag)
-	printpicture(user, P)
+	var/obj/item/weapon/photo/p = createpicture(target, user, turfs, mobs, flag)
+	printpicture(user, p)
 
 /obj/item/device/camera/proc/createpicture(atom/target, mob/user, list/turfs, mobs, flag)
 	var/icon/photoimage = get_icon(turfs, target)
@@ -285,43 +291,37 @@
 	ic.Blend(small_img,ICON_OVERLAY, 10, 13)
 	pc.Blend(tiny_img,ICON_OVERLAY, 12, 19)
 
-	var/datum/picture/P = new()
-	P.fields["name"] = "photo"
-	P.fields["icon"] = ic
-	P.fields["tiny"] = pc
-	P.fields["img"] = photoimage
-	P.fields["desc"] = mobs
-	P.fields["pixel_x"] = rand(-10, 10)
-	P.fields["pixel_y"] = rand(-10, 10)
-	P.fields["size"] = size
-
-	return P
-
-/obj/item/device/camera/proc/printpicture(mob/user, var/datum/picture/P)
-	var/obj/item/weapon/photo/Photo = new/obj/item/weapon/photo()
-	Photo.loc = user.loc
-	if(!user.get_inactive_hand())
-		user.put_in_inactive_hand(Photo)
-	Photo.construct(P)
-
-/obj/item/weapon/photo/proc/construct(var/datum/picture/P)
-	name = P.fields["name"]
-	icon = P.fields["icon"]
-	tiny = P.fields["tiny"]
-	img = P.fields["img"]
-	desc = P.fields["desc"]
-	pixel_x = P.fields["pixel_x"]
-	pixel_y = P.fields["pixel_y"]
-	photo_size = P.fields["size"]
-
-/obj/item/weapon/photo/proc/copy()
-	var/obj/item/weapon/photo/p = new/obj/item/weapon/photo()
-
-	p.icon = icon(icon, icon_state)
-	p.img = icon(img)
-	p.tiny = icon(tiny)
-	p.name = name
-	p.desc = desc
-	p.scribble = scribble
+	var/obj/item/weapon/photo/p = new()
+	p.name = "photo"
+	p.icon = ic
+	p.tiny = pc
+	p.img = photoimage
+	p.desc = mobs
+	p.pixel_x = rand(-10, 10)
+	p.pixel_y = rand(-10, 10)
+	p.photo_size = size
+
+	return p
+
+/obj/item/device/camera/proc/printpicture(mob/user, obj/item/weapon/photo/p)
+	p.loc = user.loc
+	if(!user.get_inactive_hand())
+		user.put_in_inactive_hand(p)
+
+/obj/item/weapon/photo/proc/copy(var/copy_id = 0)
+	var/obj/item/weapon/photo/p = new/obj/item/weapon/photo()
+
+	p.name = name
+	p.icon = icon
+	p.tiny = tiny
+	p.img = img
+	p.desc = desc
+	p.pixel_x = pixel_x
+	p.pixel_y = pixel_y
+	p.photo_size = photo_size
+	p.scribble = scribble
+
+	if(copy_id)
+		p.id = id
 
 	return p

code/modules/paperwork/silicon_photography.dm

@@ -1,10 +1,6 @@
 /**************
 * AI-specific *
 **************/
-/datum/picture
-	var/name = "image"
-	var/list/fields = list()
-
 /obj/item/device/camera/siliconcam
 	var/in_camera_mode = 0
 	var/photos_taken = 0
@@ -19,23 +15,22 @@
 /obj/item/device/camera/siliconcam/drone_camera //currently doesn't offer the verbs, thus cannot be used
 	name = "Drone photo camera"
 
-/obj/item/device/camera/siliconcam/proc/injectaialbum(var/datum/picture/P, var/sufix = "") //stores image information to a list similar to that of the datacore
+/obj/item/device/camera/siliconcam/proc/injectaialbum(obj/item/weapon/photo/p, var/sufix = "") //stores image information to a list similar to that of the datacore
+	p.loc = src
 	photos_taken++
-	P.fields["name"] = "Image [photos_taken][sufix]"
-	var/obj/item/weapon/photo/photo = new
-	photo.construct(P)
-	aipictures += photo
+	p.name = "Image [photos_taken][sufix]"
+	aipictures += p
 
-/obj/item/device/camera/siliconcam/proc/injectmasteralbum(var/datum/picture/P) //stores image information to a list similar to that of the datacore
-	var/mob/living/silicon/robot/C = src.loc
+/obj/item/device/camera/siliconcam/proc/injectmasteralbum(obj/item/weapon/photo/p) //stores image information to a list similar to that of the datacore
+	var/mob/living/silicon/robot/C = usr
 	if(C.connected_ai)
-		var/mob/A = P.fields["author"]
-		C.connected_ai.aiCamera.injectaialbum(P, " (taken by [A.name])")
-		C.connected_ai << "<span class='unconscious'>Image recorded and saved by [name]</span>"
-		usr << "<span class='unconscious'>Image recorded and saved to remote database</span>"	//feedback to the Cyborg player that the picture was taken
+		C.connected_ai.aiCamera.injectaialbum(p.copy(1), " (synced from [C.name])")
+		C.connected_ai << "<span class='unconscious'>Image uploaded by [C.name]</span>"
+		usr << "<span class='unconscious'>Image synced to remote database</span>"	//feedback to the Cyborg player that the picture was taken
 	else
-		injectaialbum(P)
 		usr << "<span class='unconscious'>Image recorded</span>"
+	// Always save locally
+	injectaialbum(p)
 
 /obj/item/device/camera/siliconcam/proc/selectpicture(obj/item/device/camera/siliconcam/cam)
 	if(!cam)
@@ -65,14 +60,14 @@
 	selection.show(usr)
 	usr << selection.desc
 
-/obj/item/device/camera/siliconcam/proc/deletepicture()
-	var/selection = selectpicture()
+/obj/item/device/camera/siliconcam/proc/deletepicture(obj/item/device/camera/siliconcam/cam)
+	var/selection = selectpicture(cam)
 
 	if(!selection)
 		return
 
 	aipictures -= selection
-	usr << "<span class='unconscious'>Image deleted</span>"
+	usr << "<span class='unconscious'>Local image deleted</span>"
 
 /obj/item/device/camera/siliconcam/ai_camera/can_capture_turf(turf/T, mob/user)
 	var/mob/living/silicon/ai = user
@@ -92,12 +87,12 @@
 	src.in_camera_mode = 1
 	usr << "<B>Camera Mode activated</B>"
 
-/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, datum/picture/P)
-	injectaialbum(P)
+/obj/item/device/camera/siliconcam/ai_camera/printpicture(mob/user, obj/item/weapon/photo/p)
+	injectaialbum(p)
 	usr << "<span class='unconscious'>Image recorded</span>"
 
-/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, datum/picture/P)
-	injectmasteralbum(P)
+/obj/item/device/camera/siliconcam/robot_camera/printpicture(mob/user, obj/item/weapon/photo/p)
+	injectmasteralbum(p)
 
 /obj/item/device/camera/siliconcam/ai_camera/verb/take_image()
 	set category = "AI Commands"
@@ -145,19 +140,13 @@
 	set desc = "Delete a local image"
 	set src in usr
 
-	// Explicitly only allow deletion from the local camera
-	var/mob/living/silicon/robot/C = src.loc
-	if(C.connected_ai)
-		C << "Not allowed to delete from the remote database."
-		return
-
-	deletepicture()
+	deletepicture(src)
 
 obj/item/device/camera/siliconcam/proc/getsource()
 	if(istype(src.loc, /mob/living/silicon/ai))
 		return src
 
-	var/mob/living/silicon/robot/C = src.loc
+	var/mob/living/silicon/robot/C = usr
 	var/obj/item/device/camera/siliconcam/Cinfo
 	if(C.connected_ai)
 		Cinfo = C.connected_ai.aiCamera

code/modules/power/apc.dm

@@ -178,6 +178,10 @@
 		del(cell) // qdel
 	if(terminal)
 		disconnect_terminal()
+	
+	//If there's no more APC then there shouldn't be a cause for alarm I guess
+	area.poweralert(1, src) //so that alarms don't go on forever
+	
 	..()
 
 /obj/machinery/power/apc/proc/make_terminal()

code/modules/power/cable.dm

@@ -114,11 +114,8 @@ By design, d1 is the smallest direction and d2 is the highest
 	updateicon()
 
 /obj/structure/cable/proc/updateicon()
-	if(invisibility)
-		icon_state = "[d1]-[d2]-f"
-	else
-		icon_state = "[d1]-[d2]"
-
+	icon_state = "[d1]-[d2]"
+	alpha = invisibility ? 127 : 255
 
 // returns the powernet this cable belongs to
 /obj/structure/cable/proc/get_powernet()			//TODO: remove this as it is obsolete

code/modules/power/smes.dm

@@ -116,7 +116,6 @@
 
 
 /obj/machinery/power/smes/process()
-
 	if(stat & BROKEN)	return
 
 	//store machine state to see if we need to update the icon overlays
@@ -146,7 +145,7 @@
 		add_avail(output_used)				// add output to powernet (smes side)
 
 		if(output_used < 0.0001)			// either from no charge or set to 0
-			outputting = 0
+			outputting(0)
 			investigate_log("lost power and turned <font color='red'>off</font>","singulo")
 	else if(output_attempt && charge > output_level && output_level > 0)
 		outputting = 1
@@ -328,19 +327,8 @@
 	return round(100.0*charge/capacity, 0.1)
 
 /obj/machinery/power/smes/Topic(href, href_list)
-	..()
-
-	if (usr.stat || usr.restrained() )
-		return
-	if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
-		if(!istype(usr, /mob/living/silicon/ai))
-			usr << "\red You don't have the dexterity to do this!"
-			return
-
-//world << "[href] ; [href_list[href]]"
-
-	if (!istype(src.loc, /turf) && !istype(usr, /mob/living/silicon/))
-		return 0 // Do not update ui
+	if(..())
+		return 1
 
 	if( href_list["cmode"] )
 		inputting(!inputting)
@@ -432,4 +420,4 @@
 
 /obj/machinery/power/smes/magical/process()
 	charge = 5000000
-	..()
+	..()

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

@@ -5,7 +5,7 @@
 	id = "methylphenidate"
 	description = "Improves the ability to concentrate."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#BF80BF"
 	custom_metabolism = 0.01
 	data = 0
 
@@ -33,7 +33,7 @@
 	id = "citalopram"
 	description = "Stabilizes the mind a little."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#FF80FF"
 	custom_metabolism = 0.01
 	data = 0
 
@@ -62,7 +62,7 @@
 	id = "paroxetine"
 	description = "Stabilizes the mind greatly, but has a chance of adverse effects."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#FF80BF"
 	custom_metabolism = 0.01
 	data = 0
 

code/modules/reagents/Chemistry-Reagents.dm

@@ -380,7 +380,7 @@ datum
 			id = "inaprovaline"
 			description = "Inaprovaline is a synaptic stimulant and cardiostimulant. Commonly used to stabilize patients."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#00BFFF" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE*2
 			scannable = 1
 
@@ -712,7 +712,7 @@ datum
 			id = "ryetalyn"
 			description = "Ryetalyn can cure all genetic abnomalities via a catalytic process."
 			reagent_state = SOLID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#004000" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
 
 			on_mob_life(var/mob/living/M as mob)
@@ -759,7 +759,7 @@ datum
 			id = "paracetamol"
 			description = "Most probably know this as Tylenol, but this chemical is a mild, simple painkiller."
 			reagent_state = LIQUID
-			color = "#C855DC"
+			color = "#C8A5DC"
 			overdose = 60
 			scannable = 1
 			custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
@@ -775,7 +775,7 @@ datum
 			id = "tramadol"
 			description = "A simple, yet effective painkiller."
 			reagent_state = LIQUID
-			color = "#C8A5DC"
+			color = "#CB68FC"
 			overdose = 30
 			scannable = 1
 			custom_metabolism = 0.025 // Lasts 10 minutes for 15 units
@@ -791,7 +791,7 @@ datum
 			id = "oxycodone"
 			description = "An effective and very addictive painkiller."
 			reagent_state = LIQUID
-			color = "#C805DC"
+			color = "#800080"
 			overdose = 20
 			custom_metabolism = 0.25 // Lasts 10 minutes for 15 units
 
@@ -856,7 +856,7 @@ datum
 			id = "iron"
 			description = "Pure iron is a metal."
 			reagent_state = SOLID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#353535"
 			overdose = REAGENTS_OVERDOSE
 
 		gold
@@ -1015,7 +1015,7 @@ datum
 			id = "cryptobiolin"
 			description = "Cryptobiolin causes confusion and dizzyness."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#000055" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
 
 			on_mob_life(var/mob/living/M as mob)
@@ -1033,7 +1033,7 @@ datum
 			id = "kelotane"
 			description = "Kelotane is a drug used to treat burns."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#FFA800" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
 
@@ -1051,7 +1051,7 @@ datum
 			id = "dermaline"
 			description = "Dermaline is the next step in burn medication. Works twice as good as kelotane and enables the body to restore even the direst heat-damaged tissue."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#FF8000" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE/2
 			scannable = 1
 
@@ -1069,7 +1069,7 @@ datum
 			id = "dexalin"
 			description = "Dexalin is used in the treatment of oxygen deprivation."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#0080FF" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
 
@@ -1092,7 +1092,7 @@ datum
 			id = "dexalinp"
 			description = "Dexalin Plus is used in the treatment of oxygen deprivation. It is highly effective."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#0040FF" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE/2
 			scannable = 1
 
@@ -1115,7 +1115,7 @@ datum
 			id = "tricordrazine"
 			description = "Tricordrazine is a highly potent stimulant, originally derived from cordrazine. Can be used to treat a wide range of injuries."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#8040FF" // rgb: 200, 165, 220
 			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
@@ -1135,7 +1135,7 @@ datum
 			id = "anti_toxin"
 			description = "Dylovene is a broad-spectrum antitoxin."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#00A000" // rgb: 200, 165, 220
 			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob, var/alien)
@@ -1190,13 +1190,13 @@ datum
 						D.cure()
 				..()
 				return
-
 		synaptizine
+
 			name = "Synaptizine"
 			id = "synaptizine"
 			description = "Synaptizine is used to treat various diseases."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#99CCFF" // rgb: 200, 165, 220
 			custom_metabolism = 0.01
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
@@ -1235,7 +1235,7 @@ datum
 			id = "hyronalin"
 			description = "Hyronalin is a medicinal drug used to counter the effect of radiation poisoning."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#408000" // rgb: 200, 165, 220
 			custom_metabolism = 0.05
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
@@ -1251,7 +1251,7 @@ datum
 			id = "arithrazine"
 			description = "Arithrazine is an unstable medication used for the most extreme cases of radiation poisoning."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#008000" // rgb: 200, 165, 220
 			custom_metabolism = 0.05
 			overdose = REAGENTS_OVERDOSE
 
@@ -1271,7 +1271,7 @@ datum
 			id = "alkysine"
 			description = "Alkysine is a drug used to lessen the damage to neurological tissue after a catastrophic injury. Can heal brain tissue."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#FFFF66" // rgb: 200, 165, 220
 			custom_metabolism = 0.05
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
@@ -1309,7 +1309,7 @@ datum
 			id = "peridaxon"
 			description = "Used to encourage recovery of internal organs and nervous systems. Medicate cautiously."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#561EC3" // rgb: 200, 165, 220
 			overdose = 10
 			scannable = 1
 
@@ -1330,7 +1330,7 @@ datum
 			id = "bicaridine"
 			description = "Bicaridine is an analgesic medication and can be used to treat blunt trauma."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#BF0000" // rgb: 200, 165, 220
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
 
@@ -1348,7 +1348,7 @@ datum
 			id = "hyperzine"
 			description = "Hyperzine is a highly effective, long lasting, muscle stimulant."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#FF3300" // rgb: 200, 165, 220
 			custom_metabolism = 0.03
 			overdose = REAGENTS_OVERDOSE/2
 
@@ -1378,7 +1378,7 @@ datum
 			id = "cryoxadone"
 			description = "A chemical mixture with almost magical healing powers. Its main limitation is that the targets body temperature must be under 170K for it to metabolise correctly."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#8080FF" // rgb: 200, 165, 220
 			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
@@ -1396,7 +1396,7 @@ datum
 			id = "clonexadone"
 			description = "A liquid compound similar to that used in the cloning process. Can be used to 'finish' the cloning process when used in conjunction with a cryo tube."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#80BFFF" // rgb: 200, 165, 220
 			scannable = 1
 
 			on_mob_life(var/mob/living/M as mob)
@@ -1443,7 +1443,7 @@ datum
 			id = "spaceacillin"
 			description = "An all-purpose antiviral agent."
 			reagent_state = LIQUID
-			color = "#C8A5DC" // rgb: 200, 165, 220
+			color = "#C1C1C1" // rgb: 200, 165, 220
 			custom_metabolism = 0.01
 			overdose = REAGENTS_OVERDOSE
 			scannable = 1
@@ -1812,7 +1812,7 @@ datum
 			id = "stoxin"
 			description = "An effective hypnotic used to treat insomnia."
 			reagent_state = LIQUID
-			color = "#E895CC" // rgb: 232, 149, 204
+			color = "#009CA8" // rgb: 232, 149, 204
 			toxpwr = 0
 			custom_metabolism = 0.1
 			overdose = REAGENTS_OVERDOSE

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

@@ -313,7 +313,7 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/orange
 	name = "orange"
-	desc = "It's an tangy fruit."
+	desc = "It's a tangy fruit."
 	icon_state = "orange"
 	potency = 20
 	filling_color = "#FAAD28"

code/stylesheet.dm

@@ -1,35 +1,35 @@
 client/script = {"<style>
 body					{font-family: Verdana, sans-serif;}
 
-h1, h2, h3, h4, h5, h6	{color: #0000ff;	font-family: Georgia, Verdana, sans-serif;}
+h1, h2, h3, h4, h5, h6	{color: #0000ff;font-family: Georgia, Verdana, sans-serif;}
 
-em						{font-style: normal;	font-weight: bold;}
+em						{font-style: normal;font-weight: bold;}
 
-.motd					{color: #638500;	font-family: Verdana, sans-serif;}
+.motd					{color: #638500;font-family: Verdana, sans-serif;}
 .motd h1, .motd h2, .motd h3, .motd h4, .motd h5, .motd h6
-						{color: #638500;	text-decoration: underline;}
+						{color: #638500;text-decoration: underline;}
 .motd a, .motd a:link, .motd a:visited, .motd a:active, .motd a:hover
 						{color: #638500;}
 
-.prefix					{					font-weight: bold;}
-.log_message			{color: #789FC7;}
+.prefix					{font-weight: bold;}
+.log_message			{color: #386AFF;	font-weight: bold;}
 
 /* OOC */
-.ooc					{					font-weight: bold;}
+.ooc					{font-weight: bold;}
 .ooc img.text_tag		{width: 32px; height: 10px;}
 
-.ooc .everyone			{color: #1339ac;}	
-.ooc .looc				{color: #46b2b2;}
-.ooc .elevated			{color: #386aff;}
-.ooc .moderator			{color: #386aff;}
-.ooc .developer			{color: #719300;}
-.ooc .admin				{color: #e40045;}
+.ooc .everyone			{color: #002eb8;}
+.ooc .looc				{color: #6699cc;}
+.ooc .elevated			{color: #2e78d9;}
+.ooc .moderator			{color: #184880;}
+.ooc .developer			{color: #1b521f;}
+.ooc .admin				{color: #b82e00;}
 
 /* Admin: Private Messages */
 .pm  .howto				{color: #ff0000;	font-weight: bold;		font-size: 200%;}
 .pm  .in				{color: #ff0000;}
 .pm  .out				{color: #B54A4A;}
-.pm  .other				{color: #498db6;}
+.pm  .other				{color: #164664;}
 
 /* Admin: Channels */
 .mod_channel			{color: #735638;	font-weight: bold;}
@@ -38,44 +38,30 @@ em						{font-style: normal;	font-weight: bold;}
 
 /* Radio: Misc */
 .deadsay				{color: #530FAD;}
+.radio					{color: #008000;}
 .deptradio				{color: #ff00ff;}	/* when all other department colors fail */
 .newscaster				{color: #750000;}
 
 /* Radio Channels */
-/*.radio				{color: #42cc3d;}	We will use the other color for everything, as this is unnecessarily bright */
-.comradio				{color: #5692C7;}
-.airadio				{color: #CA3584;}
-.syndradio				{color: #C7A556;}
-.centradio				{color: #3434EF;}
+.comradio				{color: #193A7A;}
+.syndradio				{color: #6D3F40;}
+.centradio				{color: #5C5C8A;}
+.airadio				{color: #FF00FF;}
 
-.secradio				{color: #EA1E1E;}
-.engradio				{color: #FA7136;}
-.supradio				{color: #B6703D;}
-.medradio				{color: #46C17A;}
-.sciradio				{color: #ad66cc;}
-/*.srvradio				{color: #b4cc66;}	just like .radio */
-
-/* Radio Channels: Message Only */
-.radio					{color: #247D22;}
-.comradio	.message	{color: #2D5B86;}
-.airadio	.message	{color: #9F2B68;}
-.syndradio	.message	{color: #967832;}
-.centradio	.message	{color: #1313E6;}
-
-.secradio	.message	{color: #CB1212;}
-.engradio	.message	{color: #F9540D;}
-.supradio	.message	{color: #965C32;}
-.medradio	.message	{color: #32965C;}
-.sciradio	.message	{color: #923DB6;}
-.srvradio				{color: #8DA637;}
+.secradio				{color: #A30000;}
+.engradio				{color: #A66300;}
+.medradio				{color: #008160;}
+.sciradio				{color: #993399;}
+.supradio				{color: #5F4519;}
+.srvradio				{color: #6eaa2c;}
 
 /* Miscellaneous */
-.name					{					font-weight: bold;}
+.name					{font-weight: bold;}
 .say					{}
 .alert					{color: #ff0000;}
 h1.alert, h2.alert		{color: #000000;}
 
-.emote					{					font-style: italic;}
+.emote					{font-style: italic;}
 
 .attack					{color: #ff0000;}
 .moderate				{color: #CC0000;}

code/world.dm

@@ -6,6 +6,7 @@ var/global/datum/global_init/init = new ()
 /datum/global_init/New()
 
 	makeDatumRefLists()
+	load_configuration()
 
 	del(src)
 
@@ -33,8 +34,8 @@ var/global/datum/global_init/init = new ()
 	if(byond_version < RECOMMENDED_VERSION)
 		world.log << "Your server's byond version does not meet the recommended requirements for this server. Please update BYOND"
 
-	load_configuration()
-
+	config.post_load()
+	
 	if(config && config.server_name != null && config.server_suffix && world.port > 0)
 		// dumb and hardcoded but I don't care~
 		config.server_name += " #[(world.port % 1000) / 100]"
@@ -259,7 +260,7 @@ var/world_topic_spam_protect_time = world.timeofday
 	join_motd = file2text("config/motd.txt")
 
 
-/world/proc/load_configuration()
+/proc/load_configuration()
 	config = new /datum/configuration()
 	config.load("config/config.txt")
 	config.load("config/game_options.txt","game_options")