Merge pull request #1742 from Markolie/ghosties

Ghost/admin ghost machinery interaction

code/modules/admin/verbs/debug.dm

@@ -1103,7 +1103,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	M.regenerate_icons()
 
 	log_admin("[key_name(usr)] changed the equipment of [key_name(M)] to [dresscode].")
-	message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode]..", 1)
+	message_admins("\blue [key_name_admin(usr)] changed the equipment of [key_name_admin(M)] to [dresscode].", 1)
 	return
 
 /client/proc/startSinglo()

code/modules/admin/verbs/pray.dm

@@ -26,7 +26,7 @@
 
 /proc/Centcomm_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "\blue <b><font color=orange>CENTCOMM:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color=orange>CENTCOMM: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 
 	for(var/client/X in admins)
 		if(R_EVENT & X.holder.rights)
@@ -34,7 +34,7 @@
 
 /proc/Syndicate_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "\blue <b><font color='#DC143C'>SYNDICATE:</font> [key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color='#DC143C'>SYNDICATE: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;SyndicateReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
 
 	for(var/client/X in admins)
 		if(R_EVENT & X.holder.rights)
@@ -42,7 +42,7 @@
 
 /proc/HONK_announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "\blue <b><font color=pink>HONK:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;HONKReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color=pink>HONK: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;HONKReply=\ref[Sender]'>RPLY</A>):</b> [msg]"
 
 	for(var/client/X in admins)
 		if(R_EVENT & X.holder.rights)
@@ -50,8 +50,15 @@
 
 /proc/ERT_Announce(var/text , var/mob/Sender)
 	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
-	msg = "\blue <b><font color=orange>ERT REQUEST:</font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
+	msg = "\blue <b><font color=orange>ERT REQUEST: </font>[key_name(Sender, 1)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;ErtReply=\ref[Sender]'>REPLY</A>):</b> [msg]"
 
 	for(var/client/X in admins)
 		if(R_EVENT & X.holder.rights)
-			X << msg
+			X << msg
+			
+/proc/Nuke_request(text , mob/Sender)
+	var/nuke_code = get_nuke_code()
+	var/msg = sanitize(copytext(text, 1, MAX_MESSAGE_LEN))
+	msg = "<span class='adminnotice'><b><font color=orange>NUKE CODE REQUEST: </font>[key_name(Sender)] (<A HREF='?_src_=holder;adminplayeropts=\ref[Sender]'>PP</A>) (<A HREF='?_src_=vars;Vars=\ref[Sender]'>VV</A>) (<A HREF='?_src_=holder;subtlemessage=\ref[Sender]'>SM</A>) ([admin_jump_link(Sender, "holder")]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) (<A HREF='?_src_=holder;BlueSpaceArtillery=\ref[Sender]'>BSA</A>) (<A HREF='?_src_=holder;CentcommReply=\ref[Sender]'>RPLY</A>):</b> [msg]</span>"
+	admins << msg
+	admins << "<span class='adminnotice'><b>The nuke code is [nuke_code].</b></span>"

code/modules/admin/verbs/randomverbs.dm

@@ -911,10 +911,13 @@ Traitors and the like can also be revived with the previous role mostly intact.
 		choice = input("The shuttle will not be able to leave if you call it. Call anyway?") in list("Confirm", "Cancel")
 		if(choice != "Confirm")
 			return
+			
+	
 
 	choice = input("Is this an emergency evacuation or a crew transfer?") in list("Emergency", "Crew Transfer")
 	if (choice == "Emergency")
