Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

Conflicts:
	html/changelog.html

code/modules/admin/admin_investigate.dm

@@ -26,12 +26,12 @@
 	F << "<small>[time2text(world.timeofday,"hh:mm")] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"
 
 //ADMINVERBS
-/client/proc/investigate_show( subject in list("hrefs","notes","singulo") )
+/client/proc/investigate_show( subject in list("hrefs","notes","singulo","telesci") )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)	return
 	switch(subject)
-		if("singulo")			//general one-round-only stuff
+		if("singulo", "telesci")			//general one-round-only stuff
 			var/F = investigate_subject2file(subject)
 			if(!F)
 				src << "<font color='red'>Error: admin_investigate: [INVESTIGATE_DIR][subject] is an invalid path or cannot be accessed.</font>"

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

@@ -453,6 +453,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		src << "<span class='warning'>You may only spawn again as a mouse more than [mouse_respawn_time] minutes after your death. You have [timedifference_text] left.</span>"
 		return
 
+	var/response = alert(src, "Are you -sure- you want to become a mouse?","Are you sure you want to squeek?","Squeek!","Nope!")
+	if(response != "Squeek!") return  //Hit the wrong key...again.
+	
+
 	//find a viable mouse candidate
 	var/mob/living/simple_animal/mouse/host
 	var/obj/machinery/atmospherics/unary/vent_pump/vent_found

code/modules/organs/organ_external.dm

@@ -875,8 +875,8 @@ obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
 
 	H.regenerate_icons()
 
-	H.stat = 2
-	H.death()
+	brainmob.stat = 2
+	brainmob.death()
 
 obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
 	brainmob = new(src)

code/modules/paperwork/folders.dm

@@ -61,7 +61,7 @@
 
 		if(href_list["remove"])
 			var/obj/item/P = locate(href_list["remove"])
-			if(P)
+			if(P && P.loc == src)
 				P.loc = usr.loc
 				usr.put_in_hands(P)
 

code/modules/power/apc.dm

@@ -800,7 +800,8 @@
 		if(!can_use(usr, 1))
 			return
 	src.add_fingerprint(usr)
-	usr.set_machine(src)
+	if(usingUI) // If we set their machine and they're not using the UI, it'll cause the UI to pop up.
+		usr.set_machine(src)
 	if (href_list["apcwires"])
 		var/t1 = text2num(href_list["apcwires"])
 		if (!( istype(usr.get_active_hand(), /obj/item/weapon/wirecutters) ))

code/modules/projectiles/targeting.dm

@@ -269,6 +269,7 @@ client/proc/add_gun_icons()
 		screen += usr.gun_run_icon
 
 client/proc/remove_gun_icons()
+	if(isnull(usr)) return 1 // Runtime prevention on N00k agents spawning with SMG
 	screen -= usr.item_use_icon
 	screen -= usr.gun_move_icon
 	if (target_can_move)

code/modules/research/xenoarchaeology/artifact/artifact_unknown.dm

@@ -114,6 +114,11 @@ var/list/valid_secondary_effect_types = list(\
 #define TRIGGER_NITRO 12
 
 /obj/machinery/artifact/process()
+
+	var/turf/L = loc
+	if(isnull(L) || !istype(L)) 	// We're inside a container or on null turf, either way stop processing effects
+		return
+
 	if(my_effect)
 		my_effect.process()
 	if(secondary_effect)

code/modules/telesci/telesci_computer.dm

@@ -84,6 +84,8 @@
 	interact(user)
 
 /obj/machinery/computer/telescience/interact(mob/user)
+	user.machine = src
+	in_use = 1
 
 	var/t = "<div class='statusDisplay'>[temp_msg]</div><BR>"
 	t += "<A href='?src=\ref[src];setrotation=1'>Set Bearing</A>"
@@ -301,9 +303,10 @@
 		temp_msg = "NOTICE:<BR>Bluespace crystals ejected."
 
 	updateDialog()
+	return 1
 
 /obj/machinery/computer/telescience/proc/recalibrate()
 	teles_left = rand(30, 40)
 	angle_off = rand(-25, 25)
 	power_off = rand(-4, 0)
-	rotation_off = rand(-10, 10)
+	rotation_off = rand(-10, 10)