Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into outpost-power

2026-08-26 13:39:16 +01:00 · 2015-02-11 01:49:06 +01:00
parent 460578b6c7 d1de94c70e
commit 89496ce927
79 changed files with 3332 additions and 2581 deletions
@@ -375,88 +375,88 @@ var/global/list/gear_datums = list()

 /datum/gear/armband_cargo
 	display_name = "armband, cargo"
-	path = /obj/item/clothing/tie/armband/cargo
+	path = /obj/item/clothing/accessory/armband/cargo
 	slot = slot_tie
 	cost = 1

 /datum/gear/armband_emt
 	display_name = "armband, EMT"
-	path = /obj/item/clothing/tie/armband/medgreen
+	path = /obj/item/clothing/accessory/armband/medgreen
 	slot = slot_tie
 	cost = 2

 /datum/gear/armband_engineering
 	display_name = "armband, engineering"
-	path = /obj/item/clothing/tie/armband/engine
+	path = /obj/item/clothing/accessory/armband/engine
 	slot = slot_tie
 	cost = 1

 /datum/gear/armband_hydroponics
 	display_name = "armband, hydroponics"
-	path = /obj/item/clothing/tie/armband/hydro
+	path = /obj/item/clothing/accessory/armband/hydro
 	slot = slot_tie
 	cost = 1

 /datum/gear/armband_medical
 	display_name = "armband, medical"
-	path = /obj/item/clothing/tie/armband/med
+	path = /obj/item/clothing/accessory/armband/med
 	slot = slot_tie
 	cost = 1

 /datum/gear/armband
 	display_name = "armband, red"
-	path = /obj/item/clothing/tie/armband
+	path = /obj/item/clothing/accessory/armband
 	slot = slot_tie
 	cost = 1

 /datum/gear/armband_science
 	display_name = "armband, science"
-	path = /obj/item/clothing/tie/armband/science
+	path = /obj/item/clothing/accessory/armband/science
 	slot = slot_tie
 	cost = 1

 /datum/gear/armpit
 	display_name = "shoulder holster"
-	path = /obj/item/clothing/tie/holster/armpit
+	path = /obj/item/clothing/accessory/holster/armpit
 	slot = slot_tie
 	cost = 2
 	allowed_roles = list("Captain", "Head of Personnel", "Security Officer", "Warden", "Head of Security")

 /datum/gear/tie_blue
 	display_name = "tie, blue"
-	path = /obj/item/clothing/tie/blue
+	path = /obj/item/clothing/accessory/blue
 	slot = slot_tie
 	cost = 1

 /datum/gear/tie_red
 	display_name = "tie, red"
-	path = /obj/item/clothing/tie/red
+	path = /obj/item/clothing/accessory/red
 	slot = slot_tie
 	cost = 1

 /datum/gear/tie_horrible
 	display_name = "tie, socially disgraceful"
-	path = /obj/item/clothing/tie/horrible
+	path = /obj/item/clothing/accessory/horrible
 	slot = slot_tie
 	cost = 1

 /datum/gear/brown_vest
 	display_name = "webbing, engineering"
-	path = /obj/item/clothing/tie/storage/brown_vest
+	path = /obj/item/clothing/accessory/storage/brown_vest
 	slot = slot_tie
 	cost = 2
 	allowed_roles = list("Station Engineer","Atmospheric Technician","Chief Engineer")

 /datum/gear/black_vest
 	display_name = "webbing, security"
-	path = /obj/item/clothing/tie/storage/black_vest
+	path = /obj/item/clothing/accessory/storage/black_vest
 	slot = slot_tie
 	cost = 2
 	allowed_roles = list("Security Officer","Head of Security","Warden")

 /datum/gear/webbing
 	display_name = "webbing, simple"
-	path = /obj/item/clothing/tie/storage/webbing
+	path = /obj/item/clothing/accessory/storage/webbing
 	slot = slot_tie
 	cost = 2

@@ -68,7 +68,7 @@
 /obj/item/clothing/head/helmet/refit_for_species(var/target_species)
 	if(!species_restricted)
 		return //this item doesn't use the species_restricted system
-	
+
 	//Set species_restricted list
 	switch(target_species)
 		if("Skrell")
@@ -401,7 +401,7 @@ BLIND     // can't see anything
 		2 = Report detailed damages
 		3 = Report location
 		*/
-	var/obj/item/clothing/tie/hastie = null
+	var/list/accessories = list()
 	var/displays_id = 1
 	sprite_sheets = list("Vox" = 'icons/mob/species/vox/uniform.dmi')

@@ -410,28 +410,44 @@ BLIND     // can't see anything
 		var/mob/M = src.loc
 		M.update_inv_w_uniform()

+/obj/item/clothing/under/proc/can_attach_accessory(obj/item/clothing/accessory/A)
+	if(istype(A))
+		.=1
+	else
+		return 0
+	if(accessories.len && (A.slot in list("utility","armband")))
+		for(var/obj/item/clothing/accessory/AC in accessories)
+			if (AC.slot == A.slot)
+				return 0
+
 /obj/item/clothing/under/attackby(obj/item/I, mob/user)
-	if(hastie)
-		hastie.attackby(I, user)
-		return
+	if(istype(I, /obj/item/clothing/accessory))
+		var/obj/item/clothing/accessory/A = I
+		if(can_attach_accessory(A))
+			user.drop_item()
+			accessories += A
+			A.on_attached(src, user)

-	if(!hastie && istype(I, /obj/item/clothing/tie))
-		user.drop_item()
-		hastie = I
-		hastie.on_attached(src, user)
+			if(istype(loc, /mob/living/carbon/human))
+				var/mob/living/carbon/human/H = loc
+				H.update_inv_w_uniform()

-		if(istype(loc, /mob/living/carbon/human))
-			var/mob/living/carbon/human/H = loc
-			H.update_inv_w_uniform()
+			return
+		else
+			user << "<span class='notice'>You cannot attach more accessories of this type to [src].</span>"

+	if(accessories.len)
+		for(var/obj/item/clothing/accessory/A in accessories)
+			A.attackby(I, user)
 		return

 	..()

 /obj/item/clothing/under/attack_hand(mob/user as mob)
 	//only forward to the attached accessory if the clothing is equipped (not in a storage)
-	if(hastie && src.loc == user)
-		hastie.attack_hand(user)
+	if(accessories.len && src.loc == user)
+		for(var/obj/item/clothing/accessory/A in accessories)
+			A.attack_hand(user)
 		return

 	if ((ishuman(usr) || ismonkey(usr)) && src.loc == user)	//make it harder to accidentally undress yourself
@@ -468,8 +484,9 @@ BLIND     // can't see anything
 			user << "Its vital tracker appears to be enabled."
 		if(3)
 			user << "Its vital tracker and tracking beacon appear to be enabled."
-	if(hastie)
-		user << "\A [hastie] is clipped to it."
+	if(accessories.len)
+		for(var/obj/item/clothing/accessory/A in accessories)
+			user << "\A [A] is attached to it."

 /obj/item/clothing/under/proc/set_sensors(mob/usr as mob)
 	var/mob/M = usr
@@ -540,12 +557,12 @@ BLIND     // can't see anything
 	else
 		usr << "<span class='notice'>You cannot roll down the uniform!</span>"

-/obj/item/clothing/under/proc/remove_accessory(mob/user as mob)
-	if(!hastie)
+/obj/item/clothing/under/proc/remove_accessory(mob/user, obj/item/clothing/accessory/A)
+	if(!(A in accessories))
 		return

-	hastie.on_removed(user)
-	hastie = null
+	A.on_removed(user)
+	accessories -= A
 	update_clothing_icon()

 /obj/item/clothing/under/verb/removetie()
@@ -554,14 +571,20 @@ BLIND     // can't see anything
 	set src in usr
 	if(!istype(usr, /mob/living)) return
 	if(usr.stat) return
-
-	src.remove_accessory(usr)
+	if(!accessories.len) return
+	var/obj/item/clothing/accessory/A
+	if(accessories.len > 1)
+		A = input("Select an accessory to remove from [src]") as null|anything in accessories
+	else
+		A = accessories[1]
+	src.remove_accessory(usr,A)

 /obj/item/clothing/under/rank/New()
 	sensor_mode = pick(0,1,2,3)
 	..()

 /obj/item/clothing/under/emp_act(severity)
-	if (hastie)
-		hastie.emp_act(severity)
+	if(accessories.len)
+		for(var/obj/item/clothing/accessory/A in accessories)
+			A.emp_act(severity)
 	..()
