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

Conflicts:
	code/ZAS/Controller.dm
	code/datums/mind.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/brain/posibrain.dm
	code/modules/mob/living/silicon/pai/pai.dm

code/modules/admin/admin_verbs.dm

@@ -177,6 +177,10 @@ var/list/admin_verbs_debug = list(
 	/client/proc/toggledebuglogs,
 	/client/proc/SDQL_query,
 	/client/proc/SDQL2_query,
+	/client/proc/Jump,
+	/client/proc/jumptomob,
+	/client/proc/jumptocoord,
+	/client/proc/dsay
 	)
 
 var/list/admin_verbs_paranoid_debug = list(

code/modules/admin/player_notes.dm

@@ -27,26 +27,6 @@ datum/admins/proc/notes_gethtml(var/ckey)
 			. += "<a href='?src=\ref[src];notes=show;ckey=[dir]'>[dir]</a><br>"
 	return
 
-
-//handles adding notes to the end of a ckey's buffer
-//originally had seperate entries such as var/by to record who left the note and when
-//but the current bansystem is a heap of dung.
-/proc/notes_add(var/ckey, var/note)
-	if(!ckey)
-		ckey = ckey(input(usr,"Who would you like to add notes for?","Enter a ckey",null) as text|null)
-		if(!ckey)	return
-
-	if(!note)
-		note = html_encode(input(usr,"Enter your note:","Enter some text",null) as message|null)
-		if(!note)	return
-
-	var/savefile/notesfile = new(NOTESFILE)
-	if(!notesfile)	return
-	notesfile.cd = "/[ckey]"
-	notesfile.eof = 1		//move to the end of the buffer
-	notesfile << "[time2text(world.realtime,"DD-MMM-YYYY")] | [note][(usr && usr.ckey)?" ~[usr.ckey]":""]"
-	return
-
 //handles removing entries from the buffer, or removing the entire directory if no start_index is given
 /proc/notes_remove(var/ckey, var/start_index, var/end_index)
 	var/savefile/notesfile = new(NOTESFILE)
@@ -85,7 +65,7 @@ datum/admins/proc/notes_gethtml(var/ckey)
 
 //Hijacking this file for BS12 playernotes functions. I like this ^ one systemm alright, but converting sounds too bothersome~ Chinsky.
 
-/proc/notes_add(var/key, var/note, var/mob/usr)
+/proc/notes_add(var/key, var/note, var/mob/user)
 	if (!key || !note)
 		return
 
@@ -111,9 +91,9 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	var/day_loc = findtext(full_date, time2text(world.timeofday, "DD"))
 
 	var/datum/player_info/P = new
-	if (usr)
-		P.author = usr.key
-		P.rank = usr.client.holder.rank
+	if (user)
+		P.author = user.key
+		P.rank = user.client.holder.rank
 	else
 		P.author = "Adminbot"
 		P.rank = "Friendly Robot"
@@ -123,8 +103,8 @@ datum/admins/proc/notes_gethtml(var/ckey)
 	infos += P
 	info << infos
 
-	message_admins("\blue [key_name_admin(usr)] has edited [key]'s notes.")
-	log_admin("[key_name(usr)] has edited [key]'s notes.")
+	message_admins("\blue [key_name_admin(user)] has edited [key]'s notes.")
+	log_admin("[key_name(user)] has edited [key]'s notes.")
 
 	qdel(info)
 

code/modules/admin/topic.dm

@@ -85,6 +85,7 @@
 				banreason = "[banreason] (CUSTOM CID)"
 		else
 			message_admins("Ban process: A mob matching [playermob.ckey] was found at location [playermob.x], [playermob.y], [playermob.z]. Custom ip and computer id fields replaced with the ip and computer id from the located mob")
+		notes_add(playermob.ckey,banreason,usr)
 
 		DB_ban_record(bantype, playermob, banduration, banreason, banjob, null, banckey, banip, bancid )
 
@@ -671,7 +672,7 @@
 							msg = job
 						else
 							msg += ", [job]"
-					notes_add(M.ckey, "Banned  from [msg] - [reason]")
+					notes_add(M.ckey, "Banned  from [msg] - [reason]", usr)
 					message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg] for [mins] minutes", 1)
 					M << "\red<BIG><B>You have been jobbanned by [usr.client.ckey] from: [msg].</B></BIG>"
 					M << "\red <B>The reason is: [reason]</B>"
@@ -692,7 +693,7 @@
 							jobban_fullban(M, job, "[reason]; By [usr.ckey] on [time2text(world.realtime)]")
 							if(!msg)	msg = job
 							else		msg += ", [job]"