-		emergency_shuttle.call_evac()
+		var/reason = stripped_input(usr, "Optional: Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
+		emergency_shuttle.call_evac(reason)
 	else
 		emergency_shuttle.call_transfer()
 

code/modules/awaymissions/bluespaceartillery.dm

@@ -1,15 +1,59 @@
-
-/obj/machinery/artillerycontrol
-	var/reload = 180
+/obj/machinery/computer/artillerycontrol
 	name = "bluespace artillery control"
-	icon_state = "control_boxp1"
-	icon = 'icons/obj/machines/particle_accelerator.dmi'
-	density = 1
-	anchored = 1
+	icon_screen = "accelerator"
+	icon_keyboard = "accelerator_key"
+	icon_state = "computer_wires"
+	req_access = list(access_cent_commander)
+	var/last_fire = 0
+	var/reload_cooldown = 180 // 3 minute cooldown
+	
+	light_color = LIGHT_COLOR_LIGHTBLUE
 
-/obj/machinery/artillerycontrol/process()
-	if(src.reload<180)
-		src.reload++
+/obj/machinery/computer/artillerycontrol/attack_ai(user as mob)
+	user << "<span class='warning'>Access denied.</span>"
+	return
+	
+/obj/machinery/computer/artillerycontrol/attack_hand(user as mob)
+	ui_interact(user)
+	
+/obj/machinery/computer/artillerycontrol/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1)
+	var/data[0]
+	var/time_to_wait = round(reload_cooldown - ((world.time / 10) - last_fire), 1)
+	var/mins = round(time_to_wait / 60)
+	var/seconds = time_to_wait - (60*mins)
+	data["reloadtime_mins"] = mins
+	data["reloadtime_secs"] = (seconds < 10) ? "0[seconds]" : seconds
+
+	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
+
+	if (!ui)
+		ui = new(user, src, ui_key, "bluespace_artillery.tmpl", "Bluespace Control", 400, 260)
+		ui.set_initial_data(data)
+		ui.open()
+		ui.set_auto_update(1)
+		
+/obj/machinery/computer/artillerycontrol/Topic(href, href_list)
+	if(..())
+		return 1
+		
+	var/A
+	A = input("Area to jump bombard", "Open Fire", A) in teleportlocs
+	var/area/thearea = teleportlocs[A]
+	if(..() || !istype(thearea))
+		return
+		
+	var/delta = (world.time / 10) - last_fire
+	if(reload_cooldown > delta)
+		return 1
+		
+	command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
+	message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
+	var/list/L = list()
+	for(var/turf/T in get_area_turfs(thearea.type))
+		L+=T
+	var/loc = pick(L)
+	explosion(loc,2,5,11)
+	last_fire = world.time / 10
 
 /obj/structure/artilleryplaceholder
 	name = "artillery"
@@ -19,47 +63,3 @@
 
 /obj/structure/artilleryplaceholder/decorative
 	density = 0
-
-/obj/machinery/artillerycontrol/attack_hand(mob/user as mob)
-	user.set_machine(src)
-	var/dat = "<B>Bluespace Artillery Control:</B><BR>"
-	dat += "Locked on<BR>"
-	dat += "<B>Charge progress: [reload]/180:</B><BR>"
-	dat += "<A href='byond://?src=\ref[src];fire=1'>Open Fire</A><BR>"
-	dat += "Deployment of weapon authorized by <br>Nanotrasen Naval Command<br><br>Remember, friendly fire is grounds for termination of your contract and life.<HR>"
-	user << browse(dat, "window=scroll")
-	onclose(user, "scroll")
-	return
-
-/obj/machinery/artillerycontrol/Topic(href, href_list)
-	..()
-	if (usr.stat || usr.restrained())
-		return
-	if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
-		var/A
-		A = input("Area to jump bombard", "Open Fire", A) in teleportlocs
-		var/area/thearea = teleportlocs[A]
-		if (usr.stat || usr.restrained()) return
-		if(src.reload < 180) return
-		if ((usr.contents.Find(src) || (in_range(src, usr) && istype(src.loc, /turf))) || (istype(usr, /mob/living/silicon)))
-			command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
-			message_admins("[key_name_admin(usr)] has launched an artillery strike.", 1)
-			var/list/L = list()
-			for(var/turf/T in get_area_turfs(thearea.type))
-				L+=T
-			var/loc = pick(L)
-			explosion(loc,2,5,11)
-			reload = 0
-
-/*mob/proc/openfire()
-	var/A
-	A = input("Area to jump bombard", "Open Fire", A) in teleportlocs
-	var/area/thearea = teleportlocs[A]
-	command_announcement.Announce("Bluespace artillery fire detected. Brace for impact.")
-	spawn(30)
-	var/list/L = list()
-
-	for(var/turf/T in get_area_turfs(thearea.type))
-		L+=T
-	var/loc = pick(L)
-	explosion(loc,2,5,11)*/

code/modules/computer3/computers/communications.dm

@@ -129,7 +129,10 @@
 			if(!computer.radio.subspace)
 				return
 			if(authenticated)
-				call_shuttle_proc(usr)
+				var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
+				if(!input || ..(href, href_list) || !authenticated)
+					return
+				call_shuttle_proc(usr, input)
 				if(emergency_shuttle.online())
 					post_status("shuttle")
 			state = STATE_DEFAULT