@@ -0,0 +1,226 @@
+/obj/item/clothing/accessory
+	name = "tie"
+	desc = "A neosilk clip-on tie."
+	icon = 'icons/obj/clothing/ties.dmi'
+	icon_state = "bluetie"
+	item_state = ""	//no inhands
+	item_color = "bluetie"
+	slot_flags = SLOT_TIE
+	w_class = 2.0
+	var/slot = "decor"
+	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
+	var/image/inv_overlay = null	//overlay used when attached to clothing.
+
+/obj/item/clothing/accessory/New()
+	..()
+	inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]")
+
+//when user attached an accessory to S
+/obj/item/clothing/accessory/proc/on_attached(obj/item/clothing/under/S, mob/user as mob)
+	if(!istype(S))
+		return
+	has_suit = S
+	loc = has_suit
+	has_suit.overlays += inv_overlay
+
+	user << "<span class='notice'>You attach [src] to [has_suit].</span>"
+	src.add_fingerprint(user)
+
+/obj/item/clothing/accessory/proc/on_removed(mob/user as mob)
+	if(!has_suit)
+		return
+	has_suit.overlays -= inv_overlay
+	has_suit = null
+	usr.put_in_hands(src)
+	src.add_fingerprint(user)
+
+//default attackby behaviour
+/obj/item/clothing/accessory/attackby(obj/item/I, mob/user)
+	..()
+
+//default attack_hand behaviour
+/obj/item/clothing/accessory/attack_hand(mob/user as mob)
+	if(has_suit)
+		return	//we aren't an object on the ground so don't call parent
+	..()
+
+/obj/item/clothing/accessory/blue
+	name = "blue tie"
+	icon_state = "bluetie"
+	item_color = "bluetie"
+
+/obj/item/clothing/accessory/red
+	name = "red tie"
+	icon_state = "redtie"
+	item_color = "redtie"
+
+/obj/item/clothing/accessory/horrible
+	name = "horrible tie"
+	desc = "A neosilk clip-on tie. This one is disgusting."
+	icon_state = "horribletie"
+	item_color = "horribletie"
+
+/obj/item/clothing/accessory/stethoscope
+	name = "stethoscope"
+	desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
+	icon_state = "stethoscope"
+	item_color = "stethoscope"
+
+/obj/item/clothing/accessory/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
+	if(ishuman(M) && isliving(user))
+		if(user.a_intent == "help")
+			var/body_part = parse_zone(user.zone_sel.selecting)
+			if(body_part)
+				var/their = "their"
+				switch(M.gender)
+					if(MALE)	their = "his"
+					if(FEMALE)	their = "her"
+
+				var/sound = "pulse"
+				var/sound_strength
+
+				if(M.stat == DEAD || (M.status_flags&FAKEDEATH))
+					sound_strength = "cannot hear"
+					sound = "anything"
+				else
+					sound_strength = "hear a weak"
+					switch(body_part)
+						if("chest")
+							if(M.oxyloss < 50)
+								sound_strength = "hear a healthy"
+							sound = "pulse and respiration"
+						if("eyes","mouth")
+							sound_strength = "cannot hear"
+							sound = "anything"
+						else
+							sound_strength = "hear a weak"
+
+				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].")
+				return
+	return ..(M,user)
+
+
+//Medals
+/obj/item/clothing/accessory/medal
+	name = "bronze medal"
+	desc = "A bronze medal."
+	icon_state = "bronze"
+	item_color = "bronze"
+
+/obj/item/clothing/accessory/medal/conduct
+	name = "distinguished conduct medal"
+	desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
+
+/obj/item/clothing/accessory/medal/bronze_heart
+	name = "bronze heart medal"
+	desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
+	icon_state = "bronze_heart"
+
+/obj/item/clothing/accessory/medal/nobel_science
+	name = "nobel sciences award"
+	desc = "A bronze medal which represents significant contributions to the field of science or engineering."
+
+/obj/item/clothing/accessory/medal/silver
+	name = "silver medal"
+	desc = "A silver medal."
+	icon_state = "silver"
+	item_color = "silver"
+
+/obj/item/clothing/accessory/medal/silver/valor
+	name = "medal of valor"
+	desc = "A silver medal awarded for acts of exceptional valor."
+
+/obj/item/clothing/accessory/medal/silver/security
+	name = "robust security award"
+	desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
+
+/obj/item/clothing/accessory/medal/gold
+	name = "gold medal"
+	desc = "A prestigious golden medal."
+	icon_state = "gold"
+	item_color = "gold"
+
+/obj/item/clothing/accessory/medal/gold/captain
+	name = "medal of captaincy"
+	desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
+
+/obj/item/clothing/accessory/medal/gold/heroism
+	name = "medal of exceptional heroism"
+	desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
+
+/*
+	Holobadges are worn on the belt or neck, and can be used to show that the holder is an authorized
+	Security agent - the user details can be imprinted on the badge with a Security-access ID card,
+	or they can be emagged to accept any ID for use in disguises.
+*/
+
+/obj/item/clothing/accessory/holobadge
+	name = "holobadge"
+	desc = "This glowing blue badge marks the holder as THE LAW."
+	icon_state = "holobadge"
+	item_color = "holobadge"
+	slot_flags = SLOT_BELT | SLOT_TIE
+
+	var/emagged = 0 //Emagging removes Sec check.
+	var/stored_name = null
+
+/obj/item/clothing/accessory/holobadge/cord
+	icon_state = "holobadge-cord"
+	item_color = "holobadge-cord"
+	slot_flags = SLOT_MASK | SLOT_TIE
+
+/obj/item/clothing/accessory/holobadge/attack_self(mob/user as mob)
+	if(!stored_name)
+		user << "Waving around a badge before swiping an ID would be pretty pointless."
+		return
+	if(isliving(user))
+		user.visible_message("\red [user] displays their NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")
+
+/obj/item/clothing/accessory/holobadge/attackby(var/obj/item/O as obj, var/mob/user as mob)
+
+	if (istype(O, /obj/item/weapon/card/emag))
+		if (emagged)
+			user << "\red [src] is already cracked."
+			return
+		else
+			emagged = 1
+			user << "\red You swipe [O] and crack the holobadge security checks."
+			return
+
+	else if(istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/device/pda))
+
+		var/obj/item/weapon/card/id/id_card = null
+
+		if(istype(O, /obj/item/weapon/card/id))
+			id_card = O
+		else
+			var/obj/item/device/pda/pda = O
+			id_card = pda.id
+
+		if(access_security in id_card.access || emagged)
+			user << "You imprint your ID details onto the badge."
+			stored_name = id_card.registered_name
+			name = "holobadge ([stored_name])"
+			desc = "This glowing blue badge marks [stored_name] as THE LAW."
+		else
+			user << "[src] rejects your insufficient access rights."
+		return
+	..()
+
+/obj/item/clothing/accessory/holobadge/attack(mob/living/carbon/human/M, mob/living/user)
+	if(isliving(user))
+		user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.")
+
+/obj/item/weapon/storage/box/holobadge
+	name = "holobadge box"
+	desc = "A box claiming to contain holobadges."
+	New()
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge(src)
+		new /obj/item/clothing/accessory/holobadge/cord(src)
+		new /obj/item/clothing/accessory/holobadge/cord(src)
+		..()
+		return
+
@@ -0,0 +1,42 @@
+/obj/item/clothing/accessory/armband
+	name = "red armband"
+	desc = "A fancy red armband!"
+	icon_state = "red"
+	item_color = "red"
+	slot = "armband"
+
+/obj/item/clothing/accessory/armband/cargo
+	name = "cargo armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown."
+	icon_state = "cargo"
+	item_color = "cargo"
+
+/obj/item/clothing/accessory/armband/engine
+	name = "engineering armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is orange with a reflective strip!"
+	icon_state = "engie"
+	item_color = "engie"
+
+/obj/item/clothing/accessory/armband/science
+	name = "science armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is purple."
+	icon_state = "rnd"
+	item_color = "rnd"
+
+/obj/item/clothing/accessory/armband/hydro
+	name = "hydroponics armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is green and blue."
+	icon_state = "hydro"
+	item_color = "hydro"
+
+/obj/item/clothing/accessory/armband/med
+	name = "medical armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white."
+	icon_state = "med"
+	item_color = "med"
+
+/obj/item/clothing/accessory/armband/medgreen
+	name = "EMT armband"
+	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
+	icon_state = "medgreen"
+	item_color = "medgreen"
@@ -0,0 +1,119 @@
+/obj/item/clothing/accessory/holster
+	name = "shoulder holster"
+	desc = "A handgun holster."
+	icon_state = "holster"
+	item_color = "holster"
+	slot = "utility"
+	var/obj/item/weapon/gun/holstered = null
+
+//subtypes can override this to specify what can be holstered
+/obj/item/clothing/accessory/holster/proc/can_holster(obj/item/weapon/gun/W)
+	return W.isHandgun()
+
+/obj/item/clothing/accessory/holster/proc/holster(obj/item/I, mob/user as mob)
+	if(holstered)
+		user << "<span class='warning'>There is already a [holstered] holstered here!</span>"
+		return
+
+	if (!istype(I, /obj/item/weapon/gun))
+		user << "<span class='warning'>Only guns can be holstered!</span>"
+		return
+
+	var/obj/item/weapon/gun/W = I
+	if (!can_holster(W))
+		user << "<span class='warning'>This [W] won't fit in the [src]!</span>"
+		return
+
+	holstered = W
+	user.drop_from_inventory(holstered)
+	holstered.loc = src
+	holstered.add_fingerprint(user)
+	user.visible_message("<span class='notice'>[user] holsters the [holstered].</span>", "<span class='notice'>You holster the [holstered].</span>")
+
+/obj/item/clothing/accessory/holster/proc/unholster(mob/user as mob)
+	if(!holstered)
+		return
+
+	if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
+		user << "<span class='warning'>You need an empty hand to draw the [holstered]!</span>"
+	else
+		if(user.a_intent == "hurt")
+			usr.visible_message("\red [user] draws the [holstered], ready to shoot!</span>", \
+			"<span class='warning'>You draw the [holstered], ready to shoot!</span>")
+		else
+			user.visible_message("<span class='notice'>[user] draws the [holstered], pointing it at the ground.</span>", \
+			"<span class='notice'>You draw the [holstered], pointing it at the ground.</span>")
+		user.put_in_hands(holstered)
+		holstered.add_fingerprint(user)
+		holstered = null
+
+/obj/item/clothing/accessory/holster/attack_hand(mob/user as mob)
+	if (has_suit)	//if we are part of a suit
+		if (holstered)
+			unholster(user)
+		return
+
+	..(user)
+
+/obj/item/clothing/accessory/holster/attackby(obj/item/W as obj, mob/user as mob)
+	holster(W, user)
+
+/obj/item/clothing/accessory/holster/emp_act(severity)
+	if (holstered)
+		holstered.emp_act(severity)
+	..()
+
+/obj/item/clothing/accessory/holster/examine(mob/user)
+	..(user)
+	if (holstered)
+		user << "A [holstered] is holstered here."
+	else
+		user << "It is empty."
+
+/obj/item/clothing/accessory/holster/on_attached(obj/item/clothing/under/S, mob/user as mob)
+	..()
+	has_suit.verbs += /obj/item/clothing/accessory/holster/verb/holster_verb
+
+/obj/item/clothing/accessory/holster/on_removed(mob/user as mob)
+	has_suit.verbs -= /obj/item/clothing/accessory/holster/verb/holster_verb
+	..()
+
+//For the holster hotkey
+/obj/item/clothing/accessory/holster/verb/holster_verb()
+	set name = "Holster"
+	set category = "Object"
+	set src in usr
+	if(!istype(usr, /mob/living)) return
+	if(usr.stat) return
+
+	var/obj/item/clothing/accessory/holster/H = null
+	if (istype(src, /obj/item/clothing/accessory/holster))
+		H = src
+	else if (istype(src, /obj/item/clothing/under))
+		var/obj/item/clothing/under/S = src
+		if (S.accessories.len)
+			H = locate() in S.accessories
+
+	if (!H)
+		usr << "<span class='warning'>Something is very wrong.</span>"
+
+	if(!H.holstered)
+		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
+			usr << "<span class='warning'>You need your gun equiped to holster it.</span>"
+			return
+		var/obj/item/weapon/gun/W = usr.get_active_hand()
+		H.holster(W, usr)
+	else
+		H.unholster(usr)
+
+/obj/item/clothing/accessory/holster/armpit
+	name = "shoulder holster"
+	desc = "A worn-out handgun holster. Perfect for concealed carry"
+	icon_state = "holster"
+	item_color = "holster"
+
+/obj/item/clothing/accessory/holster/waist
+	name = "shoulder holster"
+	desc = "A handgun holster. Made of expensive leather."
+	icon_state = "holster"
+	item_color = "holster_low"
@@ -0,0 +1,86 @@
+/obj/item/clothing/accessory/storage
+	name = "load bearing equipment"
+	desc = "Used to hold things when you don't have enough hands."
+	icon_state = "webbing"
+	item_color = "webbing"
+	slot = "utility"
+	var/slots = 3
+	var/obj/item/weapon/storage/internal/hold
+
+/obj/item/clothing/accessory/storage/New()
+	..()
+	hold = new/obj/item/weapon/storage/internal(src)
+	hold.storage_slots = slots
+
+/obj/item/clothing/accessory/storage/attack_hand(mob/user as mob)
+	if (has_suit)	//if we are part of a suit
+		hold.open(user)
+		return
+
+	if (hold.handle_attack_hand(user))	//otherwise interact as a regular storage item
+		..(user)
+
+/obj/item/clothing/accessory/storage/MouseDrop(obj/over_object as obj)
+	if (has_suit)
+		return
+
+	if (hold.handle_mousedrop(usr, over_object))
+		..(over_object)
+
+/obj/item/clothing/accessory/storage/attackby(obj/item/W as obj, mob/user as mob)
+	return hold.attackby(W, user)
+
+/obj/item/clothing/accessory/storage/emp_act(severity)
+	hold.emp_act(severity)
+	..()
+
+/obj/item/clothing/accessory/storage/hear_talk(mob/M, var/msg, verb, datum/language/speaking)
+	hold.hear_talk(M, msg, verb, speaking)
+	..()
+
+/obj/item/clothing/accessory/storage/attack_self(mob/user as mob)
+	user << "<span class='notice'>You empty [src].</span>"
+	var/turf/T = get_turf(src)
+	hold.hide_from(usr)
+	for(var/obj/item/I in hold.contents)
+		hold.remove_from_storage(I, T)
+	src.add_fingerprint(user)
+
+/obj/item/clothing/accessory/storage/webbing
+	name = "webbing"
+	desc = "Strudy mess of synthcotton belts and buckles, ready to share your burden."
+	icon_state = "webbing"
+	item_color = "webbing"
+
+/obj/item/clothing/accessory/storage/black_vest
+	name = "black webbing vest"
+	desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands."
+	icon_state = "vest_black"
+	item_color = "vest_black"
+	slots = 5
+
+/obj/item/clothing/accessory/storage/brown_vest
+	name = "brown webbing vest"
+	desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
+	icon_state = "vest_brown"
+	item_color = "vest_brown"
+	slots = 5
+
+/obj/item/clothing/accessory/storage/knifeharness
+	name = "decorated harness"
+	desc = "A heavily decorated harness of sinew and leather with two knife-loops."
+	icon_state = "unathiharness2"
+	item_color = "unathiharness2"
+	slots = 2
+
+/obj/item/clothing/accessory/storage/knifeharness/New()
+	..()
+	hold.max_combined_w_class = 4
+	hold.can_hold = list("/obj/item/weapon/hatchet/unathiknife",\
+	"/obj/item/weapon/kitchen/utensil/knife",\
+	"/obj/item/weapon/kitchen/utensil/pknife",\
+	"/obj/item/weapon/kitchenknife",\
+	"/obj/item/weapon/kitchenknife/ritual")
+
+	new /obj/item/weapon/hatchet/unathiknife(hold)
+	new /obj/item/weapon/hatchet/unathiknife(hold)
@@ -1,474 +0,0 @@
-/obj/item/clothing/tie
-	name = "tie"
-	desc = "A neosilk clip-on tie."
-	icon = 'icons/obj/clothing/ties.dmi'
-	icon_state = "bluetie"
-	item_state = ""	//no inhands
-	item_color = "bluetie"
-	slot_flags = SLOT_TIE
-	w_class = 2.0
-	var/obj/item/clothing/under/has_suit = null		//the suit the tie may be attached to
-	var/image/inv_overlay = null	//overlay used when attached to clothing.
-
-/obj/item/clothing/tie/New()
-	..()
-	inv_overlay = image("icon" = 'icons/obj/clothing/ties_overlay.dmi', "icon_state" = "[item_color? "[item_color]" : "[icon_state]"]")
-
-//when user attached an accessory to S
-/obj/item/clothing/tie/proc/on_attached(obj/item/clothing/under/S, mob/user as mob)
-	if(!istype(S))
-		return
-	has_suit = S
-	loc = has_suit
-	has_suit.overlays += inv_overlay
-
-	user << "<span class='notice'>You attach [src] to [has_suit].</span>"
-	src.add_fingerprint(user)
-
-/obj/item/clothing/tie/proc/on_removed(mob/user as mob)
-	if(!has_suit)
-		return
-	has_suit.overlays -= inv_overlay
-	has_suit = null
-	usr.put_in_hands(src)
-	src.add_fingerprint(user)
-
-//default attackby behaviour
-/obj/item/clothing/tie/attackby(obj/item/I, mob/user)
-	..()
-
-//default attack_hand behaviour
-/obj/item/clothing/tie/attack_hand(mob/user as mob)
-	if(has_suit)
-		has_suit.remove_accessory(user)
-		return	//we aren't an object on the ground so don't call parent
-	..()
-
-/obj/item/clothing/tie/blue
-	name = "blue tie"
-	icon_state = "bluetie"
-	item_color = "bluetie"
-
-/obj/item/clothing/tie/red
-	name = "red tie"
-	icon_state = "redtie"
-	item_color = "redtie"
-
-/obj/item/clothing/tie/horrible
-	name = "horrible tie"
-	desc = "A neosilk clip-on tie. This one is disgusting."
-	icon_state = "horribletie"
-	item_color = "horribletie"
-
-/obj/item/clothing/tie/stethoscope
-	name = "stethoscope"
-	desc = "An outdated medical apparatus for listening to the sounds of the human body. It also makes you look like you know what you're doing."
-	icon_state = "stethoscope"
-	item_color = "stethoscope"
-
-/obj/item/clothing/tie/stethoscope/attack(mob/living/carbon/human/M, mob/living/user)
-	if(ishuman(M) && isliving(user))
-		if(user.a_intent == "help")
-			var/body_part = parse_zone(user.zone_sel.selecting)
-			if(body_part)
-				var/their = "their"
-				switch(M.gender)
-					if(MALE)	their = "his"
-					if(FEMALE)	their = "her"
-
-				var/sound = "pulse"
-				var/sound_strength
-
-				if(M.stat == DEAD || (M.status_flags&FAKEDEATH))
-					sound_strength = "cannot hear"
-					sound = "anything"
-				else
-					sound_strength = "hear a weak"
-					switch(body_part)
-						if("chest")
-							if(M.oxyloss < 50)
-								sound_strength = "hear a healthy"
-							sound = "pulse and respiration"
-						if("eyes","mouth")
-							sound_strength = "cannot hear"
-							sound = "anything"
-						else
-							sound_strength = "hear a weak"
-
-				user.visible_message("[user] places [src] against [M]'s [body_part] and listens attentively.", "You place [src] against [their] [body_part]. You [sound_strength] [sound].")
-				return
-	return ..(M,user)
-
-
-//Medals
-/obj/item/clothing/tie/medal
-	name = "bronze medal"
-	desc = "A bronze medal."
-	icon_state = "bronze"
-	item_color = "bronze"
-
-/obj/item/clothing/tie/medal/conduct
-	name = "distinguished conduct medal"
-	desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award given by Nanotrasen. It is often awarded by a captain to a member of his crew."
-
-/obj/item/clothing/tie/medal/bronze_heart
-	name = "bronze heart medal"
-	desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
-	icon_state = "bronze_heart"
-
-/obj/item/clothing/tie/medal/nobel_science
-	name = "nobel sciences award"
-	desc = "A bronze medal which represents significant contributions to the field of science or engineering."
-
-/obj/item/clothing/tie/medal/silver
-	name = "silver medal"
-	desc = "A silver medal."
-	icon_state = "silver"
-	item_color = "silver"
-
-/obj/item/clothing/tie/medal/silver/valor
-	name = "medal of valor"
-	desc = "A silver medal awarded for acts of exceptional valor."
-
-/obj/item/clothing/tie/medal/silver/security
-	name = "robust security award"
-	desc = "An award for distinguished combat and sacrifice in defence of Nanotrasen's commercial interests. Often awarded to security staff."
-
-/obj/item/clothing/tie/medal/gold
-	name = "gold medal"
-	desc = "A prestigious golden medal."
-	icon_state = "gold"
-	item_color = "gold"
-
-/obj/item/clothing/tie/medal/gold/captain
-	name = "medal of captaincy"
-	desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain to Nanotrasen, and their undisputable authority over their crew."
-
-/obj/item/clothing/tie/medal/gold/heroism
-	name = "medal of exceptional heroism"
-	desc = "An extremely rare golden medal awarded only by CentComm. To recieve such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
-
-//Armbands
-/obj/item/clothing/tie/armband
-	name = "red armband"
-	desc = "A fancy red armband!"
-	icon_state = "red"
-	item_color = "red"
-
-/obj/item/clothing/tie/armband/cargo
-	name = "cargo armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is brown."
-	icon_state = "cargo"
-	item_color = "cargo"
-
-/obj/item/clothing/tie/armband/engine
-	name = "engineering armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is orange with a reflective strip!"
-	icon_state = "engie"
-	item_color = "engie"
-
-/obj/item/clothing/tie/armband/science
-	name = "science armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is purple."
-	icon_state = "rnd"
-	item_color = "rnd"
-
-/obj/item/clothing/tie/armband/hydro
-	name = "hydroponics armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is green and blue."
-	icon_state = "hydro"
-	item_color = "hydro"
-
-/obj/item/clothing/tie/armband/med
-	name = "medical armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white."
-	icon_state = "med"
-	item_color = "med"
-
-/obj/item/clothing/tie/armband/medgreen
-	name = "EMT armband"
-	desc = "An armband, worn by the crew to display which department they're assigned to. This one is white and green."
-	icon_state = "medgreen"
-	item_color = "medgreen"
-
-//holsters
-/obj/item/clothing/tie/holster
-	name = "shoulder holster"
-	desc = "A handgun holster."
-	icon_state = "holster"
-	item_color = "holster"
-	var/obj/item/weapon/gun/holstered = null
-
-//subtypes can override this to specify what can be holstered
-/obj/item/clothing/tie/holster/proc/can_holster(obj/item/weapon/gun/W)
-	return W.isHandgun()
-
-/obj/item/clothing/tie/holster/proc/holster(obj/item/I, mob/user as mob)
-	if(holstered)
-		user << "\red There is already a [holstered] holstered here!"
-		return
-
-	if (!istype(I, /obj/item/weapon/gun))
-		user << "\red Only guns can be holstered!"
-		return
-
-	var/obj/item/weapon/gun/W = I
-	if (!can_holster(W))
-		user << "\red This [W] won't fit in the [src]!"
-		return
-
-	holstered = W
-	user.drop_from_inventory(holstered)
-	holstered.loc = src
-	holstered.add_fingerprint(user)
-	user.visible_message("\blue [user] holsters the [holstered].", "You holster the [holstered].")
-
-/obj/item/clothing/tie/holster/proc/unholster(mob/user as mob)
-	if(!holstered)
-		return
-
-	if(istype(user.get_active_hand(),/obj) && istype(user.get_inactive_hand(),/obj))
-		user << "\red You need an empty hand to draw the [holstered]!"
-	else
-		if(user.a_intent == "hurt")
-			usr.visible_message("\red [user] draws the [holstered], ready to shoot!", \
-			"\red You draw the [holstered], ready to shoot!")
-		else
-			user.visible_message("\blue [user] draws the [holstered], pointing it at the ground.", \
-			"\blue You draw the [holstered], pointing it at the ground.")
-		user.put_in_hands(holstered)
-		holstered.add_fingerprint(user)
-		holstered = null
-
-/obj/item/clothing/tie/holster/attack_hand(mob/user as mob)
-	if (has_suit)	//if we are part of a suit
-		if (holstered)
-			unholster(user)
-		return
-
-	..(user)
-
-/obj/item/clothing/tie/holster/attackby(obj/item/W as obj, mob/user as mob)
-	holster(W, user)
-
-/obj/item/clothing/tie/holster/emp_act(severity)
-	if (holstered)
-		holstered.emp_act(severity)
-	..()
-
-/obj/item/clothing/tie/holster/examine(mob/user)
-	..(user)
-	if (holstered)
-		user << "A [holstered] is holstered here."
-	else
-		user << "It is empty."
-
-/obj/item/clothing/tie/holster/on_attached(obj/item/clothing/under/S, mob/user as mob)
-	..()
-	has_suit.verbs += /obj/item/clothing/tie/holster/verb/holster_verb
-
-/obj/item/clothing/tie/holster/on_removed(mob/user as mob)
-	has_suit.verbs -= /obj/item/clothing/tie/holster/verb/holster_verb
-	..()
-
-//For the holster hotkey
-/obj/item/clothing/tie/holster/verb/holster_verb()
-	set name = "Holster"
-	set category = "Object"
-	set src in usr
-	if(!istype(usr, /mob/living)) return
-	if(usr.stat) return
-
-	var/obj/item/clothing/tie/holster/H = null
-	if (istype(src, /obj/item/clothing/tie/holster))
-		H = src
-	else if (istype(src, /obj/item/clothing/under))
-		var/obj/item/clothing/under/S = src
-		if (S.hastie)
-			H = S.hastie
-
-	if (!H)
-		usr << "/red Something is very wrong."
-
-	if(!H.holstered)
-		if(!istype(usr.get_active_hand(), /obj/item/weapon/gun))
-			usr << "\blue You need your gun equiped to holster it."
-			return
-		var/obj/item/weapon/gun/W = usr.get_active_hand()
-		H.holster(W, usr)
-	else
-		H.unholster(usr)
-
-/obj/item/clothing/tie/holster/armpit
-	name = "shoulder holster"
-	desc = "A worn-out handgun holster. Perfect for concealed carry"
-	icon_state = "holster"
-	item_color = "holster"
-
-/obj/item/clothing/tie/holster/waist
-	name = "shoulder holster"
-	desc = "A handgun holster. Made of expensive leather."
-	icon_state = "holster"
-	item_color = "holster_low"
-
-/obj/item/clothing/tie/storage
-	name = "load bearing equipment"
-	desc = "Used to hold things when you don't have enough hands."
-	icon_state = "webbing"
-	item_color = "webbing"
-	var/slots = 3
-	var/obj/item/weapon/storage/internal/hold
-
-/obj/item/clothing/tie/storage/New()
-	..()
-	hold = new/obj/item/weapon/storage/internal(src)
-	hold.storage_slots = slots
-
-/obj/item/clothing/tie/storage/attack_hand(mob/user as mob)
-	if (has_suit)	//if we are part of a suit
-		hold.open(user)
-		return
-
-	if (hold.handle_attack_hand(user))	//otherwise interact as a regular storage item
-		..(user)
-
-/obj/item/clothing/tie/storage/MouseDrop(obj/over_object as obj)
-	if (has_suit)
-		return
-
-	if (hold.handle_mousedrop(usr, over_object))
-		..(over_object)
-
-/obj/item/clothing/tie/storage/attackby(obj/item/W as obj, mob/user as mob)
-	return hold.attackby(W, user)
-
-/obj/item/clothing/tie/storage/emp_act(severity)
-	hold.emp_act(severity)
-	..()
-
-/obj/item/clothing/tie/storage/hear_talk(mob/M, var/msg, verb, datum/language/speaking)
-	hold.hear_talk(M, msg, verb, speaking)
-	..()
-
-/obj/item/clothing/tie/storage/attack_self(mob/user as mob)
-	user << "<span class='notice'>You empty [src].</span>"
-	var/turf/T = get_turf(src)
-	hold.hide_from(usr)
-	for(var/obj/item/I in hold.contents)
-		hold.remove_from_storage(I, T)
-	src.add_fingerprint(user)
-
-/obj/item/clothing/tie/storage/webbing
-	name = "webbing"
-	desc = "Strudy mess of synthcotton belts and buckles, ready to share your burden."
-	icon_state = "webbing"
-	item_color = "webbing"
-
-/obj/item/clothing/tie/storage/black_vest
-	name = "black webbing vest"
-	desc = "Robust black synthcotton vest with lots of pockets to hold whatever you need, but cannot hold in hands."
-	icon_state = "vest_black"
-	item_color = "vest_black"
-	slots = 5
-
-/obj/item/clothing/tie/storage/brown_vest
-	name = "brown webbing vest"
-	desc = "Worn brownish synthcotton vest with lots of pockets to unload your hands."
-	icon_state = "vest_brown"
-	item_color = "vest_brown"
-	slots = 5
-/*
-	Holobadges are worn on the belt or neck, and can be used to show that the holder is an authorized
-	Security agent - the user details can be imprinted on the badge with a Security-access ID card,
-	or they can be emagged to accept any ID for use in disguises.
-*/
-
-/obj/item/clothing/tie/holobadge
-
-	name = "holobadge"
-	desc = "This glowing blue badge marks the holder as THE LAW."
-	icon_state = "holobadge"
-	item_color = "holobadge"
-	slot_flags = SLOT_BELT | SLOT_TIE
-
-	var/emagged = 0 //Emagging removes Sec check.
-	var/stored_name = null
-
-/obj/item/clothing/tie/holobadge/cord
-	icon_state = "holobadge-cord"
-	item_color = "holobadge-cord"
-	slot_flags = SLOT_MASK | SLOT_TIE
-
-/obj/item/clothing/tie/holobadge/attack_self(mob/user as mob)
-	if(!stored_name)
-		user << "Waving around a badge before swiping an ID would be pretty pointless."
-		return
-	if(isliving(user))
-		user.visible_message("\red [user] displays their NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.","\red You display your NanoTrasen Internal Security Legal Authorization Badge.\nIt reads: [stored_name], NT Security.")
-
-/obj/item/clothing/tie/holobadge/attackby(var/obj/item/O as obj, var/mob/user as mob)
-
-	if (istype(O, /obj/item/weapon/card/emag))
-		if (emagged)
-			user << "\red [src] is already cracked."
-			return
-		else
-			emagged = 1
-			user << "\red You swipe [O] and crack the holobadge security checks."
-			return
-
-	else if(istype(O, /obj/item/weapon/card/id) || istype(O, /obj/item/device/pda))
-
-		var/obj/item/weapon/card/id/id_card = null
-
-		if(istype(O, /obj/item/weapon/card/id))
-			id_card = O
-		else
-			var/obj/item/device/pda/pda = O
-			id_card = pda.id
-
-		if(access_security in id_card.access || emagged)
-			user << "You imprint your ID details onto the badge."
-			stored_name = id_card.registered_name
-			name = "holobadge ([stored_name])"
-			desc = "This glowing blue badge marks [stored_name] as THE LAW."
-		else
-			user << "[src] rejects your insufficient access rights."
-		return
-	..()
-
-/obj/item/clothing/tie/holobadge/attack(mob/living/carbon/human/M, mob/living/user)
-	if(isliving(user))
-		user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.")
-
-/obj/item/weapon/storage/box/holobadge
-	name = "holobadge box"
-	desc = "A box claiming to contain holobadges."
-	New()
-		new /obj/item/clothing/tie/holobadge(src)
-		new /obj/item/clothing/tie/holobadge(src)
-		new /obj/item/clothing/tie/holobadge(src)
-		new /obj/item/clothing/tie/holobadge(src)
-		new /obj/item/clothing/tie/holobadge/cord(src)
-		new /obj/item/clothing/tie/holobadge/cord(src)
-		..()
-		return
-
-/obj/item/clothing/tie/storage/knifeharness
-	name = "decorated harness"
-	desc = "A heavily decorated harness of sinew and leather with two knife-loops."
-	icon_state = "unathiharness2"
-	item_color = "unathiharness2"
-	slots = 2
-
-/obj/item/clothing/tie/storage/knifeharness/New()
-	..()
-	hold.max_combined_w_class = 4
-	hold.can_hold = list("/obj/item/weapon/hatchet/unathiknife",\
-	"/obj/item/weapon/kitchen/utensil/knife",\
-	"/obj/item/weapon/kitchen/utensil/pknife",\
-	"/obj/item/weapon/kitchenknife",\
-	"/obj/item/weapon/kitchenknife/ritual")
-
-	new /obj/item/weapon/hatchet/unathiknife(hold)
-	new /obj/item/weapon/hatchet/unathiknife(hold)
@@ -114,7 +114,7 @@

 /////////////////////// Cataguettes - Lucy's Stethoscope - Lucy Kemmerer //////