-						notes_add(M.ckey, "Banned  from [msg] - [reason]")
+						notes_add(M.ckey, "Banned  from [msg] - [reason]", usr)
 						message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
 						M << "\red<BIG><B>You have been jobbanned by [usr.client.ckey] from: [msg].</B></BIG>"
 						M << "\red <B>The reason is: [reason]</B>"
@@ -746,25 +747,7 @@
 			message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1)
 			//M.client = null
 			qdel(M.client)
-/*
-	//Player Notes
-	else if(href_list["notes"])
-		var/ckey = href_list["ckey"]
-		if(!ckey)
-			var/mob/M = locate(href_list["mob"])
-			if(ismob(M))
-				ckey = M.ckey
 
-		switch(href_list["notes"])
-			if("show")
-				notes_show(ckey)
-			if("add")
-				notes_add(ckey,href_list["text"])
-				notes_show(ckey)
-			if("remove")
-				notes_remove(ckey,text2num(href_list["from"]),text2num(href_list["to"]))
-				notes_show(ckey)
-*/
 	else if(href_list["removejobban"])
 		if(!check_rights(R_BAN))	return
 
@@ -799,6 +782,7 @@
 					return
 				AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins)
 				ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.")
+				notes_add(M.ckey,"[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.",usr)
 				M << "\red<BIG><B>You have been banned by [usr.client.ckey].\nReason: [reason].</B></BIG>"
 				M << "\red This is a temporary ban, it will be removed in [mins] minutes."
 				feedback_inc("ban_tmp",1)
@@ -831,6 +815,7 @@
 				else
 					M << "\red No ban appeals URL has been set."
 				ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.")
+				notes_add(M.ckey,"[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.",usr)
 				log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
 				message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
 				feedback_inc("ban_perma",1)

code/modules/admin/verbs/adminjump.dm

@@ -8,8 +8,7 @@
 	set name = "Jump to Area"
 	set desc = "Area to jump to"
 	set category = "Admin"
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 
 	if(config.allow_admin_jump)
@@ -25,8 +24,7 @@
 /client/proc/jumptoturf(var/turf/T in world)
 	set name = "Jump to Turf"
 	set category = "Admin"
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 	if(config.allow_admin_jump)
 		log_admin("[key_name(usr)] jumped to [T.x],[T.y],[T.z] in [T.loc]")
@@ -42,8 +40,7 @@
 	set category = "Admin"
 	set name = "Jump to Mob"
 
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 
 	if(config.allow_admin_jump)
@@ -65,8 +62,7 @@
 	set category = "Admin"
 	set name = "Jump to Coordinate"
 
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 
 	if (config.allow_admin_jump)
@@ -86,8 +82,7 @@
 	set category = "Admin"
 	set name = "Jump to Key"
 
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 
 	if(config.allow_admin_jump)
@@ -111,8 +106,7 @@
 	set category = "Admin"
 	set name = "Get Mob"
 	set desc = "Mob to teleport"
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 	if(config.allow_admin_jump)
 		log_admin("[key_name(usr)] teleported [key_name(M)]")
@@ -128,8 +122,7 @@
 	set name = "Get Key"
 	set desc = "Key to teleport"
 
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 
 	if(config.allow_admin_jump)
@@ -155,8 +148,7 @@
 /client/proc/sendmob(var/mob/M in sortmobs())
 	set category = "Admin"
 	set name = "Send Mob"
-	if(!check_rights(R_ADMIN))
-		usr << "Only administrators may use this command."
+	if(!check_rights(R_ADMIN|R_MOD|R_DEBUG))
 		return
 	var/area/A = input(usr, "Pick an area.", "Pick an area") in return_sorted_areas()
 	if(A)

code/modules/admin/verbs/deadsay.dm

@@ -18,16 +18,7 @@
 	if (src.handle_spam_prevention(msg,MUTE_DEADCHAT))
 		return
 
-	var/stafftype = null
-
-	if (src.holder.rights & R_MOD)
-		stafftype = "MOD"
-
-	if (src.holder.rights & R_MENTOR)
-		stafftype = "MENTOR"
-
-	if (src.holder.rights & R_ADMIN)
-		stafftype = "ADMIN"
+	var/stafftype = uppertext(holder.rank)
 
 	msg = sanitize(msg)
 	log_admin("[key_name(src)] : [msg]")

code/modules/hydroponics/_hydro_setup.dm

@@ -55,4 +55,5 @@
 #define TRAIT_PRODUCT_COLOUR       35
 #define TRAIT_BIOLUM               36
 #define TRAIT_BIOLUM_COLOUR        37
-#define TRAIT_IMMUTABLE            38
+#define TRAIT_IMMUTABLE            38
+#define TRAIT_FLESH_COLOUR         39

code/modules/hydroponics/grown.dm