@@ -236,7 +239,10 @@
 		if("ai-callshuttle2" in href_list)
 			if(!computer.radio.subspace)
 				return
-			call_shuttle_proc(usr)
+			var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
+			if(!input || ..(href, href_list))
+				return
+			call_shuttle_proc(usr, input)
 			aistate = STATE_DEFAULT
 		if("ai-messagelist" in href_list)
 			aicurrmsg = 0

code/modules/economy/ATM.dm

@@ -23,7 +23,7 @@ log transactions
 	anchored = 1
 	use_power = 1
 	idle_power_usage = 10
-	var/obj/machinery/account_database/linked_db
+	var/obj/machinery/computer/account_database/linked_db
 	var/datum/money_account/authenticated_account
 	var/number_incorrect_tries = 0
 	var/previous_account_number = 0
@@ -80,7 +80,7 @@ log transactions
 				authenticated_account.charge(-amount,null,"Credit deposit",terminal_id=machine_id,dest_name = "Terminal")
 
 /obj/machinery/atm/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
+	for(var/obj/machinery/computer/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
 		if( DB.z == src.z && !(DB.stat & NOPOWER) && DB.activated )
 			linked_db = DB
 			break

code/modules/economy/Accounts.dm

@@ -3,7 +3,7 @@ var/global/num_financial_terminals = 1
 var/global/datum/money_account/station_account
 var/global/list/datum/money_account/department_accounts = list()
 var/global/next_account_number = 0
-var/global/obj/machinery/account_database/centcomm_account_db
+var/global/obj/machinery/computer/account_database/centcomm_account_db
 var/global/datum/money_account/vendor_account
 var/global/list/all_money_accounts = list()
 
@@ -57,7 +57,7 @@ var/global/list/all_money_accounts = list()
 //the current ingame time (hh:mm) can be obtained by calling:
 //worldtime2text()
 
-/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/account_database/source_db)
+/proc/create_account(var/new_owner_name = "Default user", var/starting_funds = 0, var/obj/machinery/computer/account_database/source_db)
 
 	//create a new account
 	var/datum/money_account/M = new()
@@ -336,7 +336,7 @@ var/global/list/all_money_accounts = list()
 
 	src.attack_hand(usr)
 */
-/obj/machinery/account_database/proc/charge_to_account(var/attempt_account_number, var/source_name, var/purpose, var/terminal_id, var/amount)
+/obj/machinery/computer/account_database/proc/charge_to_account(var/attempt_account_number, var/source_name, var/purpose, var/terminal_id, var/amount)
 	if(!activated)
 		return 0
 	for(var/datum/money_account/D in all_money_accounts)
@@ -367,7 +367,7 @@ var/global/list/all_money_accounts = list()
 			if( D.security_level <= security_level_passed && (!D.security_level || D.remote_access_pin == attempt_pin_number || !pin_needed) )
 				return D
 
-/obj/machinery/account_database/proc/get_account(var/account_number)
+/obj/machinery/computer/account_database/proc/get_account(var/account_number)
 	for(var/datum/money_account/D in all_money_accounts)
 		if(D.account_number == account_number)
 			return D

code/modules/economy/Accounts_DB.dm

@@ -1,9 +1,8 @@
 
-/obj/machinery/account_database
-	name = "Accounts uplink terminal"
+/obj/machinery/computer/account_database
+	name = "Accounts Uplink Terminal"
 	desc = "Access transaction logs, account data and all kinds of other financial records."
-	icon = 'icons/obj/computer.dmi'
-	icon_state = "aiupload"
+	icon_screen = "accounts"
 	density = 1
 	req_one_access = list(access_hop, access_captain, access_cent_commander)
 	var/receipt_num
@@ -12,34 +11,38 @@
 	var/datum/money_account/detailed_account_view
 	var/creating_new_account = 0
 	var/activated = 1
+	
+	light_color = LIGHT_COLOR_GREEN
 
-	proc/get_access_level()
-		if (!held_card)
-			return 0
-		if(access_cent_commander in held_card.access)
-			return 2
-		else if(access_hop in held_card.access || access_captain in held_card.access)
-			return 1
+/obj/machinery/computer/account_database/proc/get_access_level(user as mob)
+	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+		return 2
+	if (!held_card)
+		return 0
+	if(access_cent_commander in held_card.access)
+		return 2
+	else if(access_hop in held_card.access || access_captain in held_card.access)
+		return 1
 