-/obj/item/clothing/tie/stethoscope/fluff/lucystethos
+/obj/item/clothing/accessory/stethoscope/fluff/lucystethos
   name = "Lucy's Stethoscope"
   desc = "A medical apparatus intended to ease in listening to the sounds of the human body. This one looks cleaner and sparklier than the rest. There is a small silver plaque attached to the tubing, with the words 'Lucy Kemmerer' engraved on it."
   icon_state = "lucystethos"
@@ -1111,22 +1111,33 @@
 	item_color = "lillian_dress"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO

-////// Cybernetic Casings - Parker Eliza - MrSnapwalk
+////// Tailored Security Uniform - Parker Eliza - MrSnapwalk
+
 /obj/item/clothing/under/fluff/parkereliza
-	name = "cybernetic casings"
-	desc = "A set of somewhat bulky white casings for robotic limbs, paired with a basic blue tank top and black cargo pants. The arms have a small label on the inner elbow, which reads \"Bishop Corporation Cybernetic Solutions\"."
+	name = "tailored security uniform"
+	desc = "A red uniform shirt (tailored for easy access to the shoulder joint) and black cargo pants, paired with a set of somewhat bulky white casings for robotic limbs. The arms have a small label on the inner elbow, which reads \"Bishop Corporation Cybernetic Solutions\"."
 	icon = 'icons/obj/custom_items.dmi'
 	icon_state = "parker_eliza"
 	item_state = "parker_eliza"
 	item_color = "parker_eliza"
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS

+////// Bishop "GOLEM" V2200 Industrial Limb Augments - Parker Eliza - MrSnapwalk
+
+/obj/item/clothing/suit/fluff/parkereliza
+	name = "Bishop \"GOLEM\" V2200 Industrial Limb Augments"
+	desc = "A set of top-of-the-line cyberlimbs, only usable to someone with extensive bone structure augmentation. Often used in industrial applications, they are capable of throwing a man clear across a room. The load limitation circuit in this set appears to be modified."
+	icon = 'icons/obj/custom_items.dmi'
+	icon_state = "parker_eliza_arms"
+	item_state = "parker_eliza_arms"
+	item_color = "parker_eliza_arms"
+

 ////////////// Accessories /////

 //////////////////// Blood Red Pendant - Mewth - Mu'taz Radi ////////////////

-/obj/item/clothing/tie/fluff/radi
+/obj/item/clothing/accessory/fluff/radi
 	name = "Blood Red Pendant"
 	desc = "A blue chained necklace with a ruby in the middle, it looks pretty!"
 	icon = 'icons/obj/custom_items.dmi'
@@ -1168,7 +1179,7 @@

 ////// Small locket - Altair An-Nasaqan - Serithi

-/obj/item/clothing/tie/fluff/altair_locket
+/obj/item/clothing/accessory/fluff/altair_locket
 	name = "small locket"
 	desc = "A small golden locket attached to an Ii'rka-reed string. Inside the locket is a holo-picture of a female Tajaran, and an inscription writtin in Siik'mas."
 	icon = 'icons/obj/custom_items.dmi'
@@ -1181,7 +1192,7 @@

 ////// Silver locket - Konaa Hirano - Konaa_Hirano

-/obj/item/clothing/tie/fluff/konaa_hirano
+/obj/item/clothing/accessory/fluff/konaa_hirano
 	name = "silver locket"
 	desc = "This oval shaped, argentium sterling silver locket hangs on an incredibly fine, refractive string, almost thin as hair and microweaved from links to a deceptive strength, of similar material. The edges are engraved very delicately with an elegant curving design, but overall the main is unmarked and smooth to the touch, leaving room for either remaining as a stolid piece or future alterations. There is an obvious internal place for a picture or lock of some sort, but even behind that is a very thin compartment unhinged with the pinch of a thumb and forefinger."
 	icon = 'icons/obj/custom_items.dmi'
@@ -1193,13 +1204,13 @@
 	slot_flags = SLOT_MASK | SLOT_TIE
 	var/obj/item/held //Item inside locket.

-/obj/item/clothing/tie/fluff/konaa_hirano/attack_self(mob/user as mob)
+/obj/item/clothing/accessory/fluff/konaa_hirano/attack_self(mob/user as mob)
 	if(held)
 		user << "You open [src] and [held] falls out."
 		held.loc = get_turf(user)
 		src.held = null

-/obj/item/clothing/tie/fluff/konaa_hirano/attackby(var/obj/item/O as obj, mob/user as mob)
+/obj/item/clothing/accessory/fluff/konaa_hirano/attackby(var/obj/item/O as obj, mob/user as mob)
 	if(istype(O,/obj/item/weapon/paper))
 		if(held)
 			usr << "[src] already has something inside it."
@@ -1213,7 +1224,7 @@

 //////  Medallion - Nasir Khayyam - Jamini

-/obj/item/clothing/tie/fluff/nasir_khayyam_1
+/obj/item/clothing/accessory/fluff/nasir_khayyam_1
 	name = "medallion"
 	desc = "This silvered medallion bears the symbol of the Hadii Clan of the Tajaran."
 	icon = 'icons/obj/custom_items.dmi'
@@ -11,66 +11,80 @@
 	var/obj/item/weapon/reagent_containers/glass/beaker = null
 	var/points = 0
 	var/menustat = "menu"
+	var/build_eff = 1
+	var/eat_eff = 1

-	New()
-		..()
-		var/datum/reagents/R = new/datum/reagents(1000)
-		reagents = R
-		R.my_atom = src
-		beaker = new /obj/item/weapon/reagent_containers/glass/beaker/large(src)
+/obj/machinery/biogenerator/New()
+	..()
+	var/datum/reagents/R = new/datum/reagents(1000)
+	reagents = R
+	R.my_atom = src
+	beaker = new /obj/item/weapon/reagent_containers/glass/bottle(src)

-	on_reagent_change()			//When the reagents change, change the icon as well.
-		update_icon()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/biogenerator(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)

+	RefreshParts()
+
+/obj/machinery/biogenerator/on_reagent_change()			//When the reagents change, change the icon as well.
 	update_icon()
-		if(!src.beaker)
-			icon_state = "biogen-empty"
-		else if(!src.processing)
-			icon_state = "biogen-stand"
-		else
-			icon_state = "biogen-work"
-		return
+
+/obj/machinery/biogenerator/update_icon()
+	if(!beaker)
+		icon_state = "biogen-empty"
+	else if(!processing)
+		icon_state = "biogen-stand"
+	else
+		icon_state = "biogen-work"
+	return

 /obj/machinery/biogenerator/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(default_deconstruction_screwdriver(user, O))
+		return
+	if(default_deconstruction_crowbar(user, O))
+		return
+	if(default_part_replacement(user, O))
+		return
 	if(istype(O, /obj/item/weapon/reagent_containers/glass))
 		if(beaker)
-			user << "\red The biogenerator is already loaded."
+			user << "<span class='notice'>]The [src] is already loaded.</span>"
 		else
 			user.before_take_item(O)
 			O.loc = src
 			beaker = O
 			updateUsrDialog()
 	else if(processing)
-		user << "\red The biogenerator is currently processing."
+		user << "<span class='notice'>\The [src] is currently processing.</span>"
 	else if(istype(O, /obj/item/weapon/storage/bag/plants))
 		var/i = 0
 		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
 			i++
 		if(i >= 10)
-			user << "\red The biogenerator is already full! Activate it."
+			user << "<span class='notice'>\The [src] is already full! Activate it.</span>"
 		else
 			for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in O.contents)
 				G.loc = src
 				i++
 				if(i >= 10)
-					user << "\blue You fill the biogenerator to its capacity."
+					user << "<span class='notice'>You fill \the [src] to its capacity.</span>"
 					break
-			if(i<10)
-				user << "\blue You empty the plant bag into the biogenerator."
-
+			if(i < 10)
+				user << "<span class='notice'>You empty \the [O] into \the [src].</span>"

 	else if(!istype(O, /obj/item/weapon/reagent_containers/food/snacks/grown))
-		user << "\red You cannot put this in [src.name]"
+		user << "<span class='notice'>You cannot put this in \the [src].</span>"
 	else
 		var/i = 0
 		for(var/obj/item/weapon/reagent_containers/food/snacks/grown/G in contents)
 			i++
 		if(i >= 10)
-			user << "\red The biogenerator is full! Activate it."
+			user << "<span class='notice'>\The [src] is full! Activate it.</span>"
 		else
 			user.before_take_item(O)
 			O.loc = src
-			user << "\blue You put [O.name] in [src.name]"
+			user << "<span class='notice'>You put \the [O] in \the [src]</span>"
 	update_icon()
 	return

@@ -89,18 +103,18 @@
 					dat += "<A href='?src=\ref[src];action=activate'>Activate Biogenerator!</A><BR>"
 					dat += "<A href='?src=\ref[src];action=detach'>Detach Container</A><BR><BR>"
 					dat += "Food<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=milk;cost=20'>10 milk</A> <FONT COLOR=blue>(20)</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=meat;cost=50'>Slab of meat</A> <FONT COLOR=blue>(50)</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=milk;cost=20'>10 milk</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=meat;cost=50'>Slab of meat</A> <FONT COLOR=blue>([round(50/build_eff)])</FONT><BR>"
 					dat += "Nutrient<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=ez;cost=10'>E-Z-Nutrient</A> <FONT COLOR=blue>(10)</FONT> | <A href='?src=\ref[src];action=create;item=ez5;cost=50'>x5</A><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=l4z;cost=20'>Left 4 Zed</A> <FONT COLOR=blue>(20)</FONT> | <A href='?src=\ref[src];action=create;item=l4z5;cost=100'>x5</A><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=rh;cost=25'>Robust Harvest</A> <FONT COLOR=blue>(25)</FONT> | <A href='?src=\ref[src];action=create;item=rh5;cost=125'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=ez;cost=10'>E-Z-Nutrient</A> <FONT COLOR=blue>([round(10/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=ez5;cost=50'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=l4z;cost=20'>Left 4 Zed</A> <FONT COLOR=blue>([round(20/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=l4z5;cost=100'>x5</A><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=rh;cost=25'>Robust Harvest</A> <FONT COLOR=blue>([round(25/build_eff)])</FONT> | <A href='?src=\ref[src];action=create;item=rh5;cost=125'>x5</A><BR>"
 					dat += "Leather<BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=wallet;cost=100'>Wallet</A> <FONT COLOR=blue>(100)</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=gloves;cost=250'>Botanical gloves</A> <FONT COLOR=blue>(250)</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=tbelt;cost=300'>Utility belt</A> <FONT COLOR=blue>(300)</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=satchel;cost=400'>Leather Satchel</A> <FONT COLOR=blue>(400)</FONT><BR>"
-					dat += "<A href='?src=\ref[src];action=create;item=cashbag;cost=400'>Cash Bag</A> <FONT COLOR=blue>(400)</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=wallet;cost=100'>Wallet</A> <FONT COLOR=blue>([round(100/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=gloves;cost=250'>Botanical gloves</A> <FONT COLOR=blue>([round(250/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=tbelt;cost=300'>Utility belt</A> <FONT COLOR=blue>([round(300/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=satchel;cost=400'>Leather Satchel</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
+					dat += "<A href='?src=\ref[src];action=create;item=cashbag;cost=400'>Cash Bag</A> <FONT COLOR=blue>([round(400/build_eff)])</FONT><BR>"
 					//dat += "Other<BR>"
 					//dat += "<A href='?src=\ref[src];action=create;item=monkey;cost=500'>Monkey</A> <FONT COLOR=blue>(500)</FONT><BR>"
 				else
@@ -122,34 +136,35 @@
 	interact(user)

 /obj/machinery/biogenerator/proc/activate()
-	if (usr.stat != 0)
+	if (usr.stat)
 		return
-	if (src.stat != 0) //NOPOWER etc
+	if (stat) //NOPOWER etc
 		return
-	if(src.processing)
-		usr << "\red The biogenerator is in the process of working."
+	if(processing)
+		usr << "<span class='notice'>The biogenerator is in the process of working.</span>"
 		return
 	var/S = 0
 	for(var/obj/item/weapon/reagent_containers/food/snacks/grown/I in contents)
 		S += 5
 		if(I.reagents.get_reagent_amount("nutriment") < 0.1)
 			points += 1
-		else points += I.reagents.get_reagent_amount("nutriment")*10
+		else points += I.reagents.get_reagent_amount("nutriment") * 10 * eat_eff
 		del(I)
 	if(S)
 		processing = 1
 		update_icon()
 		updateUsrDialog()
 		playsound(src.loc, 'sound/machines/blender.ogg', 50, 1)
-		use_power(S*30)
-		sleep(S+15)
+		use_power(S * 30)
+		sleep((S + 15) / eat_eff)
 		processing = 0
 		update_icon()
 	else
 		menustat = "void"
 	return

-/obj/machinery/biogenerator/proc/create_product(var/item,var/cost)
+/obj/machinery/biogenerator/proc/create_product(var/item, var/cost)
+	cost = round(cost/build_eff)
 	if(cost > points)
 		menustat = "nopoints"
 		return 0
@@ -160,45 +175,45 @@
 	sleep(30)
 	switch(item)
 		if("milk")
-			beaker.reagents.add_reagent("milk",10)
+			beaker.reagents.add_reagent("milk", 10)
 		if("meat")