@@ -167,8 +167,8 @@
 			return
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/throw_impact(atom/hit_atom)
-	..()
 	if(seed) seed.thrown_at(src,hit_atom)
+	..()
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/attackby(var/obj/item/weapon/W, var/mob/user)
 
@@ -194,9 +194,11 @@
 			else if(seed.chems)
 				if(istype(W,/obj/item/weapon/material/hatchet) && !isnull(seed.chems["woodpulp"]))
 					user.show_message("<span class='notice'>You make planks out of \the [src]!</span>", 1)
+					var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
+					if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
 					for(var/i=0,i<2,i++)
 						var/obj/item/stack/material/wood/NG = new (user.loc)
-						NG.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
+						if(flesh_colour) NG.color = flesh_colour
 						for (var/obj/item/stack/material/wood/G in user.loc)
 							if(G==NG)
 								continue
@@ -221,6 +223,15 @@
 					new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
 					qdel(src)
 					return
+				else if(seed.get_trait(TRAIT_FLESH_COLOUR))
+					user << "You slice up \the [src]."
+					var/slices = rand(3,5)
+					var/reagents_to_transfer = round(reagents.total_volume/slices)
+					for(var/i=i;i<=slices;i++)
+						var/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/F = new(get_turf(src),seed)
+						if(reagents_to_transfer) reagents.trans_to_obj(F,reagents_to_transfer)
+					qdel(src)
+					return
 	..()
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/attack(var/mob/living/carbon/M, var/mob/user, var/def_zone)
@@ -301,9 +312,11 @@
 
 	if(seed.kitchen_tag == "grass")
 		user.show_message("<span class='notice'>You make a grass tile out of \the [src]!</span>", 1)
+		var/flesh_colour = seed.get_trait(TRAIT_FLESH_COLOUR)
+		if(!flesh_colour) flesh_colour = seed.get_trait(TRAIT_PRODUCT_COLOUR)
 		for(var/i=0,i<2,i++)
 			var/obj/item/stack/tile/grass/G = new (user.loc)
-			G.color = seed.get_trait(TRAIT_PRODUCT_COLOUR)
+			if(flesh_colour) G.color = flesh_colour
 			for (var/obj/item/stack/tile/grass/NG in user.loc)
 				if(G==NG)
 					continue
@@ -358,3 +371,35 @@
 
 /obj/item/weapon/reagent_containers/food/snacks/grown/ambrosiavulgaris
 	plantname = "ambrosia"
+
+/obj/item/weapon/reagent_containers/food/snacks/fruit_slice
+	name = "fruit slice"
+	desc = "A slice of some tasty fruit."
+	icon = 'icons/obj/hydroponics_misc.dmi'
+	icon_state = ""
+
+var/list/fruit_icon_cache = list()
+
+/obj/item/weapon/reagent_containers/food/snacks/fruit_slice/New(var/newloc, var/datum/seed/S)
+	..(newloc)
+	// Need to go through and make a general image caching controller. Todo.
+	if(!istype(S))
+		qdel(src)
+		return
+
+	name = "[S.seed_name] slice"
+	desc = "A slice of \a [S.seed_name]. Tasty, probably."
+
+	var/rind_colour = S.get_trait(TRAIT_PRODUCT_COLOUR)
+	var/flesh_colour = S.get_trait(TRAIT_FLESH_COLOUR)
+	if(!flesh_colour) flesh_colour = rind_colour
+	if(!fruit_icon_cache["rind-[rind_colour]"])
+		var/image/I = image(icon,"fruit_rind")
+		I.color = rind_colour
+		fruit_icon_cache["rind-[rind_colour]"] = I
+	overlays |= fruit_icon_cache["rind-[rind_colour]"]
+	if(!fruit_icon_cache["slice-[rind_colour]"])
+		var/image/I = image(icon,"fruit_slice")
+		I.color = flesh_colour
+		fruit_icon_cache["slice-[rind_colour]"] = I
+	overlays |= fruit_icon_cache["slice-[rind_colour]"]

code/modules/hydroponics/seed.dm

@@ -169,8 +169,9 @@
 				if(get_trait(TRAIT_BIOLUM_COLOUR))
 					clr = get_trait(TRAIT_BIOLUM_COLOUR)
 				splat.set_light(get_trait(TRAIT_BIOLUM), l_color = clr)
-			if(get_trait(TRAIT_PRODUCT_COLOUR))
-				splat.color = get_trait(TRAIT_PRODUCT_COLOUR)
+			var/flesh_colour = get_trait(TRAIT_FLESH_COLOUR)
+			if(!flesh_colour) flesh_colour = get_trait(TRAIT_PRODUCT_COLOUR)
+			if(flesh_colour) splat.color = get_trait(TRAIT_PRODUCT_COLOUR)
 
 	if(chems)
 		for(var/mob/living/M in T.contents)