-	proc/create_transation(target, reason, amount)
-		var/datum/transaction/T = new()
-		T.target_name = target
-		T.purpose = reason
-		T.amount = amount
-		T.date = current_date_string
-		T.time = worldtime2text()
-		T.source_terminal = machine_id
-		return T
+/obj/machinery/computer/account_database/proc/create_transation(target, reason, amount)
+	var/datum/transaction/T = new()
+	T.target_name = target
+	T.purpose = reason
+	T.amount = amount
+	T.date = current_date_string
+	T.time = worldtime2text()
+	T.source_terminal = machine_id
+	return T
 
-	proc/accounting_letterhead(report_name)
-		return {"
-			<center><h1><b>[report_name]</b></h1></center>
-			<center><small><i>[station_name()] Accounting Report</i></small></center>
-			<hr>
-			<u>Generated By:</u> [held_card.registered_name], [held_card.assignment]<br>
-		"}
+/obj/machinery/computer/account_database/proc/accounting_letterhead(report_name)
+	return {"
+		<center><h1><b>[report_name]</b></h1></center>
+		<center><small><i>[station_name()] Accounting Report</i></small></center>
+		<hr>
+		<u>Generated By:</u> [held_card.registered_name], [held_card.assignment]<br>
+	"}
 
-/obj/machinery/account_database/New()
+/obj/machinery/computer/account_database/New()
 	if(!station_account)
 		create_station_account()
 
@@ -56,7 +59,7 @@
 	machine_id = "[station_name()] Acc. DB #[num_financial_terminals++]"
 	..()
 
-/obj/machinery/account_database/attackby(obj/O, mob/user, params)
+/obj/machinery/computer/account_database/attackby(obj/O, mob/user, params)
 	if(!istype(O, /obj/item/weapon/card/id))
 		return ..()
 
@@ -69,18 +72,17 @@
 
 	attack_hand(user)
 
-/obj/machinery/account_database/attack_hand(mob/user as mob)
-	if(stat & (NOPOWER|BROKEN)) return
+/obj/machinery/computer/account_database/attack_hand(mob/user as mob)
 	ui_interact(user)
 
-/obj/machinery/account_database/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1)
+/obj/machinery/computer/account_database/ui_interact(mob/user, ui_key="main", var/datum/nanoui/ui = null, var/force_open = 1)
 	user.set_machine(src)
 
 	var/data[0]
 	data["src"] = "\ref[src]"
 	data["id_inserted"] = !!held_card
 	data["id_card"] = held_card ? text("[held_card.registered_name], [held_card.assignment]") : "-----"
-	data["access_level"] = get_access_level()
+	data["access_level"] = get_access_level(user)
 	data["machine_id"] = machine_id
 	data["creating_new_account"] = creating_new_account
 	data["detailed_account_view"] = !!detailed_account_view
@@ -124,10 +126,29 @@
 		ui = new(user, src, ui_key, "accounts_terminal.tmpl", src.name, 400, 640)
 		ui.set_initial_data(data)
 		ui.open()
-
-/obj/machinery/account_database/Topic(href, href_list)
+		
+/obj/machinery/computer/account_database/Topic(href, href_list)
 	if(..())
 		return 1
+		
+	if("insert_card")
+		if(held_card)
+			held_card.loc = src.loc
+
+			if(ishuman(usr) && !usr.get_active_hand())
+				usr.put_in_hands(held_card)
+			held_card = null
+
+		else
+			var/obj/item/I = usr.get_active_hand()
+			if (istype(I, /obj/item/weapon/card/id))
+				var/obj/item/weapon/card/id/C = I
+				usr.drop_item()
+				C.loc = src
+				held_card = C		
+		
+	if(!get_access_level(usr))
+		return 1
 
 	var/datum/nanoui/ui = nanomanager.get_open_ui(usr, src, "main")
 
@@ -167,21 +188,6 @@
 					ui.close()
 
 				creating_new_account = 0
-			if("insert_card")
-				if(held_card)
-					held_card.loc = src.loc
-
-					if(ishuman(usr) && !usr.get_active_hand())
-						usr.put_in_hands(held_card)
-					held_card = null
-
-				else
-					var/obj/item/I = usr.get_active_hand()
-					if (istype(I, /obj/item/weapon/card/id))
-						var/obj/item/weapon/card/id/C = I
-						usr.drop_item()
-						C.loc = src
-						held_card = C
 
 			if("view_account_detail")
 				var/index = text2num(href_list["account_index"])

code/modules/economy/EFTPOS.dm

@@ -10,7 +10,7 @@
 	var/transaction_amount = 0
 	var/transaction_purpose = "Default charge"
 	var/access_code = 0
-	var/obj/machinery/account_database/linked_db
+	var/obj/machinery/computer/account_database/linked_db
 	var/datum/money_account/linked_account
 
 /obj/item/device/eftpos/New()
@@ -53,7 +53,7 @@
 	if(!location)
 		return
 
-	for(var/obj/machinery/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
+	for(var/obj/machinery/computer/account_database/DB in world) //Hotfix until someone finds out why it isn't in 'machines'
 		if(DB.z == location.z)
 			linked_db = DB
 			break

code/modules/economy/utils.dm

@@ -5,7 +5,7 @@
 ////////////////////////
 
 /proc/get_money_account(var/account_number, var/from_z=-1)
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/computer/account_database/DB in world)
 		if(from_z > -1 && DB.z != from_z) continue
 		if((DB.stat & NOPOWER) || !DB.activated ) continue
 		var/datum/money_account/acct = DB.get_account(account_number)

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

@@ -329,20 +329,21 @@ var/list/ai_verbs_default = list(
 	set name = "Call Emergency Shuttle"
 	set category = "AI Commands"
 
-	if(src.stat == 2)
-		src << "You can't call the shuttle because you are dead!"
+	if(src.stat == DEAD)
+		src << "<span class='warning'>You can't call the shuttle because you are dead!</span>"
 		return
 
 	if(check_unable(AI_CHECK_WIRELESS))
 		return
 
-	var/confirm = alert("Are you sure you want to call the shuttle?", "Confirm Shuttle Call", "Yes", "No")
+	var/input = stripped_input(usr, "Please enter the reason for calling the shuttle.", "Shuttle Call Reason.","") as text|null
+	if(!input || stat)
+		return
 
 	if(check_unable(AI_CHECK_WIRELESS))
 		return
 
-	if(confirm == "Yes")
-		call_shuttle_proc(src)
+	call_shuttle_proc(src, input)
 
 	// hack to display shuttle timer
 	if(emergency_shuttle.online())

code/modules/power/apc.dm

@@ -750,7 +750,7 @@
 		return
 
 	var/list/data = list(
-		"locked" = locked,
+		"locked" = is_locked(user),
 		"isOperating" = operating,
 		"externalPower" = main_status,
 		"powerCellStatus" = cell ? cell.percent() : null,
@@ -799,7 +799,7 @@
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 	if (!ui)
 		// the ui does not exist, so we'll create a new one
-		ui = new(user, src, ui_key, "apc.tmpl", "[area.name] - APC", 500, data["siliconUser"] ? 465 : 390)
+		ui = new(user, src, ui_key, "apc.tmpl", "[area.name] - APC", 510, data["siliconUser"] ? 465 : 390)
 		// When the UI is first opened this is the data it will use
 		ui.set_initial_data(data)
 		ui.open()
@@ -834,25 +834,9 @@
 
 
 /obj/machinery/power/apc/proc/can_use(mob/user as mob, var/loud = 0) //used by attack_hand() and Topic()
-	if (user.stat && !isobserver(user))
-		user << "<span class='warning'>You must be conscious to use this [src]!</span>"
-		return 0
-	if(stat & (NOPOWER|BROKEN))
-		return 0
-	if(!user.client)
-		return 0
-	if(!user.IsAdvancedToolUser())
-		return 0
-	if ( ! (istype(user, /mob/living/carbon/human) || \
-			istype(user, /mob/living/silicon)))
-		user << "<span class='warning'>You don't have the dexterity to use this [src]!</span>"
-		return 0
-	if(user.restrained())
-		user << "<span class='warning'>You must have free hands to use this [src]</span>"
-		return 0
-	if(user.lying)
-		user << "<span class='warning'>You must stand to use this [src]!</span>"
-		return 0
+	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+		return 1
+
 	autoflag = 5
 	if (istype(user, /mob/living/silicon))
 		var/mob/living/silicon/ai/AI = user
@@ -886,10 +870,20 @@
 	return 1
 
 /obj/machinery/power/apc/proc/is_authenticated(mob/user as mob)
+	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+		return 1
 	if(isAI(user) || isrobot(user))
 		return 1
 	else
 		return !locked
+		
+/obj/machinery/power/apc/proc/is_locked(mob/user as mob)
+	if(isobserver(user) && check_rights(R_ADMIN, 0, user))
+		return 0
+	if(isAI(user) || isrobot(user))
+		return 0
+	else
+		return locked
 
 /obj/machinery/power/apc/Topic(href, href_list, var/usingUI = 1)
 	if(..())

code/modules/reagents/Chemistry-Machinery.dm

@@ -155,8 +155,8 @@
 		ui.open()
 
 /obj/machinery/chem_dispenser/Topic(href, href_list)
-	if(stat & (NOPOWER|BROKEN))
-		return 0 // don't update UIs attached to this object
+	if(..())
+		return 1
 
 	if(href_list["amount"])
 		amount = round(text2num(href_list["amount"]), 5) // round to nearest 5
@@ -245,6 +245,9 @@
 
 /obj/machinery/chem_dispenser/attack_ai(mob/user as mob)
 	return src.attack_hand(user)
+	
+/obj/machinery/chem_dispenser/attack_ghost(mob/user as mob)
+	return src.attack_hand(user)
 
 /obj/machinery/chem_dispenser/attack_hand(mob/user as mob)
 	if(stat & BROKEN)
@@ -444,9 +447,8 @@
 	return
 
 /obj/machinery/chem_master/Topic(href, href_list)
-	if(stat & (BROKEN|NOPOWER)) return
-	if(usr.stat || usr.restrained()) return
-	if(!in_range(src, usr)) return
+	if(..())
+		return 1
 
 	src.add_fingerprint(usr)
 	usr.set_machine(src)
@@ -457,7 +459,8 @@
 			loaded_pill_bottle.loc = src.loc
 			loaded_pill_bottle = null
 	else if(href_list["close"])
-		usr << browse(null, "window=chemmaster")
+		usr << browse(null, "window=chem_master")
+		onclose(usr, "chem_master")
 		usr.unset_machine()
 		return
 
@@ -636,6 +639,9 @@
 
 /obj/machinery/chem_master/attack_ai(mob/user as mob)
 	return src.attack_hand(user)
+	
+/obj/machinery/chem_master/attack_ghost(mob/user as mob)
+	return src.attack_hand(user)
 
 /obj/machinery/chem_master/attack_hand(mob/user as mob)
 	if(stat & BROKEN)

code/modules/recycling/disposal.dm

@@ -262,7 +262,7 @@
 	ui = nanomanager.try_update_ui(user, src, ui_key, ui, data, force_open)
 
 	if (!ui)
-		ui = new(user, src, ui_key, "disposal_bin.tmpl", "Waste Disposal Unit", 375, 250)
+		ui = new(user, src, ui_key, "disposal_bin.tmpl", "Waste Disposal Unit", 395, 250)
 		ui.set_initial_data(data)
 		ui.open()
 		ui.set_auto_update(1)

code/modules/shuttles/shuttle_console.dm

@@ -13,8 +13,8 @@
 	if(..(user))
 		return
 
-	if(!allowed(user))
-		user << "\red Access Denied."
+	if(!allowed(user) && !isobserver(user))
+		user << "<span class='warning'>Access Denied.</span>"
 		return 1
 
 	ui_interact(user)

code/modules/shuttles/shuttles_multi.dm

@@ -56,8 +56,8 @@
 	if(..(user))
 		return 1
 	
-	if(!allowed(user))
-		user << "\red Access Denied."
+	if(!allowed(user) && !isobserver(user))
+		user << "<span class='warning'>Access Denied.</span>"
 		return 1	
 	
 	ui_interact(user)

code/modules/store/store.dm

@@ -22,7 +22,7 @@ var/global/datum/store/centcomm_store=new
 	var/list/datum/storeitem/items=list()
 	var/list/datum/storeorder/orders=list()
 
-	var/obj/machinery/account_database/linked_db
+	var/obj/machinery/computer/account_database/linked_db
 
 /datum/store/New()
 	for(var/itempath in subtypesof(/datum/storeitem))
@@ -47,7 +47,7 @@ var/global/datum/store/centcomm_store=new
 	return 1
 
 /datum/store/proc/reconnect_database()
-	for(var/obj/machinery/account_database/DB in world)
+	for(var/obj/machinery/computer/account_database/DB in world)
 		if((DB.z in config.station_levels))
 			linked_db = DB
 			break