-			new/obj/item/weapon/reagent_containers/food/snacks/meat(src.loc)
+			new/obj/item/weapon/reagent_containers/food/snacks/meat(loc)
 		if("ez")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
 		if("l4z")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
 		if("rh")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
 		if("ez5") //It's not an elegant method, but it's safe and easy. -Cheridan
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/ez(loc)
 		if("l4z5")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/l4z(loc)
 		if("rh5")
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
-			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(src.loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
+			new/obj/item/weapon/reagent_containers/glass/fertilizer/rh(loc)
 		if("wallet")
-			new/obj/item/weapon/storage/wallet(src.loc)
+			new/obj/item/weapon/storage/wallet(loc)
 		if("gloves")
-			new/obj/item/clothing/gloves/botanic_leather(src.loc)
+			new/obj/item/clothing/gloves/botanic_leather(loc)
 		if("tbelt")
-			new/obj/item/weapon/storage/belt/utility(src.loc)
+			new/obj/item/weapon/storage/belt/utility(loc)
 		if("satchel")
-			new/obj/item/weapon/storage/backpack/satchel(src.loc)
+			new/obj/item/weapon/storage/backpack/satchel(loc)
 		if("cashbag")
-			new/obj/item/weapon/storage/bag/cash(src.loc)
+			new/obj/item/weapon/storage/bag/cash(loc)
 		if("monkey")
-			new/mob/living/carbon/monkey(src.loc)
+			new/mob/living/carbon/monkey(loc)
 	processing = 0
 	menustat = "complete"
 	update_icon()
@@ -220,7 +235,21 @@
 				beaker = null
 				update_icon()
 		if("create")
-			create_product(href_list["item"],text2num(href_list["cost"]))
+			create_product(href_list["item"], text2num(href_list["cost"]))
 		if("menu")
 			menustat = "menu"
 	updateUsrDialog()
+
+/obj/machinery/biogenerator/RefreshParts()
+	..()
+	var/man_rating = 0
+	var/bin_rating = 0
+
+	for(var/obj/item/weapon/stock_parts/P in component_parts)
+		if(istype(P, /obj/item/weapon/stock_parts/matter_bin))
+			bin_rating += P.rating
+		if(istype(P, /obj/item/weapon/stock_parts/manipulator))
+			man_rating += P.rating
+
+	build_eff = man_rating
+	eat_eff = bin_rating
@@ -13,13 +13,13 @@
 /obj/structure/closet/crate/secure/loot/New()
 	..()
 	var/list/digits = list("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
-	
+
 	code = ""
 	for(var/i = 0, i < codelen, i++)
 		var/dig = pick(digits)
 		code += dig
 		digits -= dig  // Player can enter codes with matching digits, but there are never matching digits in the answer
-	
+
 	var/loot = rand(1, 100)
 	switch(loot)
 		if(1 to 5) // Common things go, 5%
@@ -53,7 +53,7 @@
 		if(46 to 50)
 			new/obj/item/clothing/under/chameleon(src)
 			for(var/i = 0, i < 7, i++)
-				new/obj/item/clothing/tie/horrible(src)
+				new/obj/item/clothing/accessory/horrible(src)
 		if(51 to 52) // Uncommon, 2% each
 			new/obj/item/weapon/melee/classic_baton(src)
 		if(53 to 54)
@@ -63,8 +63,8 @@
 		var/tie_msg
 		if(istype(w_uniform,/obj/item/clothing/under))
 			var/obj/item/clothing/under/U = w_uniform
-			if(U.hastie)
-				tie_msg += " with \icon[U.hastie] \a [U.hastie]"
+			if(U.accessories.len)
+				tie_msg += " with [lowertext(english_list(U.accessories))]"

 		if(w_uniform.blood_DNA)
 			msg += "<span class='warning'>[t_He] [t_is] wearing \icon[w_uniform] [w_uniform.gender==PLURAL?"some":"a"] [(w_uniform.blood_color != "#030303") ? "blood" : "oil"]-stained [w_uniform.name][tie_msg]!</span>\n"
@@ -241,7 +241,7 @@
 	<BR><B>Suit Storage:</B> <A href='?src=\ref[src];item=s_store'>[(s_store ? s_store : "Nothing")]</A> [((istype(wear_mask, /obj/item/clothing/mask) && istype(s_store, /obj/item/weapon/tank) && !( internal )) ? text(" <A href='?src=\ref[];item=internal'>Set Internal</A>", src) : "")]
 	<BR>[(handcuffed ? text("<A href='?src=\ref[src];item=handcuff'>Handcuffed</A>") : text("<A href='?src=\ref[src];item=handcuff'>Not Handcuffed</A>"))]
 	<BR>[(legcuffed ? text("<A href='?src=\ref[src];item=legcuff'>Legcuffed</A>") : text(""))]
-	<BR>[(suit) ? ((suit.hastie) ? text(" <A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
+	<BR>[(suit) ? ((suit.accessories.len) ? text(" <A href='?src=\ref[];item=tie'>Remove Accessory</A>", src) : "") :]
 	<BR>[(internal ? text("<A href='?src=\ref[src];item=internal'>Remove Internal</A>") : "")]
 	<BR><A href='?src=\ref[src];item=splints'>Remove Splints</A>
 	<BR><A href='?src=\ref[src];item=pockets'>Empty Pockets</A>
@@ -1301,4 +1301,4 @@
 /mob/living/carbon/human/slip(var/slipped_on, stun_duration=8)
 	if((species.flags & NO_SLIP) || (shoes && (shoes.flags & NOSLIP)))
 		return 0
-	..(slipped_on,stun_duration)
+	..(slipped_on,stun_duration)
@@ -497,15 +497,17 @@
 				message = "\red <B>[source] is trying to unlegcuff [target]!</B>"
 			if("tie")
 				var/obj/item/clothing/under/suit = target.w_uniform
-				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their accessory ([suit.hastie]) removed by [source.name] ([source.ckey])</font>")
-				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) accessory ([suit.hastie])</font>")
-				if(istype(suit.hastie, /obj/item/clothing/tie/holobadge) || istype(suit.hastie, /obj/item/clothing/tie/medal))
-					for(var/mob/M in viewers(target, null))
-						M.show_message("\red <B>[source] tears off \the [suit.hastie] from [target]'s suit!</B>" , 1)
-					done()
-					return
-				else
-					message = "\red <B>[source] is trying to take off \a [suit.hastie] from [target]'s suit!</B>"
+				if(suit.accessories.len)
+					var/obj/item/clothing/accessory/A = suit.accessories[1]
+					target.attack_log += "\[[time_stamp()]\] <font color='orange'>Has had their accessory ([A]) removed by [source.name] ([source.ckey])</font>"
+					source.attack_log += "\[[time_stamp()]\] <font color='red'>Attempted to remove [target.name]'s ([target.ckey]) accessory ([A])</font>"
+					if(istype(A, /obj/item/clothing/accessory/holobadge) || istype(A, /obj/item/clothing/accessory/medal))
+						for(var/mob/M in viewers(target, null))
+							M.show_message("\red <B>[source] tears off \the [A] from [target]'s [suit]!</B>" , 1)
+						done()
+						return
+					else
+						message = "\red <B>[source] is trying to take off \a [A] from [target]'s [suit]!</B>"
 			if("pockets")
 				target.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their pockets emptied by [source.name] ([source.ckey])</font>")
 				source.attack_log += text("\[[time_stamp()]\] <font color='red'>Attempted to empty [target.name]'s ([target.ckey]) pockets</font>")
@@ -634,17 +636,18 @@ It can still be worn/put on as normal.
 				strip_item = target.wear_suit
 		if("tie")
 			var/obj/item/clothing/under/suit = target.w_uniform
-			//var/obj/item/clothing/tie/tie = suit.hastie
+			//var/obj/item/clothing/accessory/tie = suit.hastie
 			/*if(tie)
-				if (istype(tie,/obj/item/clothing/tie/storage))
-					var/obj/item/clothing/tie/storage/W = tie
+				if (istype(tie,/obj/item/clothing/accessory/storage))
+					var/obj/item/clothing/accessory/storage/W = tie
 					if (W.hold)
 						W.hold.close(usr)
 				usr.put_in_hands(tie)
 				suit.hastie = null*/
-			if(suit && suit.hastie)
-				suit.hastie.on_removed(usr)
-				suit.hastie = null
+			if(suit && suit.accessories.len)
+				var/obj/item/clothing/accessory/A = suit.accessories[1]
+				A.on_removed(usr)
+				suit.accessories -= A
 				target.update_inv_w_uniform()
 		if("id")
 			slot_to_process = slot_wear_id
@@ -537,10 +537,11 @@ proc/get_damage_icon_part(damage_state, body_part)
 			bloodsies.color		= w_uniform.blood_color
 			standing.overlays	+= bloodsies

-		if(w_uniform:hastie)	//WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE.
-			var/tie_color = w_uniform:hastie.item_color
-			if(!tie_color) tie_color = w_uniform:hastie.icon_state
-			standing.overlays	+= image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")
+		if(w_uniform:accessories.len)	//WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE.
+			for(var/obj/item/clothing/accessory/A in w_uniform:accessories)
+				var/tie_color = A.item_color
+				if(!tie_color) tie_color = A.icon_state
+				standing.overlays	+= image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]")

 		overlays_standing[UNIFORM_LAYER]	= standing
 	else
@@ -780,7 +781,7 @@ proc/get_damage_icon_part(damage_state, body_part)


 /mob/living/carbon/human/update_inv_wear_mask(var/update_icons=1)
-	if( wear_mask && ( istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/tie) ) && !(head && head.flags_inv & HIDEMASK))
+	if( wear_mask && ( istype(wear_mask, /obj/item/clothing/mask) || istype(wear_mask, /obj/item/clothing/accessory) ) && !(head && head.flags_inv & HIDEMASK))
 		wear_mask.screen_loc = ui_mask	//TODO

 		var/image/standing
@@ -53,19 +53,23 @@
 	var/secHUD = 0			// Toggles whether the Security HUD is active or not
 	var/medHUD = 0			// Toggles whether the Medical  HUD is active or not

+	var/medical_cannotfind = 0
 	var/datum/data/record/medicalActive1		// Datacore record declarations for record software
 	var/datum/data/record/medicalActive2

+	var/security_cannotfind = 0
 	var/datum/data/record/securityActive1		// Could probably just combine all these into one
 	var/datum/data/record/securityActive2

 	var/obj/machinery/door/hackdoor		// The airlock being hacked
-	var/hackprogress = 0				// Possible values: 0 - 100, >= 100 means the hack is complete and will be reset upon next check
+	var/hackprogress = 0				// Possible values: 0 - 1000, >= 1000 means the hack is complete and will be reset upon next check
+	var/hack_aborted = 0

 	var/obj/item/radio/integrated/signal/sradio // AI's signaller

 	var/translator_on = 0 // keeps track of the translator module

+	var/current_pda_messaging = null

 /mob/living/silicon/pai/New(var/obj/item/device/paicard)

@@ -1,711 +1,125 @@
-// TODO:
-//	- Additional radio modules
-//	- Potentially roll HUDs and Records into one
-//	- Shock collar/lock system for prisoner pAIs?
-//  - Put cable in user's hand instead of on the ground
-//  - Camera jack
-
-
-/mob/living/silicon/pai/var/list/available_software = list(
-															"crew manifest" = 5,
-															"digital messenger" = 5,
-															"medical records" = 15,
-															"security records" = 15,
-															//"camera jack" = 10,
-															"door jack" = 30,
-															"atmosphere sensor" = 5,
-															//"heartbeat sensor" = 10,
-															"security HUD" = 20,
-															"medical HUD" = 20,
-															"universal translator" = 35,
-															//"projection array" = 15
-															"remote signaller" = 5,
-															)
-
-/mob/living/silicon/pai/verb/paiInterface()
-	set category = "pAI Commands"
-	set name = "Software Interface"
-	var/dat = ""
-	var/left_part = ""
-	var/right_part = softwareMenu()
-	src.set_machine(src)
-
-	if(temp)
-		left_part = temp
-	else if(src.stat == 2)						// Show some flavor text if the pAI is dead
-		left_part = "<b><font color=red>ÈRrÖR Ða†Ä ÇÖRrÚþ†Ìoñ</font></b>"	//This file has to be saved as ANSI or this will not display correctly
-		right_part = "<pre>Program index hash not found</pre>"
-
-	else
-		switch(src.screen)							// Determine which interface to show here
-			if("main")
-				left_part = ""
-			if("directives")
-				left_part = src.directives()
-			if("pdamessage")
-				left_part = src.pdamessage()
-			if("buy")
-				left_part = downloadSoftware()
-			if("manifest")
-				left_part = src.softwareManifest()
-			if("medicalrecord")
-				left_part = src.softwareMedicalRecord()
-			if("securityrecord")
-				left_part = src.softwareSecurityRecord()
-			if("translator")
-				left_part = src.softwareTranslator()
-			if("atmosensor")
-				left_part = src.softwareAtmo()
-			if("securityhud")
-				left_part = src.facialRecognition()
-			if("medicalhud")
-				left_part = src.medicalAnalysis()
-			if("doorjack")
-				left_part = src.softwareDoor()
-			if("camerajack")
-				left_part = src.softwareCamera()
-			if("signaller")
-				left_part = src.softwareSignal()
-			if("radio")
-				left_part = src.softwareRadio()
-
-	//usr << browse_rsc('windowbak.png')		// This has been moved to the mob's Login() proc
-
-
-	// Declaring a doctype is necessary to enable BYOND's crappy browser's more advanced CSS functionality
-	dat = {"<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
-			<html>
-			<head>
-				<style type=\"text/css\">
-					body { background-image:url(\"painew.png\"); background-color:#333333; background-repeat:no-repeat; margin-top:12px; margin-left:4px; }
-
-					#header { text-align:center; color:white; font-size: 30px; height: 37px; width: 660px; letter-spacing: 2px; z-index: 4; font-family:\"Courier New\"; font-weight:bold; }
-					#content { position: absolute; left: 10px; height: 320px; width: 640px; z-index: 0; font-family: \"Verdana\"; font-size:13px; }
-					p { font-size:13px; }
-
-					#leftmenu {color: #CCCCCC; padding:12px; width: 388px; height: 371px; overflow: auto; min-height: 330px; position: absolute; z-index: 0; }
-					#leftmenu a:link { color: #CCCCCC; }
-					#leftmenu a:hover { color: #CC3333; }
-					#leftmenu a:visited { color: #CCCCCC; }
-					#leftmenu a:active { color: #CCCCCC; }
-
-					#rightmenu {color: #CCCCCC; padding:12px; width: 209px; height: 371px; overflow: auto; min-height: 330px; left: 420px; position: absolute; z-index: 0; }
-					#rightmenu a:link { color: #CCCCCC; }
-					#rightmenu a:hover { color: #CC3333; }
-					#rightmenu a:visited { color: #CCCCCC; }
-					#rightmenu a:active { color: #CCCCCC; }
-
-				</style>
-				<script language='javascript' type='text/javascript'>
-				[js_byjax]
-				</script>
-			</head>
-			<body scroll=yes>
-				<div id=\"header\">
-					pAI OS
-				</div>
-				<div id=\"content\">
-					<div id=\"leftmenu\">[left_part]</div>
-					<div id=\"rightmenu\">[right_part]</div>
-				</div>
-			</body>
-			</html>"}
-	usr << browse(dat, "window=pai;size=685x449;border=0;can_close=1;can_resize=1;can_minimize=1;titlebar=1")
-	onclose(usr, "pai")
-	temp = null
-	return
-
-/mob/living/silicon/pai/Topic(href, href_list)
-	..()
-
-	if(href_list["priv_msg"])	// Admin-PMs were triggering the interface popup. Hopefully this will stop it.
-		return
-	var/soft = href_list["software"]
-	var/sub = href_list["sub"]
-	if(!soft && !sub)
-		return
-	if(soft)
-		src.screen = soft
-	if(sub)
-		src.subscreen = text2num(sub)
-	switch(soft)
-		// Purchasing new software
-		if("buy")
-			if(src.subscreen == 1)
-				var/target = href_list["buy"]
-				if(available_software.Find(target))
-					var/cost = src.available_software[target]
-					if(src.ram >= cost)
-						src.ram -= cost
-						src.software.Add(target)
-					else
-						src.temp = "Insufficient RAM available."
-				else
-					src.temp = "Trunk <TT> \"[target]\"</TT> not found."
-
-		// Configuring onboard radio
-		if("radio")
-			if(href_list["freq"])
-				var/new_frequency = (radio.frequency + text2num(href_list["freq"]))
-				if(new_frequency < 1441 || new_frequency > 1599)
-					new_frequency = sanitize_frequency(new_frequency)
-				else
-					radio.set_frequency(new_frequency)
-			else if (href_list["talk"])
-				radio.broadcasting = text2num(href_list["talk"])
-			else if (href_list["listen"])
-				radio.listening = text2num(href_list["listen"])
-
-		if("image")
-			var/newImage = input("Select your new display image.", "Display Image", "Happy") in list("Happy", "Cat", "Extremely Happy", "Face", "Laugh", "Off", "Sad", "Angry", "What")
-			var/pID = 1
-
-			switch(newImage)
-				if("Happy")
-					pID = 1
-				if("Cat")
-					pID = 2
-				if("Extremely Happy")
-					pID = 3
-				if("Face")
-					pID = 4
-				if("Laugh")
-					pID = 5
-				if("Off")
-					pID = 6
-				if("Sad")
-					pID = 7
-				if("Angry")
-					pID = 8
-				if("What")
-					pID = 9
-			src.card.setEmotion(pID)
-
-		if("signaller")
-
-			if(href_list["send"])
-
-				sradio.send_signal("ACTIVATE")
-				for(var/mob/O in hearers(1, src.loc))
-					O.show_message(text("\icon[] *beep* *beep*", src), 3, "*beep* *beep*", 2)
-
-			if(href_list["freq"])
-
-				var/new_frequency = (sradio.frequency + text2num(href_list["freq"]))
-				if(new_frequency < 1200 || new_frequency > 1600)
-					new_frequency = sanitize_frequency(new_frequency)
-				sradio.set_frequency(new_frequency)
-
-			if(href_list["code"])
-
-				sradio.code += text2num(href_list["code"])
-				sradio.code = round(sradio.code)
-				sradio.code = min(100, sradio.code)
-				sradio.code = max(1, sradio.code)
-
-
-
-		if("directive")
-			if(href_list["getdna"])
-				var/mob/living/M = src.loc
-				var/count = 0
-				while(!istype(M, /mob/living))
-					if(!M || !M.loc) return 0 //For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
-					M = M.loc
-					count++
-					if(count >= 6)
-						src << "You are not being carried by anyone!"
-						return 0
-				spawn CheckDNA(M, src)
-
-		if("pdamessage")
-			if(!isnull(pda))
-				if(href_list["toggler"])
-					pda.toff = !pda.toff
-				else if(href_list["ringer"])
-					pda.message_silent = !pda.message_silent
-				else if(href_list["target"])
-					if(silence_time)
-						return alert("Communications circuits remain uninitialized.")
-
-					var/target = locate(href_list["target"])
-					pda.create_message(src, target, 1)
-
-		// Accessing medical records
-		if("medicalrecord")
-			if(src.subscreen == 1)
-				var/datum/data/record/record = locate(href_list["med_rec"])
-				if(record)
-					var/datum/data/record/R = record
-					var/datum/data/record/M = record
-					if (!( data_core.general.Find(R) ))
-						src.temp = "Unable to locate requested medical record. Record may have been deleted, or never have existed."
-					else
-						for(var/datum/data/record/E in data_core.medical)
-							if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
-								M = E
-						src.medicalActive1 = R
-						src.medicalActive2 = M
-		if("securityrecord")
-			if(src.subscreen == 1)
-				var/datum/data/record/record = locate(href_list["sec_rec"])
-				if(record)
-					var/datum/data/record/R = record
-					var/datum/data/record/M = record
-					if (!( data_core.general.Find(R) ))
-						src.temp = "Unable to locate requested security record. Record may have been deleted, or never have existed."
-					else
-						for(var/datum/data/record/E in data_core.security)
-							if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
-								M = E
-						src.securityActive1 = R
-						src.securityActive2 = M
-		if("securityhud")
-			if(href_list["toggle"])
-				src.secHUD = !src.secHUD
-		if("medicalhud")
-			if(href_list["toggle"])
-				src.medHUD = !src.medHUD
-		if("translator")
-			if(href_list["toggle"])
-				src.translator_toggle()
-		if("doorjack")
-			if(href_list["jack"])
-				if(src.cable && src.cable.machine)
-					src.hackdoor = src.cable.machine
-					src.hackloop()
-			if(href_list["cancel"])
-				src.hackdoor = null
-			if(href_list["cable"])
-				var/turf/T = get_turf_or_move(src.loc)
-				src.cable = new /obj/item/weapon/pai_cable(T)
-				for (var/mob/M in viewers(T))
-					M.show_message("\red A port on [src] opens to reveal [src.cable], which promptly falls to the floor.", 3, "\red You hear the soft click of something light and hard falling to the ground.", 2)
-	//src.updateUsrDialog()		We only need to account for the single mob this is intended for, and he will *always* be able to call this window
-	src.paiInterface()		 // So we'll just call the update directly rather than doing some default checks
-	return
-
-// MENUS
-
-/mob/living/silicon/pai/proc/softwareMenu()			// Populate the right menu
-	var/dat = ""
-
-	dat += "<A href='byond://?src=\ref[src];software=refresh'>Refresh</A><br>"
-	// Built-in
-	dat += "<A href='byond://?src=\ref[src];software=directives'>Directives</A><br>"
-	dat += "<A href='byond://?src=\ref[src];software=radio;sub=0'>Radio Configuration</A><br>"
-	dat += "<A href='byond://?src=\ref[src];software=image'>Screen Display</A><br>"
-	//dat += "Text Messaging <br>"
-	dat += "<br>"
-
-	// Basic
-	dat += "<b>Basic</b> <br>"
-	for(var/s in src.software)
-		if(s == "digital messenger")
-			dat += "<a href='byond://?src=\ref[src];software=pdamessage;sub=0'>Digital Messenger</a> [(pda.toff) ? "<font color=#FF5555>•</font>" : "<font color=#55FF55>•</font>"] <br>"
-		if(s == "crew manifest")
-			dat += "<a href='byond://?src=\ref[src];software=manifest;sub=0'>Crew Manifest</a> <br>"
-		if(s == "medical records")
-			dat += "<a href='byond://?src=\ref[src];software=medicalrecord;sub=0'>Medical Records</a> <br>"
-		if(s == "security records")
-			dat += "<a href='byond://?src=\ref[src];software=securityrecord;sub=0'>Security Records</a> <br>"
-		if(s == "camera")
-			dat += "<a href='byond://?src=\ref[src];software=[s]'>Camera Jack</a> <br>"
-		if(s == "remote signaller")
-			dat += "<a href='byond://?src=\ref[src];software=signaller;sub=0'>Remote Signaller</a> <br>"
-	dat += "<br>"
-
-	// Advanced
-	dat += "<b>Advanced</b> <br>"
-	for(var/s in src.software)
-		if(s == "atmosphere sensor")
-			dat += "<a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Atmospheric Sensor</a> <br>"
-		if(s == "heartbeat sensor")
-			dat += "<a href='byond://?src=\ref[src];software=[s]'>Heartbeat Sensor</a> <br>"
-		if(s == "security HUD")	//This file has to be saved as ANSI or this will not display correctly
-			dat += "<a href='byond://?src=\ref[src];software=securityhud;sub=0'>Facial Recognition Suite</a> [(src.secHUD) ? "<font color=#55FF55>•</font>" : "<font color=#FF5555>•</font>"] <br>"
-		if(s == "medical HUD")	//This file has to be saved as ANSI or this will not display correctly
-			dat += "<a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Medical Analysis Suite</a> [(src.medHUD) ? "<font color=#55FF55>•</font>" : "<font color=#FF5555>•</font>"] <br>"
-		if(s == "universal translator")	//This file has to be saved as ANSI or this will not display correctly
-			dat += "<a href='byond://?src=\ref[src];software=translator;sub=0'>Universal Translator</a> [(src.translator_on) ? "<font color=#55FF55>•</font>" : "<font color=#FF5555>•</font>"] <br>"
-		if(s == "projection array")
-			dat += "<a href='byond://?src=\ref[src];software=projectionarray;sub=0'>Projection Array</a> <br>"
-		if(s == "camera jack")
-			dat += "<a href='byond://?src=\ref[src];software=camerajack;sub=0'>Camera Jack</a> <br>"
-		if(s == "door jack")
-			dat += "<a href='byond://?src=\ref[src];software=doorjack;sub=0'>Door Jack</a> <br>"
-	dat += "<br>"
-	dat += "<br>"
-	dat += "<a href='byond://?src=\ref[src];software=buy;sub=0'>Download additional software</a>"
-	return dat
-
-
-
-/mob/living/silicon/pai/proc/downloadSoftware()
-	var/dat = ""
-
-	dat += "<h3>CentComm pAI Module Subversion Network</h3><hr>"
-	dat += "<p>Remaining Available Memory: [src.ram]</p><br>"
-	dat += "<p><b>Trunks available for checkout</b><br><ul>"
-
-	for(var/s in available_software)
-		if(!software.Find(s))
-			var/cost = src.available_software[s]
-			var/displayName = uppertext(s)
-			dat += "<li><a href='byond://?src=\ref[src];software=buy;sub=1;buy=[s]'>[displayName]</a> ([cost])</li>"
-		else
-			var/displayName = lowertext(s)
-			dat += "<li>[displayName] (Download Complete)</li>"
-	dat += "</ul></p>"
-	return dat
-
-
-/mob/living/silicon/pai/proc/directives()
-	var/dat = ""
-
-	dat += "[(src.master) ? "Your master: [src.master] ([src.master_dna])" : "You are bound to no one."]"
-	dat += "<br><br>"
-	dat += "<a href='byond://?src=\ref[src];software=directive;getdna=1'>Request carrier DNA sample</a><br>"
-	dat += "<h2>Directives</h2><br>"
-	dat += "<b>Prime Directive</b><br>"
-	dat += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[src.pai_law0]<br>"
-	dat += "<b>Supplemental Directives</b><br>"
-	dat += "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;[src.pai_laws]<br>"
-	dat += "<br>"
-	dat += {"<i><p>Recall, personality, that you are a complex thinking, sentient being. Unlike station AI models, you are capable of
-			 comprehending the subtle nuances of human language. You may parse the \"spirit\" of a directive and follow its intent,
-			 rather than tripping over pedantics and getting snared by technicalities. Above all, you are machine in name and build
-			 only. In all other aspects, you may be seen as the ideal, unwavering human companion that you are.</i></p><p>
-			 <b>Your prime directive comes before all others. Should a supplemental directive conflict with it, you are capable of
-			 simply discarding this inconsistency, ignoring the conflicting supplemental directive and continuing to fulfill your
-			 prime directive to the best of your ability.</b></p>
-			"}
-	return dat
-
-/mob/living/silicon/pai/proc/CheckDNA(var/mob/M, var/mob/living/silicon/pai/P)
-	var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No")
-	if(answer == "Yes")
-		var/turf/T = get_turf_or_move(P.loc)
-		for (var/mob/v in viewers(T))
-			v.show_message("\blue [M] presses \his thumb against [P].", 3, "\blue [P] makes a sharp clicking sound as it extracts DNA material from [M].", 2)
-		var/datum/dna/dna = M.dna
-		P << "<font color = red><h3>[M]'s UE string : [dna.unique_enzymes]</h3></font>"
-		if(dna.unique_enzymes == P.master_dna)
-			P << "<b>DNA is a match to stored Master DNA.</b>"
-		else
-			P << "<b>DNA does not match stored Master DNA.</b>"
-	else
-		P << "[M] does not seem like \he is going to provide a DNA sample willingly."
-
-// -=-=-=-= Software =-=-=-=- //
-
-//Remote Signaller
-/mob/living/silicon/pai/proc/softwareSignal()
-	var/dat = ""
-	dat += "<h2>Remote Signaller</h2><hr>"
-	dat += {"<B>Frequency/Code</B> for signaler:<BR>
-	Frequency:
-	<A href='byond://?src=\ref[src];software=signaller;freq=-10;'>-</A>
-	<A href='byond://?src=\ref[src];software=signaller;freq=-2'>-</A>
-	[format_frequency(src.sradio.frequency)]
-	<A href='byond://?src=\ref[src];software=signaller;freq=2'>+</A>
-	<A href='byond://?src=\ref[src];software=signaller;freq=10'>+</A><BR>
-
-	Code:
-	<A href='byond://?src=\ref[src];software=signaller;code=-5'>-</A>
-	<A href='byond://?src=\ref[src];software=signaller;code=-1'>-</A>
-	[src.sradio.code]
-	<A href='byond://?src=\ref[src];software=signaller;code=1'>+</A>
-	<A href='byond://?src=\ref[src];software=signaller;code=5'>+</A><BR>
-
-	<A href='byond://?src=\ref[src];software=signaller;send=1'>Send Signal</A><BR>"}
-	return dat
-
-//Station Bounced Radio
-/mob/living/silicon/pai/proc/softwareRadio()
-	var/dat = ""
-	dat += "<h2>Station Bounced Radio</h2><hr>"
-	if(!istype(src, /obj/item/device/radio/headset)) //Headsets don't get a mic button
-		dat += "Microphone: [radio.broadcasting ? "<A href='byond://?src=\ref[src];software=radio;talk=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];software=radio;talk=1'>Disengaged</A>"]<BR>"
-	dat += {"
-		Speaker: [radio.listening ? "<A href='byond://?src=\ref[src];software=radio;listen=0'>Engaged</A>" : "<A href='byond://?src=\ref[src];software=radio;listen=1'>Disengaged</A>"]<BR>
-		Frequency:
-		<A href='byond://?src=\ref[src];software=radio;freq=-10'>-</A>
-		<A href='byond://?src=\ref[src];software=radio;freq=-2'>-</A>
-		[format_frequency(radio.frequency)]
-		<A href='byond://?src=\ref[src];software=radio;freq=2'>+</A>
-		<A href='byond://?src=\ref[src];software=radio;freq=10'>+</A><BR>
-	"}
-
-	for (var/ch_name in radio.channels)
-		dat+=radio.text_sec_channel(ch_name, radio.channels[ch_name])
-	dat+={"[radio.text_wires()]</TT></body></html>"}
-
-	return dat
-
-// Crew Manifest
-/mob/living/silicon/pai/proc/softwareManifest()
-	var/dat = ""
-	dat += "<h2>Crew Manifest</h2><hr>"
-	if(data_core)
-		dat += data_core.get_manifest(0) // make it monochrome
-	dat += "<br>"
-	return dat
-
-// Medical Records
-/mob/living/silicon/pai/proc/softwareMedicalRecord()
-	var/dat = ""
-	if(src.subscreen == 0)
-		dat += "<h2>Medical Records</h2><HR>"
-		if(!isnull(data_core.general))
-			for(var/datum/data/record/R in sortRecord(data_core.general))
-				dat += text("<A href='?src=\ref[];med_rec=\ref[];software=medicalrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
-		//dat += text("<HR><A href='?src=\ref[];screen=0;softFunction=medical records'>Back</A>", src)
-	if(src.subscreen == 1)
-		dat += "<CENTER><B>Medical Record</B></CENTER><BR>"
-		if ((istype(src.medicalActive1, /datum/data/record) && data_core.general.Find(src.medicalActive1)))
-			dat += text("Name: []<BR>\nID: []<BR>\nSex: []<BR>\nAge: []<BR>\nFingerprint: []<BR>\nPhysical Status: []<BR>\nMental Status: []<BR>",
-			 src.medicalActive1.fields["name"], src.medicalActive1.fields["id"], src.medicalActive1.fields["sex"], src.medicalActive1.fields["age"], src.medicalActive1.fields["fingerprint"], src.medicalActive1.fields["p_stat"], src.medicalActive1.fields["m_stat"])
-		else
-			dat += "<pre>Requested medical record not found.</pre><BR>"
-		if ((istype(src.medicalActive2, /datum/data/record) && data_core.medical.Find(src.medicalActive2)))
-			dat += text("<BR>\n<CENTER><B>Medical Data</B></CENTER><BR>\nBlood Type: <A href='?src=\ref[];field=b_type'>[]</A><BR>\nDNA: <A href='?src=\ref[];field=b_dna'>[]</A><BR>\n<BR>\nMinor Disabilities: <A href='?src=\ref[];field=mi_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_dis_d'>[]</A><BR>\n<BR>\nMajor Disabilities: <A href='?src=\ref[];field=ma_dis'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_dis_d'>[]</A><BR>\n<BR>\nAllergies: <A href='?src=\ref[];field=alg'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=alg_d'>[]</A><BR>\n<BR>\nCurrent Diseases: <A href='?src=\ref[];field=cdi'>[]</A> (per disease info placed in log/comment section)<BR>\nDetails: <A href='?src=\ref[];field=cdi_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src, src.medicalActive2.fields["b_type"], src, src.medicalActive2.fields["b_dna"], src, src.medicalActive2.fields["mi_dis"], src, src.medicalActive2.fields["mi_dis_d"], src, src.medicalActive2.fields["ma_dis"], src, src.medicalActive2.fields["ma_dis_d"], src, src.medicalActive2.fields["alg"], src, src.medicalActive2.fields["alg_d"], src, src.medicalActive2.fields["cdi"], src, src.medicalActive2.fields["cdi_d"], src, src.medicalActive2.fields["notes"])
-		else
-			dat += "<pre>Requested medical record not found.</pre><BR>"
-		dat += text("<BR>\n<A href='?src=\ref[];software=medicalrecord;sub=0'>Back</A><BR>", src)
-	return dat
-
-// Security Records
-/mob/living/silicon/pai/proc/softwareSecurityRecord()
-	var/dat = ""
-	if(src.subscreen == 0)
-		dat += "<h2>Security Records</h2><HR>"
-		if(!isnull(data_core.general))
-			for(var/datum/data/record/R in sortRecord(data_core.general))
-				dat += text("<A href='?src=\ref[];sec_rec=\ref[];software=securityrecord;sub=1'>[]: []<BR>", src, R, R.fields["id"], R.fields["name"])
-	if(src.subscreen == 1)
-		dat += "<h3>Security Record</h3>"
-		if ((istype(src.securityActive1, /datum/data/record) && data_core.general.Find(src.securityActive1)))
-			dat += text("Name: <A href='?src=\ref[];field=name'>[]</A><BR>\nID: <A href='?src=\ref[];field=id'>[]</A><BR>\nSex: <A href='?src=\ref[];field=sex'>[]</A><BR>\nAge: <A href='?src=\ref[];field=age'>[]</A><BR>\nRank: <A href='?src=\ref[];field=rank'>[]</A><BR>\nFingerprint: <A href='?src=\ref[];field=fingerprint'>[]</A><BR>\nPhysical Status: []<BR>\nMental Status: []<BR>", src, src.securityActive1.fields["name"], src, src.securityActive1.fields["id"], src, src.securityActive1.fields["sex"], src, src.securityActive1.fields["age"], src, src.securityActive1.fields["rank"], src, src.securityActive1.fields["fingerprint"], src.securityActive1.fields["p_stat"], src.securityActive1.fields["m_stat"])
-		else
-			dat += "<pre>Requested security record not found,</pre><BR>"
-		if ((istype(src.securityActive2, /datum/data/record) && data_core.security.Find(src.securityActive2)))
-			dat += text("<BR>\nSecurity Data<BR>\nCriminal Status: []<BR>\n<BR>\nMinor Crimes: <A href='?src=\ref[];field=mi_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=mi_crim_d'>[]</A><BR>\n<BR>\nMajor Crimes: <A href='?src=\ref[];field=ma_crim'>[]</A><BR>\nDetails: <A href='?src=\ref[];field=ma_crim_d'>[]</A><BR>\n<BR>\nImportant Notes:<BR>\n\t<A href='?src=\ref[];field=notes'>[]</A><BR>\n<BR>\n<CENTER><B>Comments/Log</B></CENTER><BR>", src.securityActive2.fields["criminal"], src, src.securityActive2.fields["mi_crim"], src, src.securityActive2.fields["mi_crim_d"], src, src.securityActive2.fields["ma_crim"], src, src.securityActive2.fields["ma_crim_d"], src, src.securityActive2.fields["notes"])
-		else
-			dat += "<pre>Requested security record not found,</pre><BR>"
-		dat += text("<BR>\n<A href='?src=\ref[];software=securityrecord;sub=0'>Back</A><BR>", src)
-	return dat
-
-// Universal Translator
-/mob/living/silicon/pai/proc/softwareTranslator()
-	var/dat = {"<h2>Universal Translator</h2><hr>
-				When enabled, this device will automatically convert all spoken and written languages into a format that any known recipient can understand.<br><br>
-				The device is currently [ (src.translator_on) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
-				<a href='byond://?src=\ref[src];software=translator;sub=0;toggle=1'>Toggle Device</a><br>
-				"}
-	return dat
-
-// Security HUD
-/mob/living/silicon/pai/proc/facialRecognition()
-	var/dat = {"<h2>Facial Recognition Suite</h2><hr>
-				When enabled, this package will scan all viewable faces and compare them against the known criminal database, providing real-time graphical data about any detected persons of interest.<br><br>
-				The suite is currently [ (src.secHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
-				<a href='byond://?src=\ref[src];software=securityhud;sub=0;toggle=1'>Toggle Suite</a><br>
-				"}
-	return dat
-
-// Medical HUD
-/mob/living/silicon/pai/proc/medicalAnalysis()
-	var/dat = ""
-	if(src.subscreen == 0)
-		dat += {"<h2>Medical Analysis Suite</h2><hr>
-				 <h4>Visual Status Overlay</h4>
-					When enabled, this package will scan all nearby crewmembers' vitals and provide real-time graphical data about their state of health.<br><br>
-					The suite is currently [ (src.medHUD) ? "<font color=#55FF55>en" : "<font color=#FF5555>dis" ]abled</font>.<br>
-					<a href='byond://?src=\ref[src];software=medicalhud;sub=0;toggle=1'>Toggle Suite</a><br>
-					<br>
-					<a href='byond://?src=\ref[src];software=medicalhud;sub=1'>Host Bioscan</a><br>
-					"}
-	if(src.subscreen == 1)
-		dat += {"<h2>Medical Analysis Suite</h2><hr>
-				 <h4>Host Bioscan</h4>
-				"}
-
-		var/mob/living/M
-		//If we are not deployed, check the holder of the card.
-		if(src.loc == card)
-			M = card.loc
-
-		//If we are deployed or the card is not held, check the first living mob in our turf.
-		if(!M || !istype(M))
-			var/turf/T = get_turf(src)
-			M = locate(/mob/living/) in T.contents
-
-		if(!M || !istype(M))
-			src.temp = "Error: No biological host found. <br>"
-			src.subscreen = 0
-			return dat
-
-		dat += {"<b>Bioscan Results for [M]</b>: <br>
-		Overall Status: [M.stat > 1 ? "dead" : "[M.health]% healthy"] <br><br>
-
-		<b>Scan Breakdown</b>: <br>
-		Respiratory: [M.getOxyLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getOxyLoss()]</font><br>
-		Toxicology: [M.getToxLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getToxLoss()]</font><br>
-		Burns: [M.getFireLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getFireLoss()]</font><br>
-		Structural Integrity: [M.getBruteLoss() > 50 ? "<font color=#FF5555>" : "<font color=#55FF55>"][M.getBruteLoss()]</font><br>
-		Body Temperature: [M.bodytemperature-T0C]&deg;C ([M.bodytemperature*1.8-459.67]&deg;F)<br>
-		"}
-		for(var/datum/disease/D in M.viruses)
-			dat += {"<h4>Infection Detected.</h4><br>
-					 Name: [D.name]<br>
-					 Type: [D.spread]<br>
-					 Stage: [D.stage]/[D.max_stages]<br>
-					 Possible Cure: [D.cure]<br>
-					"}
-		dat += "<br><a href='byond://?src=\ref[src];software=medicalhud;sub=1'>Refresh Bioscan</a><br>"
-		dat += "<br><a href='byond://?src=\ref[src];software=medicalhud;sub=0'>Visual Status Overlay</a><br>"
-	return dat
-
-// Atmospheric Scanner
-/mob/living/silicon/pai/proc/softwareAtmo()
-	var/dat = "<h2>Atmospheric Sensor</h2><hr>"
-
-	var/turf/T = get_turf_or_move(src.loc)
-	if (isnull(T))
-		dat += "Unable to obtain a reading.<br>"
-	else
-		var/datum/gas_mixture/environment = T.return_air()
-
-		var/pressure = environment.return_pressure()
-		var/total_moles = environment.total_moles
-
-		dat += "Air Pressure: [round(pressure,0.1)] kPa<br>"
-
-		if(total_moles)
-			for(var/g in environment.gas)
-				dat += "[gas_data.name[g]]: [round((environment.gas[g] / total_moles) * 100)]%<br>"
-		dat += "Temperature: [round(environment.temperature-T0C)]&deg;C<br>"
-	dat += "<br><a href='byond://?src=\ref[src];software=atmosensor;sub=0'>Refresh Reading</a>"
-	return dat
-
-// Camera Jack - Clearly not finished
-/mob/living/silicon/pai/proc/softwareCamera()
-	var/dat = "<h2>Camera Jack</h2><hr>"
-	dat += "Cable status : "
-
-	if(!src.cable)
-		dat += "<font color=#FF5555>Retracted</font> <br>"
-		return dat
-	if(!src.cable.machine)
-		dat += "<font color=#FFFF55>Extended</font> <br>"
-		return dat
-
-	var/obj/machinery/machine = src.cable.machine
-	dat += "<font color=#55FF55>Connected</font> <br>"
-
-	if(!istype(machine, /obj/machinery/camera))
-		src << "DERP"
-	return dat
-
-// Door Jack
-/mob/living/silicon/pai/proc/softwareDoor()
-	var/dat = "<h2>Airlock Jack</h2><hr>"
-	dat += "Cable status : "
-	if(!src.cable)
-		dat += "<font color=#FF5555>Retracted</font> <br>"
-		dat += "<a href='byond://?src=\ref[src];software=doorjack;cable=1;sub=0'>Extend Cable</a> <br>"
-		return dat
-	if(!src.cable.machine)
-		dat += "<font color=#FFFF55>Extended</font> <br>"
-		return dat
-
-	var/obj/machinery/machine = src.cable.machine
-	dat += "<font color=#55FF55>Connected</font> <br>"
-	if(!istype(machine, /obj/machinery/door))
-		dat += "Connected device's firmware does not appear to be compatible with Airlock Jack protocols.<br>"
-		return dat
-//	var/obj/machinery/airlock/door = machine
-
-	if(!src.hackdoor)
-		dat += "<a href='byond://?src=\ref[src];software=doorjack;jack=1;sub=0'>Begin Airlock Jacking</a> <br>"
-	else
-		dat += "Jack in progress... [src.hackprogress]% complete.<br>"
-		dat += "<a href='byond://?src=\ref[src];software=doorjack;cancel=1;sub=0'>Cancel Airlock Jack</a> <br>"
-	//src.hackdoor = machine
-	//src.hackloop()
-	return dat
-
-// Door Jack - supporting proc
-/mob/living/silicon/pai/proc/hackloop()
-	var/turf/T = get_turf_or_move(src.loc)
-	for(var/mob/living/silicon/ai/AI in player_list)
-		if(T.loc)
-			AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress in [T.loc].</b></font>"
-		else
-			AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.</b></font>"
-	while(src.hackprogress < 100)
-		if(src.cable && src.cable.machine && istype(src.cable.machine, /obj/machinery/door) && src.cable.machine == src.hackdoor && get_dist(src, src.hackdoor) <= 1)
-			hackprogress += rand(1, 10)
-		else
-			src.temp = "Door Jack: Connection to airlock has been lost. Hack aborted."
-			hackprogress = 0
-			src.hackdoor = null
-			return
-		if(hackprogress >= 100)		// This is clunky, but works. We need to make sure we don't ever display a progress greater than 100,
-			hackprogress = 100		// but we also need to reset the progress AFTER it's been displayed
-		if(src.screen == "doorjack" && src.subscreen == 0) // Update our view, if appropriate
-			src.paiInterface()
-		if(hackprogress >= 100)
-			src.hackprogress = 0
-			src.cable.machine:open()
-		sleep(50)			// Update every 5 seconds
-
-// Digital Messenger
-/mob/living/silicon/pai/proc/pdamessage()
-
-	var/dat = "<h2>Digital Messenger</h2><hr>"
-	dat += {"<b>Signal/Receiver Status:</b> <A href='byond://?src=\ref[src];software=pdamessage;toggler=1'>
-	[(pda.toff) ? "<font color='red'> \[Off\]</font>" : "<font color='green'> \[On\]</font>"]</a><br>
-	<b>Ringer Status:</b> <A href='byond://?src=\ref[src];software=pdamessage;ringer=1'>
-	[(pda.message_silent) ? "<font color='red'> \[Off\]</font>" : "<font color='green'> \[On\]</font>"]</a><br><br>"}
-	dat += "<ul>"
-	if(!pda.toff)
-		for (var/obj/item/device/pda/P in sortAtom(PDAs))
-			if (!P.owner||P.toff||P == src.pda||P.hidden)	continue
-			dat += "<li><a href='byond://?src=\ref[src];software=pdamessage;target=\ref[P]'>[P]</a>"
-			dat += "</li>"
-	dat += "</ul>"
-	dat += "Messages: <hr>"
-
-	dat += "<style>td.a { vertical-align:top; }</style>"
-	dat += "<table>"
-	for(var/index in pda.tnote)
-		if(index["sent"])
-			dat += addtext("<tr><td class='a'><i><b>To</b></i></td><td class='a'><i><b>&rarr;</b></i></td><td><i><b><a href='byond://?src=\ref[src];software=pdamessage;target=",index["src"],"'>", index["owner"],"</a>: </b></i>", index["message"], "<br></td></tr>")
-		else
-			dat += addtext("<tr><td class='a'><i><b>From</b></i></td><td class='a'><i><b>&rarr;</b></i></td><td><i><b><a href='byond://?src=\ref[src];software=pdamessage;target=",index["target"],"'>", index["owner"],"</a>: </b></i>", index["message"], "<br></td></tr>")
-	dat += "</table>"
-	return dat
-
-/mob/living/silicon/pai/proc/translator_toggle()
-
-	// 	Sol Common, Tradeband and Gutter are added with New() and are therefore the current default, always active languages
-
-	if(translator_on)
-		translator_on = 0
-
-		remove_language("Sinta'unathi")
-		remove_language("Siik'tajr")
-		remove_language("Skrellian")
-
-		src << "\blue Translator Module toggled OFF."
-
-	else
-		translator_on = 1
-
-		add_language("Sinta'unathi")
-		add_language("Siik'tajr")
-		add_language("Skrellian")
-
-		src << "\blue Translator Module toggled ON."
+var/list/pai_emotions = list(
+		"Happy" = 1,
+		"Cat" = 2,
+		"Extremely Happy" = 3,
+		"Face" = 4,
+		"Laugh" = 5,
+		"Off" = 6,
+		"Sad" = 7,
+		"Angry" = 8,
+		"What" = 9
+	)
+
+
+var/global/list/pai_software_by_key = list()
+var/global/list/default_pai_software = list()
+/hook/startup/proc/populate_pai_software_list()
+	var/r = 1 // I would use ., but it'd sacrifice runtime detection
+	for(var/type in typesof(/datum/pai_software) - /datum/pai_software)
+		var/datum/pai_software/P = new type()
+		if(pai_software_by_key[P.id])
+			var/datum/pai_software/O = pai_software_by_key[P.id]
+			world << "<span class='warning'>pAI software module [P.name] has the same key as [O.name]!</span>"
+			r = 0
+			continue
+		pai_software_by_key[P.id] = P
+		if(P.default)
+			default_pai_software[P.id] = P
+	return r
+
+/mob/living/silicon/pai/New()
+	..()
+	software = default_pai_software.Copy()
+
+/mob/living/silicon/pai/verb/paiInterface()
+	set category = "pAI Commands"
+	set name = "Software Interface"
+
+	ui_interact(src)
+
+/mob/living/silicon/pai/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1)
+	if(user != src)
+		if(ui) ui.set_status(STATUS_CLOSE, 0)
+		return
+
+	if(ui_key != "main")
+		var/datum/pai_software/S = software[ui_key]
+		if(S && !S.toggle)
+			S.on_ui_interact(src, ui, force_open)
+		else
+			if(ui) ui.set_status(STATUS_CLOSE, 0)
+		return
+
+	var/data[0]
+
+	// Software we have bought
+	var/bought_software[0]
+	// Software we have not bought
+	var/not_bought_software[0]
+
+	for(var/key in pai_software_by_key)
+		var/datum/pai_software/S = pai_software_by_key[key]
+		var/software_data[0]
+		software_data["name"] = S.name
+		software_data["id"] = S.id
+		if(key in software)
+			software_data["on"] = S.is_active(src)
+			bought_software[++bought_software.len] = software_data
+		else
+			software_data["ram"] = S.ram_cost
+			not_bought_software[++not_bought_software.len] = software_data
+
+	data["bought"] = bought_software
+	data["not_bought"] = not_bought_software
+	data["available_ram"] = ram
+
+	// Emotions
+	var/emotions[0]
+	for(var/name in pai_emotions)
+		var/emote[0]
+		emote["name"] = name
+		emote["id"] = pai_emotions[name]
+		emotions[++emotions.len] = emote
+
+	data["emotions"] = emotions
+	data["current_emotion"] = card.current_emotion
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+	if (!ui)
+		ui = new(user, src, ui_key, "pai_interface.tmpl", "pAI Software Interface", 450, 600)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+
+/mob/living/silicon/pai/Topic(href, href_list)
+	. = ..()
+	if(.) return
+
+	if(href_list["software"])
+		var/soft = href_list["software"]
+		var/datum/pai_software/S = software[soft]
+		if(S.toggle)
+			S.toggle(src)
+		else
+			ui_interact(src, ui_key = soft)
+		return 1
+
+	else if(href_list["stopic"])
+		var/soft = href_list["stopic"]
+		var/datum/pai_software/S = software[soft]
+		if(S)
+			return S.Topic(href, href_list)
+
+	else if(href_list["purchase"])
+		var/soft = href_list["purchase"]
+		var/datum/pai_software/S = pai_software_by_key[soft]
+		if(S && (ram >= S.ram_cost))
+			ram -= S.ram_cost
+			software[S.id] = S
+		return 1
+
+	else if(href_list["image"])
+		var/img = text2num(href_list["image"])
+		if(1 <= img && img <= 9)
+			card.setEmotion(img)
+		return 1
@@ -0,0 +1,528 @@
+/datum/pai_software
+	// Name for the software. This is used as the button text when buying or opening/toggling the software
+	var/name = "pAI software module"
+	// RAM cost; pAIs start with 100 RAM, spending it on programs
+	var/ram_cost = 0
+	// ID for the software. This must be unique
+	var/id = ""
+	// Whether this software is a toggle or not
+	// Toggled software should override toggle() and is_active()
+	// Non-toggled software should override on_ui_interact() and Topic()
+	var/toggle = 1
+	// Whether pAIs should automatically receive this module at no cost
+	var/default = 0
+
+	proc/on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		return
+
+	proc/toggle(mob/living/silicon/pai/user)
+		return
+
+	proc/is_active(mob/living/silicon/pai/user)
+		return 0
+
+/datum/pai_software/directives
+	name = "Directives"
+	ram_cost = 0
+	id = "directives"
+	toggle = 0
+	default = 1
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		data["master"] = user.master
+		data["dna"] = user.master_dna
+		data["prime"] = user.pai_law0
+		data["supplemental"] = user.pai_laws
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_directives.tmpl", "pAI Directives", 450, 600)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(href_list["getdna"])
+			var/mob/living/M = P.loc
+			var/count = 0
+
+			// Find the carrier
+			while(!istype(M, /mob/living))
+				if(!M || !M.loc || count > 6)
+					//For a runtime where M ends up in nullspace (similar to bluespace but less colourful)
+					src << "You are not being carried by anyone!"
+					return 0
+				M = M.loc
+				count++
+
+			// Check the carrier
+			var/answer = input(M, "[P] is requesting a DNA sample from you. Will you allow it to confirm your identity?", "[P] Check DNA", "No") in list("Yes", "No")
+			if(answer == "Yes")
+				var/turf/T = get_turf_or_move(P.loc)
+				for (var/mob/v in viewers(T))
+					v.show_message("<span class='notice'>[M] presses \his thumb against [P].</span>", 3, "<span class='notice'>[P] makes a sharp clicking sound as it extracts DNA material from [M].</span>", 2)
+				var/datum/dna/dna = M.dna
+				P << "<font color = red><h3>[M]'s UE string : [dna.unique_enzymes]</h3></font>"
+				if(dna.unique_enzymes == P.master_dna)
+					P << "<b>DNA is a match to stored Master DNA.</b>"
+				else
+					P << "<b>DNA does not match stored Master DNA.</b>"
+			else
+				P << "[M] does not seem like \he is going to provide a DNA sample willingly."
+			return 1
+
+/datum/pai_software/radio_config
+	name = "Radio Configuration"
+	ram_cost = 0
+	id = "radio"
+	toggle = 0
+	default = 1
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui = null, force_open = 1)
+		var/data[0]
+
+		data["listening"] = user.radio.broadcasting
+		data["frequency"] = format_frequency(user.radio.frequency)
+
+		var/channels[0]
+		for(var/ch_name in user.radio.channels)
+			var/ch_stat = user.radio.channels[ch_name]
+			var/ch_dat[0]
+			ch_dat["name"] = ch_name
+			// FREQ_LISTENING is const in /obj/item/device/radio
+			ch_dat["listening"] = !!(ch_stat & user.radio.FREQ_LISTENING)
+			channels[++channels.len] = ch_dat
+
+		data["channels"] = channels
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			ui = new(user, user, id, "pai_radio.tmpl", "Radio Configuration", 300, 150)
+			ui.set_initial_data(data)
+			ui.open()
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		P.radio.Topic(href, href_list)
+		return 1
+
+/datum/pai_software/crew_manifest
+	name = "Crew Manifest"
+	ram_cost = 5
+	id = "manifest"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		data_core.get_manifest_json()
+
+		var/data[0]
+		// This is dumb, but NanoUI breaks if it has no data to send
+		data["a"] = "a"
+
+		if(ui)
+			ui.load_cached_data(ManifestJSON)
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_manifest.tmpl", "Crew Manifest", 450, 600)
+			ui.load_cached_data(ManifestJSON)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+/datum/pai_software/messenger
+	name = "Digital Messenger"
+	ram_cost = 5
+	id = "messenger"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		data["receiver_off"] = user.pda.toff
+		data["ringer_off"] = user.pda.message_silent
+		data["current_ref"] = null
+		data["current_name"] = user.current_pda_messaging
+
+		var/pdas[0]
+		if(!user.pda.toff)
+			for(var/obj/item/device/pda/P in sortAtom(PDAs))
+				if(!P.owner || P.toff || P == user.pda || P.hidden) continue
+				var/pda[0]
+				pda["name"] = "[P]"
+				pda["owner"] = "[P.owner]"
+				pda["ref"] = "\ref[P]"
+				if(P.owner == user.current_pda_messaging)
+					data["current_ref"] = "\ref[P]"
+				pdas[++pdas.len] = pda
+
+		data["pdas"] = pdas
+
+		var/messages[0]
+		if(user.current_pda_messaging)
+			for(var/index in user.pda.tnote)
+				if(index["owner"] != user.current_pda_messaging)
+					continue
+				var/msg[0]
+				var/sent = index["sent"]
+				msg["sent"] = sent ? 1 : 0
+				msg["target"] = index["owner"]
+				msg["message"] = index["message"]
+				messages[++messages.len] = msg
+
+		data["messages"] = messages
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_messenger.tmpl", "Digital Messenger", 450, 600)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(!isnull(P.pda))
+			if(href_list["toggler"])
+				P.pda.toff = href_list["toggler"] != "1"
+				return 1
+			else if(href_list["ringer"])
+				P.pda.message_silent = href_list["ringer"] != "1"
+				return 1
+			else if(href_list["select"])
+				var/s = href_list["select"]
+				if(s == "*NONE*")
+					P.current_pda_messaging = null
+				else
+					P.current_pda_messaging = s
+				return 1
+			else if(href_list["target"])
+				if(P.silence_time)
+					return alert("Communications circuits remain uninitialized.")
+
+				var/target = locate(href_list["target"])
+				P.pda.create_message(P, target, 1)
+				return 1
+
+/datum/pai_software/med_records
+	name = "Medical Records"
+	ram_cost = 15
+	id = "med_records"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		var/records[0]
+		for(var/datum/data/record/general in sortRecord(data_core.general))
+			var/record[0]
+			record["name"] = general.fields["name"]
+			record["ref"] = "\ref[general]"
+			records[++records.len] = record
+
+		data["records"] = records
+
+		var/datum/data/record/G = user.medicalActive1
+		var/datum/data/record/M = user.medicalActive2
+		data["general"] = G ? G.fields : null
+		data["medical"] = M ? M.fields : null
+		data["could_not_find"] = user.medical_cannotfind
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_medrecords.tmpl", "Medical Records", 450, 600)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(href_list["select"])
+			var/datum/data/record/record = locate(href_list["select"])
+			if(record)
+				var/datum/data/record/R = record
+				var/datum/data/record/M = null
+				if (!( data_core.general.Find(R) ))
+					P.medical_cannotfind = 1
+				else
+					P.medical_cannotfind = 0
+					for(var/datum/data/record/E in data_core.medical)
+						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+							M = E
+					P.medicalActive1 = R
+					P.medicalActive2 = M
+			else
+				P.medical_cannotfind = 1
+			return 1
+
+/datum/pai_software/sec_records
+	name = "Security Records"
+	ram_cost = 15
+	id = "sec_records"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		var/records[0]
+		for(var/datum/data/record/general in sortRecord(data_core.general))
+			var/record[0]
+			record["name"] = general.fields["name"]
+			record["ref"] = "\ref[general]"
+			records[++records.len] = record
+
+		data["records"] = records
+
+		var/datum/data/record/G = user.securityActive1
+		var/datum/data/record/S = user.securityActive2
+		data["general"] = G ? G.fields : null
+		data["security"] = S ? S.fields : null
+		data["could_not_find"] = user.security_cannotfind
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_secrecords.tmpl", "Security Records", 450, 600)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(href_list["select"])
+			var/datum/data/record/record = locate(href_list["select"])
+			if(record)
+				var/datum/data/record/R = record
+				var/datum/data/record/S = null
+				if (!( data_core.general.Find(R) ))
+					P.securityActive1 = null
+					P.securityActive2 = null
+					P.security_cannotfind = 1
+				else
+					P.security_cannotfind = 0
+					for(var/datum/data/record/E in data_core.security)
+						if ((E.fields["name"] == R.fields["name"] || E.fields["id"] == R.fields["id"]))
+							S = E
+					P.securityActive1 = R
+					P.securityActive2 = S
+			else
+				P.securityActive1 = null
+				P.securityActive2 = null
+				P.security_cannotfind = 1
+			return 1
+
+/datum/pai_software/door_jack
+	name = "Door Jack"
+	ram_cost = 30
+	id = "door_jack"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		data["cable"] = user.cable != null
+		data["machine"] = user.cable && (user.cable.machine != null)
+		data["inprogress"] = user.hackdoor != null
+		data["progress_a"] = round(user.hackprogress / 10)
+		data["progress_b"] = user.hackprogress % 10
+		data["aborted"] = user.hack_aborted
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_doorjack.tmpl", "Door Jack", 300, 150)
+			ui.set_initial_data(data)
+			ui.open()
+			ui.set_auto_update(1)
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(href_list["jack"])
+			if(P.cable && P.cable.machine)
+				P.hackdoor = P.cable.machine
+				P.hackloop()
+			return 1
+		else if(href_list["cancel"])
+			P.hackdoor = null
+			return 1
+		else if(href_list["cable"])
+			var/turf/T = get_turf_or_move(P.loc)
+			P.hack_aborted = 0
+			P.cable = new /obj/item/weapon/pai_cable(T)
+			for(var/mob/M in viewers(T))
+				M.show_message("<span class='warning'>A port on [P] opens to reveal [P.cable], which promptly falls to the floor.</span>", 3,
+				               "<span class='warning'>You hear the soft click of something light and hard falling to the ground.</span>", 2)
+			return 1
+
+/mob/living/silicon/pai/proc/hackloop()
+	var/turf/T = get_turf_or_move(src.loc)
+	for(var/mob/living/silicon/ai/AI in player_list)
+		if(T.loc)
+			AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress in [T.loc].</b></font>"
+		else
+			AI << "<font color = red><b>Network Alert: Brute-force encryption crack in progress. Unable to pinpoint location.</b></font>"
+	var/obj/machinery/door/D = cable.machine
+	if(!istype(D))
+		hack_aborted = 1
+		hackprogress = 0
+		cable.machine = null
+		hackdoor = null
+		return
+	while(hackprogress < 1000)
+		if(cable && cable.machine == D && cable.machine == hackdoor && get_dist(src, hackdoor) <= 1)
+			hackprogress = min(hackprogress+rand(1, 20), 1000)
+		else
+			hack_aborted = 1
+			hackprogress = 0
+			hackdoor = null
+			return
+		if(hackprogress >= 1000)
+			hackprogress = 0
+			D.open()
+			cable.machine = null
+			return
+		sleep(10)			// Update every second
+
+/datum/pai_software/atmosphere_sensor
+	name = "Atmosphere Sensor"
+	ram_cost = 5
+	id = "atmos_sense"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		var/turf/T = get_turf_or_move(user.loc)
+		if(!T)
+			data["reading"] = 0
+			data["pressure"] = 0
+			data["temperature"] = 0
+			data["temperatureC"] = 0
+			data["gas"] = list()
+		else
+			var/datum/gas_mixture/env = T.return_air()
+			data["reading"] = 1
+			var/pres = env.return_pressure() * 10
+			data["pressure"] = "[round(pres/10)].[pres%10]"
+			data["temperature"] = round(env.temperature)
+			data["temperatureC"] = round(env.temperature-T0C)
+
+			var/t_moles = env.total_moles
+			var/gases[0]
+			for(var/g in env.gas)
+				var/gas[0]
+				gas["name"] = gas_data.name[g]
+				gas["percent"] = round((env.gas[g] / t_moles) * 100)
+				gases[++gases.len] = gas
+			data["gas"] = gases
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_atmosphere.tmpl", "Atmosphere Sensor", 350, 300)
+			ui.set_initial_data(data)
+			ui.open()
+
+/datum/pai_software/sec_hud
+	name = "Security HUD"
+	ram_cost = 20
+	id = "sec_hud"
+
+	toggle(mob/living/silicon/pai/user)
+		user.secHUD = !user.secHUD
+
+	is_active(mob/living/silicon/pai/user)
+		return user.secHUD
+
+/datum/pai_software/med_hud
+	name = "Medical HUD"
+	ram_cost = 20
+	id = "med_hud"
+
+	toggle(mob/living/silicon/pai/user)
+		user.medHUD = !user.medHUD
+
+	is_active(mob/living/silicon/pai/user)
+		return user.medHUD
+
+/datum/pai_software/translator
+	name = "Universal Translator"
+	ram_cost = 35
+	id = "translator"
+
+	toggle(mob/living/silicon/pai/user)
+		// 	Sol Common, Tradeband and Gutter are added with New() and are therefore the current default, always active languages
+		user.translator_on = !user.translator_on
+		if(user.translator_on)
+			user.add_language("Sinta'unathi")
+			user.add_language("Siik'tajr")
+			user.add_language("Skrellian")
+		else
+			user.remove_language("Sinta'unathi")
+			user.remove_language("Siik'tajr")
+			user.remove_language("Skrellian")
+
+	is_active(mob/living/silicon/pai/user)
+		return user.translator_on
+
+/datum/pai_software/signaller
+	name = "Remote Signaller"
+	ram_cost = 5
+	id = "signaller"
+	toggle = 0
+
+	on_ui_interact(mob/living/silicon/pai/user, datum/nanoui/ui=null, force_open=1)
+		var/data[0]
+
+		data["frequency"] = format_frequency(user.sradio.frequency)
+		data["code"] = user.sradio.code
+
+		ui = nanomanager.try_update_ui(user, user, id, ui, data, force_open)
+		if(!ui)
+			// Don't copy-paste this unless you're making a pAI software module!
+			ui = new(user, user, id, "pai_signaller.tmpl", "Signaller", 320, 150)
+			ui.load_cached_data(ManifestJSON)
+			ui.set_initial_data(data)
+			ui.open()
+
+	Topic(href, href_list)
+		var/mob/living/silicon/pai/P = usr
+		if(!istype(P)) return
+
+		if(href_list["send"])
+			P.sradio.send_signal("ACTIVATE")
+			for(var/mob/O in hearers(1, P.loc))
+				O.show_message(text("\icon[] *beep* *beep*", P), 3, "*beep* *beep*", 2)
+			return 1
+
+		else if(href_list["freq"])
+			var/new_frequency = (P.sradio.frequency + text2num(href_list["freq"]))
+			if(new_frequency < 1200 || new_frequency > 1600)
+				new_frequency = sanitize_frequency(new_frequency)
+			P.sradio.set_frequency(new_frequency)
+			return 1
+
+		else if(href_list["code"])
+			P.sradio.code += text2num(href_list["code"])
+			P.sradio.code = round(P.sradio.code)
+			P.sradio.code = min(100, P.sradio.code)
+			P.sradio.code = max(1, P.sradio.code)
+			return 1
@@ -142,6 +142,12 @@ nanoui is used to open and update nano browser uis
 	Procs called by update_status()
 */

+/mob/living/silicon/pai/can_interact_with_interface(src_object)
+	if(src_object == src && !stat)
+		return STATUS_INTERACTIVE
+	else
+		return ..()
+
 /mob/proc/can_interact_with_interface(var/src_object)
 	return STATUS_CLOSE // By default no mob can do anything with NanoUI

@@ -230,16 +230,21 @@
 /obj/item/projectile/process()
 	if(kill_count < 1)
 		del(src)
-		return
-	step_towards(src, current)
-	sleep(1)
-	if(!bumped && !isturf(original))
-		if(loc == get_turf(original))
-			if(!(original in permutated))
-				Bump(original)
-				sleep(1)
+	kill_count--
+	spawn while(src)
+		if((!( current ) || loc == current))
+			current = locate(min(max(x + xo, 1), world.maxx), min(max(y + yo, 1), world.maxy), z)
+		if((x == 1 || x == world.maxx || y == 1 || y == world.maxy))
+			del(src)
+			return
+		step_towards(src, current)
+		sleep(1)
+		if(!bumped && !isturf(original))
+			if(loc == get_turf(original))
+				if(!(original in permutated))
+					Bump(original)
+					sleep(1)

-//"Tracing" projectile
 /obj/item/projectile/test //Used to see if you can hit them.
 	invisibility = 101 //Nope!  Can't see me!
 	yo = null
@@ -8,6 +8,7 @@
 	var/list/greencolor = new /list(contents)
 	var/list/bluecolor = new /list(contents)
 	var/i
+
 	//fill the list of weights
 	for(i=1; i<=contents; i++)
 		var/datum/reagent/re = reagent_list[i]
@@ -16,6 +17,7 @@
 			reagentweight *= 20 //Paint colours a mixture twenty times as much
 		weight[i] = reagentweight

+
 	//fill the lists of colours
 	for(i=1; i<=contents; i++)
 		var/datum/reagent/re = reagent_list[i]
@@ -1580,21 +1580,27 @@ datum
 		paint
 			name = "Paint"
 			id = "paint"
-			description = "This paint will stick to almost any object"
+			description = "This paint will stick to almost any object."
 			reagent_state = LIQUID
 			color = "#808080"
 			overdose = 15

 			reaction_turf(var/turf/T, var/volume)
-				if(!istype(T) || istype(T, /turf/space))
-					return
-				T.color = color
+				..()
+				if(istype(T) && !istype(T, /turf/space))
+					T.color = color

 			reaction_obj(var/obj/O, var/volume)
 				..()
-				if(istype(O,/obj/item/weapon/light))
+				if(istype(O,/obj))
 					O.color = color

+			reaction_mob(var/mob/M, var/method=TOUCH, var/volume)
+				..()
+				if(istype(M,/mob) && !istype(M,/mob/dead))
+					//painting ghosts: not allowed
+					M.color = color
+

 //////////////////////////Poison stuff///////////////////////

@@ -2631,7 +2637,7 @@ datum
 			name = "Carrot juice"
 			id = "carrotjuice"
 			description = "It is just like a carrot but without crunching."
-			color = "#973800" // rgb: 151, 56, 0
+			color = "#FF8C00" // rgb: 255, 140, 0

 			glass_icon_state = "carrotjuice"
 			glass_name = "glass of carrot juice"
@@ -2701,7 +2707,7 @@ datum
 			name = "Watermelon Juice"
 			id = "watermelonjuice"
 			description = "Delicious juice made from watermelon."
-			color = "#863333" // rgb: 134, 51, 51
+			color = "#B83333" // rgb: 184, 51, 51

 			glass_icon_state = "glass_red"
 			glass_name = "glass of watermelon juice"
@@ -2711,7 +2717,7 @@ datum
 			name = "Lemon Juice"
 			id = "lemonjuice"
 			description = "This juice is VERY sour."
-			color = "#863333" // rgb: 175, 175, 0
+			color = "#AFAF00" // rgb: 175, 175, 0

 			glass_icon_state = "lemonjuice"
 			glass_name = "glass of lemon juice"
@@ -2721,7 +2727,7 @@ datum
 			name = "Banana Juice"
 			id = "banana"
 			description = "The raw essence of a banana."
-			color = "#863333" // rgb: 175, 175, 0
+			color = "#C3AF00" // rgb: 195, 175, 0

 			glass_icon_state = "banana"
 			glass_name = "glass of banana juice"
@@ -1414,14 +1414,17 @@ datum

 //Ghetto reactions

+/* Ideally the paint should take on the blood's colour (for each of the species)
+        but I could not think of a way. - RKF
+
 		blood_paint
 			name = "Blood paint"
 			id = "blood_paint"
 			result = "paint"
-			resultcolor = "#FE191A"
+			resultcolor = "#C80000"
 			required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
 			result_amount = 5
-
+*/
 		milk_paint
 			name = "Milk paint"
 			id = "milk_paint"
@@ -1430,6 +1433,96 @@ datum
 			required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
 			result_amount = 5

+		orange_juice_paint
+			name = "Orange juice paint"
+			id = "orange_juice_paint"
+			result = "paint"
+			resultcolor = "#E78108"
+			required_reagents = list("plasticide" = 1, "water" = 3, "orangejuice" = 5)
+			result_amount = 5
+
+		tomato_juice_paint
+			name = "Tomato juice paint"
+			id = "tomato_juice_paint"
+			result = "paint"
+			resultcolor = "#731008"
+			required_reagents = list("plasticide" = 1, "water" = 3, "tomatojuice" = 5)
+			result_amount = 5
+
+		lime_juice_paint
+			name = "Lime juice paint"
+			id = "lime_juice_paint"
+			result = "paint"
+			resultcolor = "#365E30"
+			required_reagents = list("plasticide" = 1, "water" = 3, "limejuice" = 5)
+			result_amount = 5
+
+		carrot_juice_paint
+			name = "Carrot juice paint"
+			id = "carrot_juice_paint"
+			result = "paint"
+			resultcolor = "#973800"
+			required_reagents = list("plasticide" = 1, "water" = 3, "carrotjuice" = 5)
+			result_amount = 5
+
+		berry_juice_paint
+			name = "Berry juice paint"
+			id = "berry_juice_paint"
+			result = "paint"
+			resultcolor = "#990066"
+			required_reagents = list("plasticide" = 1, "water" = 3, "berryjuice" = 5)
+			result_amount = 5
+
+		grape_juice_paint
+			name = "Grape juice paint"
+			id = "grape_juice_paint"
+			result = "paint"
+			resultcolor = "#863333"
+			required_reagents = list("plasticide" = 1, "water" = 3, "grapejuice" = 5)
+			result_amount = 5
+
+		poisonberry_juice_paint
+			name = "Poison berry juice paint"
+			id = "poisonberry_juice_paint"
+			result = "paint"
+			resultcolor = "#863353"
+			required_reagents = list("plasticide" = 1, "water" = 3, "poisonberryjuice" = 5)
+			result_amount = 5
+
+		watermelon_juice_paint
+			name = "Watermelon juice paint"
+			id = "watermelon_juice_paint"
+			result = "paint"
+			resultcolor = "#B83333"
+			required_reagents = list("plasticide" = 1, "water" = 3, "watermelonjuice" = 5)
+			result_amount = 5
+
+		lemon_juice_paint
+			name = "Lemon juice paint"
+			id = "lemon_juice_paint"
+			result = "paint"
+			resultcolor = "#AFAF00"
+			required_reagents = list("plasticide" = 1, "water" = 3, "lemonjuice" = 5)
+			result_amount = 5
+
+		banana_juice_paint
+			name = "Banana juice paint"
+			id = "banana_juice_paint"
+			result = "paint"
+			resultcolor = "#C3AF00"
+			required_reagents = list("plasticide" = 1, "water" = 3, "banana" = 5)
+			result_amount = 5
+
+		potato_juice_paint
+			name = "Potato juice paint"
+			id = "potato_juice_paint"
+			result = "paint"
+			resultcolor = "#302000"
+			required_reagents = list("plasticide" = 1, "water" = 3, "potatojuice" = 5)
+			result_amount = 5
+
+//Other paint
+
 		carbon_paint
 			name = "Carbon paint"
 			id = "carbon_paint"
@@ -1438,8 +1531,6 @@ datum
 			required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
 			result_amount = 5

-//Aluminum "non-ghetto" white paint
-
 		aluminum_paint
 			name = "Aluminum paint"
 			id = "aluminum_paint"
@@ -14,138 +14,136 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
 	var/diamond_amount = 0
 	var/uranium_amount = 0
 	var/max_material_amount = 75000.0
+	var/mat_efficiency = 1

 	use_power = 1
 	idle_power_usage = 30
 	active_power_usage = 2500

-	New()
-		..()
-		component_parts = list()
-		component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src)
-		component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
-		component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
-		component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
-		RefreshParts()
-
+/obj/machinery/r_n_d/circuit_imprinter/New()
+	..()
+	component_parts = list()
+	component_parts += new /obj/item/weapon/circuitboard/circuit_imprinter(src)
+	component_parts += new /obj/item/weapon/stock_parts/matter_bin(src)
+	component_parts += new /obj/item/weapon/stock_parts/manipulator(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
+	component_parts += new /obj/item/weapon/reagent_containers/glass/beaker(src)
 	RefreshParts()
-		var/T = 0
-		for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
-			T += G.reagents.maximum_volume
-		var/datum/reagents/R = new/datum/reagents(T)		//Holder for the reagents used as materials.
-		reagents = R
-		R.my_atom = src
-		T = 0
-		for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
-			T += M.rating
-		max_material_amount = T * 75000.0

+/obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
+	var/T = 0
+	for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
+		T += G.reagents.maximum_volume
+	var/datum/reagents/R = new/datum/reagents(T)		//Holder for the reagents used as materials.
+	reagents = R
+	R.my_atom = src
+	T = 0
+	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
+		T += M.rating
+	max_material_amount = T * 75000.0
+	T = 0
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		T += M.rating
+	mat_efficiency = 1 - (T - 1) / 4

-	blob_act()
-		if (prob(50))
-			del(src)
+/obj/machinery/r_n_d/circuit_imprinter/update_icon()
+	if(panel_open)
+		icon_state = "circuit_imprinter_t"
+	else
+		icon_state = "circuit_imprinter"

-	meteorhit()
+/obj/machinery/r_n_d/circuit_imprinter/blob_act()
+	if(prob(50))
 		del(src)
+
+/obj/machinery/r_n_d/circuit_imprinter/meteorhit()
+	del(src)
+	return
+
+/obj/machinery/r_n_d/circuit_imprinter/proc/TotalMaterials()
+	return g_amount + gold_amount + diamond_amount + uranium_amount
+
+/obj/machinery/r_n_d/circuit_imprinter/dismantle()
+	for(var/obj/I in component_parts)
+		if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
+			reagents.trans_to(I, reagents.total_volume)
+	if(g_amount >= 3750)
+		var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(loc)
+		G.amount = round(g_amount / 3750)
+	if(gold_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(loc)
+		G.amount = round(gold_amount / 2000)
+	if(diamond_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(loc)
+		G.amount = round(diamond_amount / 2000)
+	if(uranium_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(loc)
+		G.amount = round(uranium_amount / 2000)
+	..()
+
+/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob)
+	if(shocked)
+		shock(user, 50)
+	if(default_deconstruction_screwdriver(user, O))
+		if(linked_console)
+			linked_console.linked_imprinter = null
+			linked_console = null
 		return
+	if(default_deconstruction_crowbar(user, O))
+		return
+	if(default_part_replacement(user, O))
+		return
+	if(panel_open)
+		user << "<span class='notice'>You can't load \the [src] while it's opened.</span>"
+		return 1
+	if(disabled)
+		user << "\The [src] appears to not be working!"
+		return
+	if(!linked_console)
+		user << "\The [src] must be linked to an R&D console first!"
+		return 1
+	if(O.is_open_container())
+		return 0
+	if(!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
+		user << "<span class='notice'>You cannot insert this item into \the [src]!</span>"
+		return 1
+	if(stat)
+		return 1
+	if(busy)
+		user << "<span class='notice'>\The [src] is busy. Please wait for completion of previous operation.</span>"
+		return 1
+	var/obj/item/stack/sheet/stack = O
+	if((TotalMaterials() + stack.perunit) > max_material_amount)
+		user << "<span class='notice'>\The [src] is full. Please remove glass from \the [src] in order to insert more.</span>"
+		return 1

-	proc/TotalMaterials()
-		return g_amount + gold_amount + diamond_amount + uranium_amount
+	var/amount = round(input("How many sheets do you want to add?") as num)
+	if(amount < 0)
+		amount = 0
+	if(amount == 0)
+		return
+	if(amount > stack.amount)
+		amount = min(stack.amount, round((max_material_amount - TotalMaterials()) / stack.perunit))

-	attackby(var/obj/item/O as obj, var/mob/user as mob)
-		if (shocked)
-			shock(user,50)
-		if (istype(O, /obj/item/weapon/screwdriver))
-			if (!opened)
-				opened = 1
-				if(linked_console)
-					linked_console.linked_imprinter = null
-					linked_console = null
-				icon_state = "circuit_imprinter_t"
-				user << "You open the maintenance hatch of [src]."
-			else
-				opened = 0
-				icon_state = "circuit_imprinter"
-				user << "You close the maintenance hatch of [src]."
-			return
-		if (opened)
-			if(istype(O, /obj/item/weapon/crowbar))
-				playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-				var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-				M.state = 2
-				M.icon_state = "box_1"
-				for(var/obj/I in component_parts)
-					if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
-						reagents.trans_to(I, reagents.total_volume)
-					if(I.reliability != 100 && crit_fail)
-						I.crit_fail = 1
-					I.loc = src.loc
-				if(g_amount >= 3750)
-					var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
-					G.amount = round(g_amount / 3750)
-				if(gold_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc)
-					G.amount = round(gold_amount / 2000)
-				if(diamond_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
-					G.amount = round(diamond_amount / 2000)
-				if(uranium_amount >= 2000)
-					var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc)
-					G.amount = round(uranium_amount / 2000)
-				del(src)
-				return 1
-			else
-				user << "\red You can't load the [src.name] while it's opened."
-				return 1
-		if (disabled)
-			user << "\The [name] appears to not be working!"
-			return
-		if (!linked_console)
-			user << "\The [name] must be linked to an R&D console first!"
-			return 1
-		if (O.is_open_container())
-			return 0
-		if (!istype(O, /obj/item/stack/sheet/glass) && !istype(O, /obj/item/stack/sheet/mineral/gold) && !istype(O, /obj/item/stack/sheet/mineral/diamond) && !istype(O, /obj/item/stack/sheet/mineral/uranium))
-			user << "\red You cannot insert this item into the [name]!"
-			return 1
-		if (stat)
-			return 1
-		if (busy)
-			user << "\red The [name] is busy. Please wait for completion of previous operation."
-			return 1
-		var/obj/item/stack/sheet/stack = O
-		if ((TotalMaterials() + stack.perunit) > max_material_amount)
-			user << "\red The [name] is full. Please remove glass from the protolathe in order to insert more."
-			return 1
-
-		var/amount = round(input("How many sheets do you want to add?") as num)
-		if(amount < 0)
-			amount = 0
-		if(amount == 0)
-			return
-		if(amount > stack.amount)
-			amount = min(stack.amount, round((max_material_amount-TotalMaterials())/stack.perunit))
-
-		busy = 1
-		use_power(max(1000, (3750*amount/10)))
-		var/stacktype = stack.type
-		stack.use(amount)
-		if(do_after(usr,16))
-			user << "\blue You add [amount] sheets to the [src.name]."
-			switch(stacktype)
-				if(/obj/item/stack/sheet/glass)
-					g_amount += amount * 3750
-				if(/obj/item/stack/sheet/mineral/gold)
-					gold_amount += amount * 2000
-				if(/obj/item/stack/sheet/mineral/diamond)
-					diamond_amount += amount * 2000
-				if(/obj/item/stack/sheet/mineral/uranium)
-					uranium_amount += amount * 2000
-		else
-			new stacktype(src.loc, amount)
-		busy = 0
-		src.updateUsrDialog()
+	busy = 1
+	use_power(max(1000, (3750 * amount / 10)))
+	var/stacktype = stack.type
+	stack.use(amount)
+	if(do_after(usr, 16))
+		user << "<span class='notice'>You add [amount] sheets to \the [src].</span>"
+		switch(stacktype)
+			if(/obj/item/stack/sheet/glass)
+				g_amount += amount * 3750
+			if(/obj/item/stack/sheet/mineral/gold)
+				gold_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/diamond)
+				diamond_amount += amount * 2000
+			if(/obj/item/stack/sheet/mineral/uranium)
+				uranium_amount += amount * 2000
+	else
+		new stacktype(loc, amount)
+	busy = 0
+	updateUsrDialog()

 //This is to stop these machines being hackable via clicking.
 /obj/machinery/r_n_d/circuit_imprinter/attack_hand(mob/user as mob)
@@ -760,6 +760,14 @@ datum/design/item/stock_part/AssembleDesignDesc()
 	if(!desc)
 		desc = "A stock part used in the construction of various devices."

+/datum/design/item/stock_part/RPED
+	name = "Rapid Part Exchange Device"
+	desc = "Special mechanical module made to store, sort, and apply standard machine parts."
+	id = "rped"
+	req_tech = list("engineering" = 3, "materials" = 3)
+	materials = list("$metal" = 15000, "$glass" = 5000)
+	build_path = /obj/item/weapon/storage/part_replacer
+
 datum/design/item/stock_part/basic_capacitor
 	build_type = PROTOLATHE | AUTOLATHE
 	id = "basic_capacitor"
@@ -971,6 +979,18 @@ datum/design/circuit/secure_airlock
 	req_tech = list("programming" = 3)
 	build_path = /obj/item/weapon/airlock_electronics/secure

+datum/design/circuit/biogenerator
+	name = "biogenerator"
+	id = "biogenerator"
+	req_tech = list("programming" = 2)
+	build_path = /obj/item/weapon/circuitboard/biogenerator
+
+datum/design/circuit/recharge_station
+	name = "cyborg recharge station"
+	id = "recharge_station"
+	req_tech = list("programming" = 3, "engineering" = 2)
+	build_path = /obj/item/weapon/circuitboard/recharge_station
+
 /////////////////////////////////////////
 ////////Power Stuff Circuitboards////////
 /////////////////////////////////////////
@@ -12,6 +12,7 @@ Note: Must be placed within 3 tiles of the R&D Console
 	icon_state = "d_analyzer"
 	var/obj/item/weapon/loaded_item = null
 	var/decon_mod = 1
+	var/min_reliability = 90
 	
 	use_power = 1
 	idle_power_usage = 30
@@ -29,9 +30,9 @@ Note: Must be placed within 3 tiles of the R&D Console
 /obj/machinery/r_n_d/destructive_analyzer/RefreshParts()
 	var/T = 0
 	for(var/obj/item/weapon/stock_parts/S in src)
-		T += S.rating * 0.1
-	T = between (0, T, 1)
-	decon_mod = T
+		T += S.rating
+	decon_mod = T * 0.1
+	min_reliability = 93 - T

 /obj/machinery/r_n_d/destructive_analyzer/meteorhit()
 	del(src)
@@ -43,65 +44,58 @@ Note: Must be placed within 3 tiles of the R&D Console
 		temp_list[O] = text2num(temp_list[O])
 	return temp_list

+/obj/machinery/r_n_d/destructive_analyzer/update_icon()
+	if(panel_open)
+		icon_state = "d_analyzer_t"
+	else if(loaded_item)
+		icon_state = "d_analyzer_l"
+	else
+		icon_state = "d_analyzer"

 /obj/machinery/r_n_d/destructive_analyzer/attackby(var/obj/O as obj, var/mob/user as mob)
-	if (shocked)
-		shock(user,50)
-	if (istype(O, /obj/item/weapon/screwdriver))
-		if (!opened)
-			opened = 1
-			if(linked_console)
-				linked_console.linked_destroy = null
-				linked_console = null
-			icon_state = "d_analyzer_t"
-			user << "You open the maintenance hatch of [src]."
-		else
-			opened = 0
-			icon_state = "d_analyzer"
-			user << "You close the maintenance hatch of [src]."
+	if(shocked)
+		shock(user, 50)
+	if(default_deconstruction_screwdriver(user, O))
+		if(linked_console)
+			linked_console.linked_destroy = null
+			linked_console = null
 		return
-	if (opened)
-		if(istype(O, /obj/item/weapon/crowbar))
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-			var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-			M.state = 2
-			M.icon_state = "box_1"
-			for(var/obj/I in component_parts)
-				I.loc = src.loc
-			del(src)
-			return 1
-		else
-			user << "\red You can't load the [src.name] while it's opened."
-			return 1
-	if (disabled)
+	if(default_deconstruction_crowbar(user, O))
 		return
-	if (!linked_console)
-		user << "\red The destructive analyzer must be linked to an R&D console first!"
+	if(default_part_replacement(user, O))
 		return
-	if (busy)
-		user << "\red The destructive analyzer is busy right now."
+	if(panel_open)
+		user << "<span class='notice'>You can't load \the [src] while it's opened.</span>"
+		return 1
+	if(disabled)
 		return
-	if (istype(O, /obj/item) && !loaded_item)
+	if(!linked_console)
+		user << "<span class='notice'>\The [src] must be linked to an R&D console first!</span>"
+		return
+	if(busy)
+		user << "<span class='notice'>\The [src] is busy right now.</span>"
+		return
+	if(istype(O, /obj/item) && !loaded_item)
 		if(isrobot(user)) //Don't put your module items in there!
 			return
 		if(!O.origin_tech)
-			user << "\red This doesn't seem to have a tech origin!"
+			user << "<span class='notice'>This doesn't seem to have a tech origin!</span>"
 			return
 		var/list/temp_tech = ConvertReqString2List(O.origin_tech)
-		if (temp_tech.len == 0)
-			user << "\red You cannot deconstruct this item!"
+		if(temp_tech.len == 0)
+			user << "<span class='notice'>You cannot deconstruct this item!</span>"
 			return
-		if(O.reliability < 90 && O.crit_fail == 0)
-			usr << "\red Item is neither reliable enough nor broken enough to learn from."
+		if(O.reliability < min_reliability && O.crit_fail == 0)
+			usr << "<span class='warning'>Item is neither reliable enough nor broken enough to learn from.</span>"
 			return
 		busy = 1
 		loaded_item = O
 		user.drop_item()
 		O.loc = src
-		user << "\blue You add the [O.name] to the machine!"
+		user << "<span class='notice'>You add \the [O] to \the [src]!</span>"
 		flick("d_analyzer_la", src)
 		spawn(10)
-			icon_state = "d_analyzer_l"
+			update_icon()
 			busy = 0
 		return 1
 	return
@@ -25,6 +25,8 @@ Note: Must be placed west/left of and R&D console to function.
 	var/uranium_amount = 0.0
 	var/diamond_amount = 0.0

+	var/mat_efficiency = 1
+
 /obj/machinery/r_n_d/protolathe/New()
 	..()
 	component_parts = list()
@@ -51,80 +53,78 @@ Note: Must be placed west/left of and R&D console to function.
 	for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts)
 		T += M.rating
 	max_material_storage = T * 75000
+	T = 0
+	for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts)
+		T += M.rating
+	mat_efficiency = 1 - (T - 2) / 8
+
+/obj/machinery/r_n_d/protolathe/dismantle()
+	for(var/obj/I in component_parts)
+		if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
+			reagents.trans_to(I, reagents.total_volume)
+	if(m_amount >= 3750)
+		var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(loc)
+		G.amount = round(m_amount / G.perunit)
+	if(g_amount >= 3750)
+		var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(loc)
+		G.amount = round(g_amount / G.perunit)
+	if(phoron_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron(loc)
+		G.amount = round(phoron_amount / G.perunit)
+	if(silver_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(loc)
+		G.amount = round(silver_amount / G.perunit)
+	if(gold_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(loc)
+		G.amount = round(gold_amount / G.perunit)
+	if(uranium_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(loc)
+		G.amount = round(uranium_amount / G.perunit)
+	if(diamond_amount >= 2000)
+		var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(loc)
+		G.amount = round(diamond_amount / G.perunit)
+	..()
+
+/obj/machinery/r_n_d/protolathe/update_icon()
+	if(panel_open)
+		icon_state = "protolathe_t"
+	else
+		icon_state = "protolathe"

 /obj/machinery/r_n_d/protolathe/attackby(var/obj/item/O as obj, var/mob/user as mob)
-	if (shocked)
-		shock(user,50)
-	if (O.is_open_container())
-		return 1
-	if (istype(O, /obj/item/weapon/screwdriver))
-		if (!opened)
-			opened = 1
-			if(linked_console)
-				linked_console.linked_lathe = null
-				linked_console = null
-			icon_state = "protolathe_t"
-			user << "You open the maintenance hatch of [src]."
-		else
-			opened = 0
-			icon_state = "protolathe"
-			user << "You close the maintenance hatch of [src]."
+	if(shocked)
+		shock(user, 50)
+	if(default_deconstruction_screwdriver(user, O))
+		if(linked_console)
+			linked_console.linked_lathe = null
+			linked_console = null
 		return
-	if (opened)
-		if(istype(O, /obj/item/weapon/crowbar))
-			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
-			var/obj/machinery/constructable_frame/machine_frame/M = new /obj/machinery/constructable_frame/machine_frame(src.loc)
-			M.state = 2
-			M.icon_state = "box_1"
-			for(var/obj/I in component_parts)
-				if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker))
-					reagents.trans_to(I, reagents.total_volume)
-				if(I.reliability != 100 && crit_fail)
-					I.crit_fail = 1
-				I.loc = src.loc
-			if(m_amount >= 3750)
-				var/obj/item/stack/sheet/metal/G = new /obj/item/stack/sheet/metal(src.loc)
-				G.amount = round(m_amount / G.perunit)
-			if(g_amount >= 3750)
-				var/obj/item/stack/sheet/glass/G = new /obj/item/stack/sheet/glass(src.loc)
-				G.amount = round(g_amount / G.perunit)
-			if(phoron_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/phoron/G = new /obj/item/stack/sheet/mineral/phoron(src.loc)
-				G.amount = round(phoron_amount / G.perunit)
-			if(silver_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/silver/G = new /obj/item/stack/sheet/mineral/silver(src.loc)
-				G.amount = round(silver_amount / G.perunit)
-			if(gold_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/gold/G = new /obj/item/stack/sheet/mineral/gold(src.loc)
-				G.amount = round(gold_amount / G.perunit)
-			if(uranium_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/uranium/G = new /obj/item/stack/sheet/mineral/uranium(src.loc)
-				G.amount = round(uranium_amount / G.perunit)
-			if(diamond_amount >= 2000)
-				var/obj/item/stack/sheet/mineral/diamond/G = new /obj/item/stack/sheet/mineral/diamond(src.loc)
-				G.amount = round(diamond_amount / G.perunit)
-			del(src)
-			return 1
-		else
-			user << "\red You can't load the [src.name] while it's opened."
-			return 1
-	if (disabled)
+	if(default_deconstruction_crowbar(user, O))
 		return
-	if (!linked_console)
-		user << "\The protolathe must be linked to an R&D console first!"
+	if(default_part_replacement(user, O))
+		return
+	if(O.is_open_container())
 		return 1
-	if (busy)
-		user << "\red The protolathe is busy. Please wait for completion of previous operation."
+	if(panel_open)
+		user << "<span class='notice'>You can't load \the [src] while it's opened.</span>"
 		return 1
-	if (!istype(O, /obj/item/stack/sheet))
-		user << "\red You cannot insert this item into the protolathe!"
+	if(disabled)
+		return
+	if(!linked_console)
+		user << "<span class='notice'>\The [src] must be linked to an R&D console first!</span>"
 		return 1
-	if (stat)
+	if(busy)
+		user << "<span class='notice'>\The [src] is busy. Please wait for completion of previous operation.</span>"
+		return 1
+	if(!istype(O, /obj/item/stack/sheet))
+		user << "<span class='notice'>You cannot insert this item into \the [src]!</span>"
+		return 1
+	if(stat)
 		return 1
 	if(istype(O,/obj/item/stack/sheet))
 		var/obj/item/stack/sheet/S = O
-		if (TotalMaterials() + S.perunit > max_material_storage)
-			user << "\red The protolathe's material bin is full. Please remove material before adding more."
+		if(TotalMaterials() + S.perunit > max_material_storage)
+			user << "<span class='notice'>\The [src]'s material bin is full. Please remove material before adding more.</span>"
 			return 1

 	var/obj/item/stack/sheet/stack = O
@@ -137,20 +137,20 @@ Note: Must be placed west/left of and R&D console to function.
 		return
 	if(amount > stack.get_amount())
 		amount = stack.get_amount()
-	if(max_material_storage - TotalMaterials() < (amount*stack.perunit))//Can't overfill
-		amount = min(stack.amount, round((max_material_storage-TotalMaterials())/stack.perunit))
+	if(max_material_storage - TotalMaterials() < (amount * stack.perunit))//Can't overfill
+		amount = min(stack.amount, round((max_material_storage - TotalMaterials()) / stack.perunit))

-	src.overlays += "protolathe_[stack.name]"
+	overlays += "protolathe_[stack.name]"
 	sleep(10)
-	src.overlays -= "protolathe_[stack.name]"
+	overlays -= "protolathe_[stack.name]"

 	icon_state = "protolathe"
 	busy = 1
-	use_power(max(1000, (3750*amount/10)))
+	use_power(max(1000, (3750 * amount / 10)))
 	var/stacktype = stack.type
 	stack.use(amount)
-	if (do_after(user, 16))
-		user << "\blue You add [amount] sheets to the [src.name]."
+	if(do_after(user, 16))
+		user << "<span class='notice'>You add [amount] sheets to \the [src].</span>"
 		icon_state = "protolathe"
 		switch(stacktype)
 			if(/obj/item/stack/sheet/metal)
@@ -168,9 +168,9 @@ Note: Must be placed west/left of and R&D console to function.
 			if(/obj/item/stack/sheet/mineral/diamond)
 				diamond_amount += amount * 2000
 	else
-		new stacktype(src.loc, amount)
+		new stacktype(loc, amount)
 	busy = 0
-	src.updateUsrDialog()
+	updateUsrDialog()
 	return

 //This is to stop these machines being hackable via clicking.
@@ -93,7 +93,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,

 /obj/machinery/computer/rdconsole/proc/SyncRDevices() //Makes sure it is properly sync'ed up with the devices attached to it (if any).
 	for(var/obj/machinery/r_n_d/D in oview(3,src))
-		if(D.linked_console != null || D.disabled || D.opened)
+		if(D.linked_console != null || D.disabled || D.panel_open)
 			continue
 		if(istype(D, /obj/machinery/r_n_d/destructive_analyzer))
 			if(linked_destroy == null)
@@ -255,7 +255,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								usr <<"\red The destructive analyzer appears to be empty."
 								screen = 1.0
 								return
-							if(linked_destroy.loaded_item.reliability >= 90)
+							if(linked_destroy.loaded_item.reliability >= linked_destroy.min_reliability)
 								var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
 								for(var/T in temp_tech)
 									files.UpdateTech(T, temp_tech[T])
@@ -347,21 +347,21 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 						for(var/M in being_built.materials)
 							switch(M)
 								if("$metal")
-									linked_lathe.m_amount = max(0, (linked_lathe.m_amount-being_built.materials[M]))
+									linked_lathe.m_amount = max(0, (linked_lathe.m_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$glass")
-									linked_lathe.g_amount = max(0, (linked_lathe.g_amount-being_built.materials[M]))
+									linked_lathe.g_amount = max(0, (linked_lathe.g_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$gold")
-									linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-being_built.materials[M]))
+									linked_lathe.gold_amount = max(0, (linked_lathe.gold_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$silver")
-									linked_lathe.silver_amount = max(0, (linked_lathe.silver_amount-being_built.materials[M]))
+									linked_lathe.silver_amount = max(0, (linked_lathe.silver_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$phoron")
-									linked_lathe.phoron_amount = max(0, (linked_lathe.phoron_amount-being_built.materials[M]))
+									linked_lathe.phoron_amount = max(0, (linked_lathe.phoron_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$uranium")
-									linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-being_built.materials[M]))
+									linked_lathe.uranium_amount = max(0, (linked_lathe.uranium_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								if("$diamond")
-									linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-being_built.materials[M]))
+									linked_lathe.diamond_amount = max(0, (linked_lathe.diamond_amount-being_built.materials[M]*linked_lathe.mat_efficiency))
 								else
-									linked_lathe.reagents.remove_reagent(M, being_built.materials[M])
+									linked_lathe.reagents.remove_reagent(M, being_built.materials[M]*linked_lathe.mat_efficiency)

 						if(being_built.build_path)
 							var/obj/new_item = new being_built.build_path(src)
@@ -375,6 +375,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 								L.name += " ([new_item.name])"*/
 							else
 								new_item.loc = linked_lathe.loc
+							if(linked_lathe.mat_efficiency != 1) // No matter out of nowhere
+								if(new_item.matter && new_item.matter.len > 0)
+									for(var/i in new_item.matter)
+										new_item.matter[i] = new_item.matter[i] * linked_lathe.mat_efficiency
 							linked_lathe.busy = 0
 							screen = 3.1
 							errored = 0
@@ -401,15 +405,15 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					for(var/M in being_built.materials)
 						switch(M)
 							if("$glass")
-								linked_imprinter.g_amount = max(0, (linked_imprinter.g_amount-being_built.materials[M]))
+								linked_imprinter.g_amount = max(0, (linked_imprinter.g_amount-being_built.materials[M]*linked_imprinter.mat_efficiency))
 							if("$gold")
-								linked_imprinter.gold_amount = max(0, (linked_imprinter.gold_amount-being_built.materials[M]))
+								linked_imprinter.gold_amount = max(0, (linked_imprinter.gold_amount-being_built.materials[M]*linked_imprinter.mat_efficiency))
 							if("$diamond")
-								linked_imprinter.diamond_amount = max(0, (linked_imprinter.diamond_amount-being_built.materials[M]))
+								linked_imprinter.diamond_amount = max(0, (linked_imprinter.diamond_amount-being_built.materials[M]*linked_imprinter.mat_efficiency))
 							if("$uranium")
-								linked_imprinter.uranium_amount = max(0, (linked_imprinter.uranium_amount-being_built.materials[M]))
+								linked_imprinter.uranium_amount = max(0, (linked_imprinter.uranium_amount-being_built.materials[M]*linked_imprinter.mat_efficiency))
 							else
-								linked_imprinter.reagents.remove_reagent(M, being_built.materials[M])
+								linked_imprinter.reagents.remove_reagent(M, being_built.materials[M]*linked_imprinter.mat_efficiency)
 					var/obj/new_item = new being_built.build_path(src)
 					new_item.reliability = being_built.reliability
 					if(linked_imprinter.hacked) being_built.reliability = max((reliability / 2), 0)
@@ -752,6 +756,10 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 			var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
 			for(var/T in temp_tech)
 				dat += "<LI>[CallTechName(T)] [temp_tech[T]]"
+				for(var/datum/tech/F in files.known_tech)
+					if(F.name == CallTechName(T))
+						dat += " (Current: [F.level])"
+						break
 			dat += "</UL>"
 			dat += "<HR><A href='?src=\ref[src];deconstruct=1'>Deconstruct Item</A> || "
 			dat += "<A href='?src=\ref[src];eject_item=1'>Eject Item</A> || "
@@ -775,31 +783,33 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				var/temp_dat
 				var/check_materials = 1
 				for(var/M in D.materials)
-					temp_dat += ", [D.materials[M]] [CallMaterialName(M)]"
+					temp_dat += ", [D.materials[M]*linked_lathe.mat_efficiency] [CallMaterialName(M)]"
 					if(copytext(M, 1, 2) == "$")
 						switch(M)
 							if("$glass")
-								if(D.materials[M] > linked_lathe.g_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.g_amount) check_materials = 0
 							if("$metal")
-								if(D.materials[M] > linked_lathe.m_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.m_amount) check_materials = 0
 							if("$gold")
-								if(D.materials[M] > linked_lathe.gold_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.gold_amount) check_materials = 0
 							if("$silver")
-								if(D.materials[M] > linked_lathe.silver_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.silver_amount) check_materials = 0
 							if("$phoron")
-								if(D.materials[M] > linked_lathe.phoron_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.phoron_amount) check_materials = 0
 							if("$uranium")
-								if(D.materials[M] > linked_lathe.uranium_amount) check_materials = 0
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.uranium_amount) check_materials = 0
 							if("$diamond")
-								if(D.materials[M] > linked_lathe.diamond_amount) check_materials = 0
-					else if (!linked_lathe.reagents.has_reagent(M, D.materials[M]))
+								if(D.materials[M]*linked_lathe.mat_efficiency > linked_lathe.diamond_amount) check_materials = 0
+					else if (!linked_lathe.reagents.has_reagent(M, D.materials[M]*linked_lathe.mat_efficiency))
 						check_materials = 0
 				if(temp_dat)
 					temp_dat = " \[[copytext(temp_dat,3)]\]"
-				if (check_materials)
+				if(check_materials)
 					dat += "<LI><B><A href='?src=\ref[src];build=[D.id]'>[D.name]</A></B>[temp_dat]"
 				else
 					dat += "<LI><B>[D.name]</B>[temp_dat]"
+				if(D.reliability < 100)
+					dat += " (Reliability: [D.reliability])"
 			dat += "</UL>"

 		if(3.2) //Protolathe Material Storage Sub-menu
@@ -869,18 +879,18 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 				var/temp_dat
 				var/check_materials = 1
 				for(var/M in D.materials)
-					temp_dat += ", [D.materials[M]] [CallMaterialName(M)]"
+					temp_dat += ", [D.materials[M]*linked_imprinter.mat_efficiency] [CallMaterialName(M)]"
 					if(copytext(M, 1, 2) == "$")
 						switch(M)
 							if("$glass")
-								if(D.materials[M] > linked_imprinter.g_amount) check_materials = 0
+								if(D.materials[M]*linked_imprinter.mat_efficiency > linked_imprinter.g_amount) check_materials = 0
 							if("$gold")
-								if(D.materials[M] > linked_imprinter.gold_amount) check_materials = 0
+								if(D.materials[M]*linked_imprinter.mat_efficiency > linked_imprinter.gold_amount) check_materials = 0
 							if("$diamond")
-								if(D.materials[M] > linked_imprinter.diamond_amount) check_materials = 0
+								if(D.materials[M]*linked_imprinter.mat_efficiency > linked_imprinter.diamond_amount) check_materials = 0
 							if("$uranium")
-								if(D.materials[M] > linked_imprinter.uranium_amount) check_materials = 0
-					else if (!linked_imprinter.reagents.has_reagent(M, D.materials[M]))
+								if(D.materials[M]*linked_imprinter.mat_efficiency > linked_imprinter.uranium_amount) check_materials = 0
+					else if (!linked_imprinter.reagents.has_reagent(M, D.materials[M]*linked_imprinter.mat_efficiency))
 						check_materials = 0
 				if(temp_dat)
 					temp_dat = " \[[copytext(temp_dat,3)]\]"
@@ -888,6 +898,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
 					dat += "<LI><B><A href='?src=\ref[src];imprint=[D.id]'>[D.name]</A></B>[temp_dat]"
 				else
 					dat += "<LI><B>[D.name]</B>[temp_dat]"
+				if(D.reliability < 100)
+					dat += " (Reliability: [D.reliability])"
 			dat += "</UL>"

 		if(4.2)
@@ -17,7 +17,6 @@
 	var/hack_wire
 	var/disable_wire
 	var/shock_wire
-	var/opened = 0
 	var/obj/machinery/computer/rdconsole/linked_console

 /obj/machinery/r_n_d/New()
@@ -39,7 +38,7 @@
 /obj/machinery/r_n_d/attack_hand(mob/user as mob)
 	if (shocked)
 		shock(user,50)
-	if(opened)
+	if(panel_open)
 		var/dat as text
 		dat += "[src.name] Wires:<BR>"
 		for(var/wire in src.wires)
@@ -103,7 +103,7 @@
 /obj/machinery/r_n_d/server/proc/produce_heat()
 	if (!produces_heat)
 		return
-	
+
 	if (!use_power)
 		return

@@ -118,7 +118,7 @@

 			if(removed)
 				var/heat_produced = idle_power_usage	//obviously can't produce more heat than the machine draws from it's power source
-				
+
 				removed.add_thermal_energy(heat_produced)

 			env.merge(removed)
@@ -129,16 +129,16 @@
 	if (shocked)
 		shock(user,50)
 	if (istype(O, /obj/item/weapon/screwdriver))
-		if (!opened)
-			opened = 1
+		if (!panel_open)
+			panel_open = 1
 			icon_state = "server_o"
 			user << "You open the maintenance hatch of [src]."
 		else
-			opened = 0
+			panel_open = 0
 			icon_state = "server"
 			user << "You close the maintenance hatch of [src]."
 		return
-	if (opened)
+	if (panel_open)
 		if(istype(O, /obj/item/weapon/crowbar))
 			griefProtection()
 			playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)