@@ -229,7 +230,8 @@
 			for(var/mob/living/M in T.contents)
 				apply_special_effect(M)
 			splatter(T,thrown)
-		origin_turf.visible_message("<span class='danger'>The [thrown.name] explodes!</span>")
+		if(origin_turf)
+			origin_turf.visible_message("<span class='danger'>The [thrown.name] explodes!</span>")
 		qdel(thrown)
 		return
 
@@ -242,7 +244,8 @@
 
 	if(get_trait(TRAIT_JUICY) && splatted)
 		splatter(origin_turf,thrown)
-		origin_turf.visible_message("<span class='danger'>The [thrown.name] splatters against [target]!</span>")
+		if(origin_turf)
+			origin_turf.visible_message("<span class='danger'>The [thrown.name] splatters against [target]!</span>")
 		qdel(thrown)
 
 /datum/seed/proc/handle_environment(var/turf/current_turf, var/datum/gas_mixture/environment, var/light_supplied, var/check_only)
@@ -637,7 +640,7 @@
 		if(GENE_STRUCTURE)
 			traits_to_copy = list(TRAIT_PLANT_ICON,TRAIT_PRODUCT_ICON,TRAIT_HARVEST_REPEAT)
 		if(GENE_FRUIT)
-			traits_to_copy = list(TRAIT_STINGS,TRAIT_EXPLOSIVE,TRAIT_JUICY)
+			traits_to_copy = list(TRAIT_STINGS,TRAIT_EXPLOSIVE,TRAIT_FLESH_COLOUR,TRAIT_JUICY)
 		if(GENE_SPECIAL)
 			traits_to_copy = list(TRAIT_TELEPORTING)
 

code/modules/hydroponics/seed_datums.dm

@@ -244,6 +244,7 @@
 	set_trait(TRAIT_PRODUCT_ICON,"apple")
 	set_trait(TRAIT_PRODUCT_COLOUR,"#FF540A")
 	set_trait(TRAIT_PLANT_ICON,"tree2")
+	set_trait(TRAIT_FLESH_COLOUR,"#E8E39B")
 
 /datum/seed/apple/poison
 	name = "poisonapple"
@@ -804,6 +805,7 @@
 	set_trait(TRAIT_PRODUCT_COLOUR,"#326B30")
 	set_trait(TRAIT_PLANT_COLOUR,"#257522")
 	set_trait(TRAIT_PLANT_ICON,"vine2")
+	set_trait(TRAIT_FLESH_COLOUR,"#F22C2C")
 
 /datum/seed/pumpkin
 	name = "pumpkin"
@@ -842,6 +844,7 @@
 	set_trait(TRAIT_PRODUCT_ICON,"treefruit")
 	set_trait(TRAIT_PRODUCT_COLOUR,"#3AF026")
 	set_trait(TRAIT_PLANT_ICON,"tree")
+	set_trait(TRAIT_FLESH_COLOUR,"#3AF026")
 
 /datum/seed/citrus/lemon
 	name = "lemon"
@@ -854,6 +857,7 @@
 	..()
 	set_trait(TRAIT_PRODUCES_POWER,1)
 	set_trait(TRAIT_PRODUCT_COLOUR,"#F0E226")
+	set_trait(TRAIT_FLESH_COLOUR,"#F0E226")
 
 /datum/seed/citrus/orange
 	name = "orange"
@@ -865,6 +869,7 @@
 /datum/seed/citrus/orange/New()
 	..()
 	set_trait(TRAIT_PRODUCT_COLOUR,"#FFC20A")
+	set_trait(TRAIT_FLESH_COLOUR,"#FFC20A")
 
 /datum/seed/grass
 	name = "grass"

code/modules/hydroponics/spreading/spreading.dm

@@ -196,16 +196,19 @@
 		layer = 3
 		density = 0
 
-/obj/effect/plant/proc/calc_dir(turf/location = loc)
+/obj/effect/plant/proc/calc_dir()
 	set background = 1
+	var/turf/T = get_turf(src)
+	if(!istype(T)) return
+
 	var/direction = 16
 
 	for(var/wallDir in cardinal)
-		var/turf/newTurf = get_step(location,wallDir)
+		var/turf/newTurf = get_step(T,wallDir)
 		if(newTurf.density)
 			direction |= wallDir
 
-	for(var/obj/effect/plant/shroom in location)
+	for(var/obj/effect/plant/shroom in T.contents)
 		if(shroom == src)
 			continue
 		if(shroom.floor) //special

code/modules/materials/material_sheets.dm

@@ -47,6 +47,19 @@
 		return 0
 	..(S,tamount,1)
 
+/obj/item/stack/material/attack_self(var/mob/user)
+	if(!material.build_windows(user, src))
+		..()
+
+/obj/item/stack/material/attackby(var/obj/item/W, var/mob/user)
+	if(istype(W,/obj/item/stack/cable_coil))
+		material.build_wired_product(user, W, src)
+		return
+	else if(istype(W, /obj/item/stack/rods))
+		material.build_rod_product(user, W, src)
+		return
+	return ..()
+
 /obj/item/stack/material/iron
 	name = "iron"
 	icon_state = "sheet-silver"
@@ -75,7 +88,7 @@
 	default_type = "phoron"
 
 /obj/item/stack/material/plastic
-	name = "Plastic"
+	name = "plastic"
 	icon_state = "sheet-plastic"
 	default_type = "plastic"
 
@@ -151,3 +164,27 @@
 	singular_name = "leather piece"
 	icon_state = "sheet-leather"
 	default_type = "leather"
+
+/obj/item/stack/material/glass
+	name = "glass"
+	singular_name = "glass sheet"
+	icon_state = "sheet-glass"
+	default_type = "glass"
+
+/obj/item/stack/material/glass/reinforced
+	name = "reinforced glass"
+	singular_name = "reinforced glass sheet"
+	icon_state = "sheet-rglass"
+	default_type = "reinforced glass"
+
+/obj/item/stack/material/glass/phoronglass
+	name = "phoron glass"
+	singular_name = "phoron glass sheet"
+	icon_state = "sheet-phoronglass"
+	default_type = "phoron glass"
+
+/obj/item/stack/material/glass/phoronrglass
+	name = "reinforced phoron glass"
+	singular_name = "reinforced phoron glass sheet"
+	icon_state = "sheet-phoronrglass"
+	default_type = "reinforced phoron glass"

code/modules/materials/material_synth.dm

@@ -13,20 +13,26 @@
 		matter = null
 
 /obj/item/stack/material/cyborg/plastic
+	icon_state = "sheet-plastic"
 	default_type = "plastic"
 
 /obj/item/stack/material/cyborg/steel
+	icon_state = "sheet-metal"
 	default_type = "steel"
 
 /obj/item/stack/material/cyborg/plasteel
+	icon_state = "sheet-plasteel"
 	default_type = "plasteel"
 
 /obj/item/stack/material/cyborg/wood
+	icon_state = "sheet-wood"
 	default_type = "wood"
 
 /obj/item/stack/material/cyborg/glass
+	icon_state = "sheet-glass"
 	default_type = "glass"
 
 /obj/item/stack/material/cyborg/glass/reinforced
+	icon_state = "sheet-rglass"
 	default_type = "reinforced glass"
 	charge_costs = list(500, 1000)

code/modules/materials/materials.dm

@@ -76,6 +76,12 @@ var/list/name_to_material
 	var/conductive = 1           // Objects with this var add CONDUCTS to flags on spawn.
 	var/list/composite_material  // If set, object matter var will be a list containing these values.
 
+	// Placeholder vars for the time being, todo properly integrate windows/light tiles/rods.
+	var/created_window
+	var/rod_product
+	var/wire_product
+	var/list/window_options = list()
+
 	// Damage values.
 	var/hardness = 60            // Prob of wall destruction by hulk, used for edge damage in weapons.
 	var/weight = 20              // Determines blunt damage/throwforce for weapons.
@@ -89,6 +95,37 @@ var/list/name_to_material
 	// Wallrot crumble message.
 	var/rotting_touch_message = "crumbles under your touch"
 
+// Placeholders for light tiles and rglass.
+/material/proc/build_rod_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
+	if(!rod_product)
+		user << "<span class='warning'>You cannot make anything out of \the [target_stack]</span>"
+		return
+	if(used_stack.get_amount() < 1 || target_stack.get_amount() < 1)
+		user << "<span class='warning'>You need one rod and one sheet of [display_name] to make anything useful.</span>"
+		return
+	used_stack.use(1)
+	target_stack.use(1)
+	var/obj/item/stack/S = new rod_product(get_turf(user))
+	S.add_fingerprint(user)
+	S.add_to_stacks(user)
+	if(!(user.l_hand && user.r_hand))
+		user.put_in_hands(S)
+
+/material/proc/build_wired_product(var/mob/user, var/obj/item/stack/used_stack, var/obj/item/stack/target_stack)
+	if(!wire_product)
+		user << "<span class='warning'>You cannot make anything out of \the [target_stack]</span>"
+		return
+	if(used_stack.get_amount() < 5 || target_stack.get_amount() < 1)
+		user << "<span class='warning'>You need five wires and one sheet of [display_name] to make anything useful.</span>"
+		return
+
+	used_stack.use(5)
+	target_stack.use(1)
+	user << "<span class='notice'>You attach wire to the [name].</span>"
+	var/obj/item/product = new wire_product(get_turf(user))
+	if(!(user.l_hand && user.r_hand))
+		user.put_in_hands(product)
+
 // Make sure we have a display name and shard icon even if they aren't explicitly set.
 /material/New()
 	..()
@@ -99,6 +136,10 @@ var/list/name_to_material
 	if(!shard_icon)
 		shard_icon = shard_type
 
+// This is a placeholder for proper integration of windows/windoors into the system.
+/material/proc/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
+	return 0
+
 // Weapons handle applying a divisor for this value locally.
 /material/proc/get_blunt_damage()
 	return weight //todo
@@ -271,7 +312,7 @@ var/list/name_to_material
 	hardness = 80
 	weight = 23
 	stack_origin_tech = list(TECH_MATERIAL = 2)
-	composite_material = list() //todo
+	composite_material = list(DEFAULT_WALL_MATERIAL = 3750, "platinum" = 3750) //todo
 
 /material/glass
 	name = "glass"
@@ -286,21 +327,82 @@ var/list/name_to_material
 	weight = 15
 	door_icon_base = "stone"
 	destruction_desc = "shatters"
+	window_options = list("One Direction", "Full Window")
+	created_window = /obj/structure/window/basic
+	wire_product = /obj/item/stack/light_w
+	rod_product = /obj/item/stack/material/glass/reinforced
 
-/material/glass/phoron
-	name = "phoron glass"
-	stack_type = /obj/item/stack/material/glass/phoronglass
-	flags = MATERIAL_BRITTLE
-	ignition_point = 300
-	integrity = 200 // idk why but phoron windows are strong, so.
-	icon_colour = "#FC2BC5"
-	stack_origin_tech = list(TECH_MATERIAL = 3, TECH_PHORON = 2)
+/material/glass/build_windows(var/mob/living/user, var/obj/item/stack/used_stack)
 
-/material/glass/phoron/reinforced
-	name = "reinforced phoron glass"
-	stack_type = /obj/item/stack/material/glass/phoronrglass
-	stack_origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 2)
-	composite_material = list() //todo
+	if(!user || !used_stack || !created_window || !window_options.len)
+		return 0
+
+	if(!user.IsAdvancedToolUser())
+		user << "<span class='warning'>This task is too complex for your clumsy hands.</span>"
+		return 1
+
+	var/turf/T = user.loc
+	if(!istype(T))
+		user << "<span class='warning'>You must be standing on open flooring to build a window.</span>"
+		return 1
+
+	var/title = "Sheet-[used_stack.name] ([used_stack.get_amount()] sheet\s left)"
+	var/choice = input(title, "What would you like to construct?") as null|anything in window_options
+
+	if(!choice || !used_stack || !user || used_stack.loc != user || user.stat || user.loc != T)
+		return 1
+
+	// Get data for building windows here.
+	var/list/possible_directions = cardinal.Copy()
+	var/window_count = 0
+	for (var/obj/structure/window/check_window in user.loc)
+		window_count++
+		possible_directions  -= check_window.dir
+
+	// Get the closest available dir to the user's current facing.
+	var/build_dir = SOUTHWEST //Default to southwest for fulltile windows.
+	var/failed_to_build
+
+	if(window_count >= 4)
+		failed_to_build = 1
+	else
+		if(choice in list("One Direction","Windoor"))
+			if(possible_directions.len)
+				for(var/direction in list(user.dir, turn(user.dir,90), turn(user.dir,180), turn(user.dir,270) ))
+					if(direction in possible_directions)
+						build_dir = direction
+						break
+			else
+				failed_to_build = 1
+			if(!failed_to_build && choice == "Windoor")
+				if(!is_reinforced())
+					user << "<span class='warning'>This material is not reinforced enough to use for a door.</span>"
+					return
+				if((locate(/obj/structure/windoor_assembly) in T.contents) || (locate(/obj/machinery/door/window) in T.contents))
+					failed_to_build = 1
+	if(failed_to_build)
+		user << "<span class='warning'>There is no room in this location.</span>"
+		return 1
+
+	var/build_path = /obj/structure/windoor_assembly
+	var/sheets_needed = 4
+	if(choice == "Windoor")
+		sheets_needed = 5
+		build_dir = user.dir
+	else
+		build_path = created_window
+
+	if(used_stack.get_amount() < sheets_needed)
+		user << "<span class='warning'>You need at least [sheets_needed] sheets to build this.</span>"
+		return 1
+
+	// Build the structure and update sheet count etc.
+	used_stack.use(sheets_needed)
+	new build_path(T, build_dir, 1)
+	return 1
+
+/material/glass/proc/is_reinforced()
+	return (hardness > 35) //todo
 
 /material/glass/reinforced
 	name = "reinforced glass"
@@ -313,8 +415,36 @@ var/list/name_to_material
 	tableslam_noise = 'sound/effects/Glasshit.ogg'
 	hardness = 40
 	weight = 30
+	stack_origin_tech = "materials=2"
+	composite_material = list(DEFAULT_WALL_MATERIAL = 1875,"glass" = 3750)
+	window_options = list("One Direction", "Full Window", "Windoor")
+	created_window = /obj/structure/window/reinforced
+	wire_product = null
+	rod_product = null
+
+/material/glass/phoron
+	name = "phoron glass"
+	stack_type = /obj/item/stack/material/glass/phoronglass
+	flags = MATERIAL_BRITTLE
+	ignition_point = 300
+	integrity = 200 // idk why but phoron windows are strong, so.
+	icon_colour = "#FC2BC5"
+	stack_origin_tech = list(TECH_MATERIAL = 3, TECH_PHORON = 2)
+	created_window = /obj/structure/window/phoronbasic
+	wire_product = null
+	rod_product = /obj/item/stack/material/glass/phoronrglass
+
+/material/glass/phoron/reinforced
+	name = "reinforced phoron glass"
+	stack_type = /obj/item/stack/material/glass/phoronrglass
+	stack_origin_tech = list(TECH_MATERIAL = 4, TECH_PHORON = 2)
+	composite_material = list() //todo
+	created_window = /obj/structure/window/phoronreinforced
+	hardness = 40
+	weight = 30
 	stack_origin_tech = list(TECH_MATERIAL = 2)
 	composite_material = list() //todo
+	rod_product = null
 
 /material/plastic
 	name = "plastic"

code/modules/mob/freelook/mask/update_triggers.dm

@@ -35,7 +35,7 @@
 		cultnet.updateVisibility(src, 0)
 
 /mob/living/death(gibbed, deathmessage="seizes up and falls limp...")
-	if(..())
+	if(..(gibbed, deathmessage))
 		// If true, the mob went from living to dead (assuming everyone has been overriding as they should...)
 		cultnet.updateVisibility(src)
 

code/modules/mob/living/carbon/brain/posibrain.dm

@@ -53,6 +53,29 @@
 	if(!searching || (src.brainmob && src.brainmob.key))
 		return
 	searching = 0
+/obj/item/device/mmi/digital/posibrain/proc/transfer_personality(var/mob/candidate)
+	announce_ghost_joinleave(candidate, 0, "They are occupying a positronic brain now.")
+	src.searching = 0
+	src.brainmob.mind = candidate.mind
+	src.brainmob.ckey = candidate.ckey
+	src.brainmob.mind.reset()
+	src.name = "positronic brain ([src.brainmob.name])"
+	src.brainmob << "<b>You are a positronic brain, brought into existence on [station_name()].</b>"
+	src.brainmob << "<b>As a synthetic intelligence, you answer to all crewmembers, as well as the AI.</b>"
+	src.brainmob << "<b>Remember, the purpose of your existence is to serve the crew and the station. Above all else, do no harm.</b>"
+	src.brainmob << "<b>Use say :b to speak to other artificial intelligences.</b>"
+	src.brainmob.mind.assigned_role = "Positronic Brain"
+
+	var/turf/T = get_turf_or_move(src.loc)
+	for (var/mob/M in viewers(T))
+		M.show_message("\blue The positronic brain chimes quietly.")
+	icon_state = "posibrain-occupied"
+
+/obj/item/device/mmi/digital/posibrain/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer.
+
+	if(src.brainmob && src.brainmob.key) return
+
+	src.searching = 0
 	icon_state = "posibrain"
 	var/turf/T = get_turf(src)
 	T.visible_message("<span class='notice'>\The [src] brain buzzes quietly, and the golden lights fade away. Perhaps you could try again?</span>")

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

@@ -186,6 +186,19 @@
 	src.reset_view(C)
 	return 1
 
+/mob/living/silicon/pai/verb/reset_record_view()
+	set category = "pAI Commands"
+	set name = "Reset Records Software"
+
+	securityActive1 = null
+	securityActive2 = null
+	security_cannotfind = 0
+	medicalActive1 = null
+	medicalActive2 = null
+	medical_cannotfind = 0
+	nanomanager.update_uis(src)
+	usr << "<span class='notice'>You reset your record-viewing software.</span>"
+
 /mob/living/silicon/pai/cancel_camera()
 	set category = "pAI Commands"
 	set name = "Cancel Camera View"

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

@@ -295,7 +295,7 @@
 	if(!O.force)
 		visible_message("<span class='notice'>[user] gently taps [src] with \the [O].</span>")
 		return
-	
+
 	if(O.force > resistance)
 		var/damage = O.force
 		if (O.damtype == HALLOSS)
@@ -306,8 +306,8 @@
 		adjustBruteLoss(damage)
 	else
 		usr << "<span class='danger>This weapon is ineffective, it does no damage.</span>"
-	
-	visible_message("<span class='danger>[src] has been attacked with the [O] by [user].</span>")
+
+	visible_message("<span class='danger'>\The [src] has been attacked with the [O] by [user].</span>")
 	user.do_attack_animation(src)
 
 /mob/living/simple_animal/movement_delay()
@@ -327,10 +327,10 @@
 	if(statpanel("Status") && show_stat_health)
 		stat(null, "Health: [round((health / maxHealth) * 100)]%")
 
-/mob/living/simple_animal/death(gibbed, deathmessage="")
+/mob/living/simple_animal/death(gibbed, deathmessage = "dies!")
 	icon_state = icon_dead
 	density = 0
-	return ..()
+	return ..(gibbed,deathmessage)
 
 /mob/living/simple_animal/ex_act(severity)
 	if(!blinded)

code/modules/mob/mob.dm

@@ -376,7 +376,8 @@
 		return
 
 	M.key = key
-//	M.Login()	//wat
+	if(M.mind)
+		M.mind.reset()
 	return
 
 /client/verb/changes()

code/modules/organs/organ.dm

@@ -26,6 +26,27 @@ var/list/organ_cache = list()
 	var/datum/dna/dna
 	var/datum/species/species
 
+/obj/item/organ/Destroy()
+	if(!owner)
+		return ..()
+
+	if((owner.internal_organs) && (src in owner.internal_organs))
+		owner.internal_organs -= src
+
+	if((owner.internal_organs_by_name) && (src in owner.internal_organs_by_name))
+		owner.internal_organs_by_name -= src
+
+	if((owner.organs) && (src in owner.organs))
+		owner.organs -= src
+
+	if((owner.organs_by_name) && (src in owner.organs_by_name))
+		owner.organs_by_name -= src
+
+	if(src in owner.contents)
+		owner.contents -= src
+
+	return ..()
+
 /obj/item/organ/proc/update_health()
 	return
 

code/modules/organs/organ_external.dm

@@ -51,6 +51,20 @@
 	var/can_grasp
 	var/can_stand
 
+/obj/item/organ/external/Destroy()
+	if(parent && parent.children)
+		parent.children -= src
+
+	if(children)
+		for(var/obj/item/organ/external/C in children)
+			qdel(C)
+
+	if(internal_organs)
+		for(var/obj/item/organ/O in internal_organs)
+			qdel(O)
+
+	return ..()
+
 /obj/item/organ/external/attack_self(var/mob/user)
 	if(!contents.len)
 		return ..()

code/modules/power/breaker_box.dm

@@ -19,6 +19,11 @@
 	var/RCon_tag = "NO_TAG"
 	var/update_locked = 0
 
+/obj/machinery/power/breakerbox/Destroy()
+	..()
+	for(var/obj/nano_module/rcon/R in world)
+		R.FindDevices()
+
 /obj/machinery/power/breakerbox/activated
 	icon_state = "bbox_on"
 

code/modules/power/power.dm

@@ -17,6 +17,8 @@
 
 /obj/machinery/power/Destroy()
 	disconnect_from_network()
+	disconnect_terminal()
+
 	..()
 
 ///////////////////////////////

code/modules/power/smes.dm

@@ -84,10 +84,12 @@
 	return
 
 
-/obj/machinery/power/smes/Destroy()
+/obj/machinery/power/smes/disconnect_terminal()
 	if(terminal)
-		disconnect_terminal()
-	..()
+		terminal.master = null
+		terminal = null
+		return 1
+	return 0
 
 /obj/machinery/power/smes/update_icon()
 	overlays.Cut()

code/modules/power/smes_construction.dm

@@ -75,6 +75,13 @@
 	charge = 0
 	should_be_mapped = 1
 
+/obj/machinery/power/smes/buildable/Destroy()
+	..()
+	qdel(wires)
+	for(var/obj/nano_module/rcon/R in world)
+		R.FindDevices()
+
+
 // Proc: process()
 // Parameters: None
 // Description: Uses parent process, but if grounding wire is cut causes sparks to fly around.
@@ -343,6 +350,7 @@
 				M.icon_state = "box_1"
 				for(var/obj/I in component_parts)
 					I.loc = src.loc
+					component_parts -= I
 				qdel(src)
 				return