Merge branch 'master' into upstream-merge-26140

code/game/machinery/cloning.dm

@@ -321,7 +321,9 @@
 			return
 		else
 			connected_message("Authorized Ejection")
+
 			SPEAK("An authorized ejection of [clonemind.name] has occurred.")
+
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
 	else
@@ -378,8 +380,10 @@
 		SPEAK("Critical error! Please contact a Thinktronic Systems \
 			technician, as your warranty may be affected.")
 		mess = TRUE
+
 		for(var/obj/item/O in unattached_flesh)
 			qdel(O)
+      
 		icon_state = "pod_g"
 		if(mob_occupant.mind != clonemind)
 			clonemind.transfer_to(mob_occupant)
@@ -395,10 +399,12 @@
 		go_out()
 
 /obj/machinery/clonepod/emp_act(severity)
+
 	var/mob/living/mob_occupant = occupant
 	if(mob_occupant && prob(100/(severity*efficiency)))
 		connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
 		SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of [mob_occupant.real_name] prematurely." ,0))
+    
 		go_out()
 	..()
 

code/game/machinery/computer/arcade.dm

@@ -234,7 +234,7 @@
 			playsound(loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
 
 			if(emagged)
-				feedback_inc("arcade_win_emagged")
+				SSblackbox.inc("arcade_win_emagged")
 				new /obj/effect/spawner/newbomb/timer/syndicate(loc)
 				new /obj/item/clothing/head/collectable/petehat(loc)
 				message_admins("[key_name_admin(usr)] has outbombed Cuban Pete and been awarded a bomb.")
@@ -242,7 +242,7 @@
 				Reset()
 				emagged = 0
 			else
-				feedback_inc("arcade_win_normal")
+				SSblackbox.inc("arcade_win_normal")
 				prizevend()
 
 	else if (emagged && (turtle >= 4))
@@ -264,10 +264,10 @@
 			temp = "You have been drained! GAME OVER"
 			playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 			if(emagged)
-				feedback_inc("arcade_loss_mana_emagged")
+				SSblackbox.inc("arcade_loss_mana_emagged")
 				usr.gib()
 			else
-				feedback_inc("arcade_loss_mana_normal")
+				SSblackbox.inc("arcade_loss_mana_normal")
 
 	else if ((enemy_hp <= 10) && (enemy_mp > 4))
 		temp = "[enemy_name] heals for 4 health!"
@@ -286,10 +286,10 @@
 		temp = "You have been crushed! GAME OVER"
 		playsound(loc, 'sound/arcade/Lose.ogg', 50, 1, extrarange = -3, falloff = 10)
 		if(emagged)
-			feedback_inc("arcade_loss_hp_emagged")
+			SSblackbox.inc("arcade_loss_hp_emagged")
 			usr.gib()
 		else
-			feedback_inc("arcade_loss_hp_normal")
+			SSblackbox.inc("arcade_loss_hp_normal")
 
 	blocked = FALSE
 	return

code/game/machinery/computer/communications.dm

@@ -115,9 +115,9 @@
 						message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
 						switch(GLOB.security_level)
 							if(SEC_LEVEL_GREEN)
-								feedback_inc("alert_comms_green",1)
+								SSblackbox.inc("alert_comms_green",1)
 							if(SEC_LEVEL_BLUE)
-								feedback_inc("alert_comms_blue",1)
+								SSblackbox.inc("alert_comms_blue",1)
 					tmp_alertlevel = 0
 				else
 					to_chat(usr, "<span class='warning'>You are not authorized to do this!</span>")
@@ -176,7 +176,7 @@
 								SSshuttle.points -= S.credit_cost
 								minor_announce("[usr.name] has purchased [S.name] for [S.credit_cost] credits." , "Shuttle Purchase")
 								message_admins("[key_name_admin(usr)] purchased [S.name].")
-								feedback_add_details("shuttle_purchase", S.name)
+								SSblackbox.add_details("shuttle_purchase", S.name)
 							else
 								to_chat(usr, "Something went wrong! The shuttle exchange system seems to be down.")
 						else
@@ -368,9 +368,9 @@
 				message_admins("[key_name_admin(usr)] has changed the security level to [get_security_level()].")
 				switch(GLOB.security_level)
 					if(SEC_LEVEL_GREEN)
-						feedback_inc("alert_comms_green",1)
+						SSblackbox.inc("alert_comms_green",1)
 					if(SEC_LEVEL_BLUE)
-						feedback_inc("alert_comms_blue",1)
+						SSblackbox.inc("alert_comms_blue",1)
 			tmp_alertlevel = 0
 			src.aistate = STATE_DEFAULT
 		if("ai-changeseclevel")

code/game/machinery/computer/crew.dm

@@ -56,7 +56,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 	jobs["Bartender"] = 61
 	jobs["Cook"] = 62
 	jobs["Botanist"] = 63
-	jobs["Librarian"] = 64
+	jobs["Curator"] = 64
 	jobs["Chaplain"] = 65
 	jobs["Clown"] = 66
 	jobs["Mime"] = 67
@@ -153,8 +153,8 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 					U = H.w_uniform
 
 					// Are the suit sensors on?
-					if (U.has_sensor && U.sensor_mode)
-						pos = H.z == 0 || U.sensor_mode == 3 ? get_turf(H) : null
+					if ((U.has_sensor > 0) && U.sensor_mode)
+						pos = H.z == 0 || U.sensor_mode == SENSOR_COORDS ? get_turf(H) : null
 
 						// Special case: If the mob is inside an object confirm the z-level on turf level.
 						if (H.z == 0 && (!pos || pos.z != z)) continue
@@ -170,10 +170,10 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 							assignment = ""
 							ijob = 80
 
-						if (U.sensor_mode >= 1) life_status = (!H.stat ? "true" : "false")
+						if (U.sensor_mode >= SENSOR_LIVING) life_status = (!H.stat ? "true" : "false")
 						else                    life_status = null
 
-						if (U.sensor_mode >= 2)
+						if (U.sensor_mode >= SENSOR_VITALS)
 							dam1 = round(H.getOxyLoss(),1)
 							dam2 = round(H.getToxLoss(),1)
 							dam3 = round(H.getFireLoss(),1)
@@ -184,7 +184,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new)
 							dam3 = null
 							dam4 = null
 
-						if (U.sensor_mode >= 3)
+						if (U.sensor_mode >= SENSOR_COORDS)
 							if (!pos) pos = get_turf(H)
 							var/area/player_area = get_area(H)
 

code/game/machinery/computer/telecrystalconsoles.dm

@@ -58,7 +58,12 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 /obj/machinery/computer/telecrystals/uplinker/proc/donateTC(amt, addLog = 1)
 	if(uplinkholder && linkedboss)
-		if(amt <= uplinkholder.hidden_uplink.telecrystals)
+		if(amt < 0)
+			linkedboss.storedcrystals += uplinkholder.hidden_uplink.telecrystals
+			if(addLog)
+				linkedboss.logTransfer("[src] donated [uplinkholder.hidden_uplink.telecrystals] telecrystals to [linkedboss].")
+			uplinkholder.hidden_uplink.telecrystals = 0
+		else if(amt <= uplinkholder.hidden_uplink.telecrystals)
 			uplinkholder.hidden_uplink.telecrystals -= amt
 			linkedboss.storedcrystals += amt
 			if(addLog)
@@ -66,7 +71,12 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 /obj/machinery/computer/telecrystals/uplinker/proc/giveTC(amt, addLog = 1)
 	if(uplinkholder && linkedboss)
-		if(amt <= linkedboss.storedcrystals)
+		if(amt < 0)
+			uplinkholder.hidden_uplink.telecrystals += linkedboss.storedcrystals
+			if(addLog)
+				linkedboss.logTransfer("[src] received [linkedboss.storedcrystals] telecrystals from [linkedboss].")
+			linkedboss.storedcrystals = 0
+		else if(amt <= linkedboss.storedcrystals)
 			uplinkholder.hidden_uplink.telecrystals += amt
 			linkedboss.storedcrystals -= amt
 			if(addLog)
@@ -89,7 +99,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	if(uplinkholder)
 		dat += "[uplinkholder.hidden_uplink.telecrystals] telecrystals remain in this uplink.<BR>"
 		if(linkedboss)
-			dat += "Donate TC: <a href='byond://?src=\ref[src];donate1=1'>1</a> | <a href='byond://?src=\ref[src];donate5=1'>5</a>"
+			dat += "Donate TC: <a href='byond://?src=\ref[src];donate=1'>1</a> | <a href='byond://?src=\ref[src];donate=5'>5</a> | <a href='byond://?src=\ref[src];donate=-1'>All</a>"
 		dat += "<br><a href='byond://?src=\ref[src];eject=1'>Eject Uplink</a>"
 
 
@@ -103,11 +113,9 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	if(..())
 		return
 
-	if(href_list["donate1"])
-		donateTC(1)
-
-	if(href_list["donate5"])
-		donateTC(5)
+	if(href_list["donate"])
+		var/tcamt = text2num(href_list["donate"])
+		donateTC(tcamt)
 
 	if(href_list["eject"])
 		ejectuplink()
@@ -162,7 +170,7 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 
 	var/dat = ""
 	dat += "<a href='byond://?src=\ref[src];scan=1'>Scan for TC stations.</a><BR>"
-	dat += "This [src] has [storedcrystals] telecrystals available for distribution. <BR>"
+	dat += "[storedcrystals] telecrystals are available for distribution. <BR>"
 	dat += "<BR><BR>"
 
 
@@ -171,10 +179,10 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 		if(A.uplinkholder)
 			dat += "[A.uplinkholder.hidden_uplink.telecrystals] telecrystals."
 		if(storedcrystals)
-			dat+= "<BR>Add TC: <a href ='?src=\ref[src];give1=\ref[A]'>1</a> | <a href ='?src=\ref[src];give5=\ref[A]'>5</a>"
+			dat+= "<BR>Add TC: <a href ='?src=\ref[src];target=\ref[A];give=1'>1</a> | <a href ='?src=\ref[src];target=\ref[A];give=5'>5</a> | <a href ='?src=\ref[src];target=\ref[A];give=10'>10</a> | <a href ='?src=\ref[src];target=\ref[A];give=-1'>All</a>"
 		dat += "<BR>"
 
-	if(TCstations.len)
+	if(TCstations.len && storedcrystals)
 		dat += "<BR><BR><a href='byond://?src=\ref[src];distrib=1'>Evenly distribute remaining TC.</a><BR><BR>"
 
 
@@ -195,13 +203,11 @@ GLOBAL_LIST_INIT(possible_uplinker_IDs, list("Alfa","Bravo","Charlie","Delta","E
 	if(href_list["scan"])
 		scanUplinkers()
 
-	if(href_list["give1"])
-		var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["give1"])
-		A.giveTC(1)
-
-	if(href_list["give5"])
-		var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["give5"])
-		A.giveTC(5)
+	if(href_list["give"])
+		var/tcamt = text2num(href_list["give"])
+		if(TCstations.len) // sanity
+			var/obj/machinery/computer/telecrystals/uplinker/A = locate(href_list["target"]) in TCstations
+			A.giveTC(tcamt)
 
 	if(href_list["distrib"])
 		var/sanity = 0

code/game/machinery/doors/airlock.dm

@@ -1283,8 +1283,6 @@
 
 	if(!density)
 		return 1
-	if(!SSticker || !SSticker.mode)
-		return 0
 	operating = 1
 	update_icon(AIRLOCK_OPENING, 1)
 	src.set_opacity(0)

code/game/machinery/doors/door.dm

@@ -229,8 +229,6 @@
 		return 1
 	if(operating)
 		return
-	if(!SSticker || !SSticker.mode)
-		return 0
 	operating = 1
 	do_animate("opening")
 	set_opacity(0)

code/game/machinery/doors/windowdoor.dm

@@ -129,8 +129,6 @@
 /obj/machinery/door/window/open(forced=0)
 	if (src.operating == 1) //doors can still open when emag-disabled
 		return 0
-	if(!SSticker || !SSticker.mode)
-		return 0
 	if(!forced)
 		if(!hasPower())
 			return 0

code/game/machinery/hologram.dm

@@ -26,14 +26,13 @@ Possible to do for anyone motivated enough:
 
 #define HOLOPAD_PASSIVE_POWER_USAGE 1
 #define HOLOGRAM_POWER_USAGE 2
-#define RANGE_BASED 4
-#define AREA_BASED 6
 
+GLOBAL_LIST_EMPTY(holopads)
 #define HOLOPAD_MODE RANGE_BASED
 
 /obj/machinery/holopad
-	name = "\improper AI holopad"
-	desc = "It's a floor-mounted device for projecting holographic images. It is activated remotely."
+	name = "Holopad"
+	desc = "It's a floor-mounted device for projecting holographic images."
 	icon_state = "holopad0"
 	layer = LOW_OBJ_LAYER
 	flags = HEAR
@@ -44,21 +43,33 @@ Possible to do for anyone motivated enough:
 	obj_integrity = 300
 	max_integrity = 300
 	armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0)
-	var/list/masters = list()//List of AIs that use the holopad
+	var/list/masters = list()//List of living mobs that use the holopad
 	var/last_request = 0 //to prevent request spam. ~Carn
 	var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating.
 	var/temp = ""
+	var/list/holo_calls	//array of /datum/holocalls
+	var/datum/holocall/outgoing_call	//do not modify the datums only check and call the public procs
+	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
 	var/static/list/holopads = list()
 
-/obj/machinery/holopad/New()
+/obj/machinery/holopad/Initialize()
 	..()
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/holopad(null)
 	B.apply_default_parts(src)
 	holopads += src
 
 /obj/machinery/holopad/Destroy()
-	for (var/mob/living/silicon/ai/master in masters)
-		clear_holo(master)
+	if(outgoing_call)
+		LAZYADD(holo_calls, outgoing_call)
+		outgoing_call = null
+
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		HC.ConnectionFailure(src)
+	LAZYCLEARLIST(holo_calls)
+
+	for (var/I in masters)
+		clear_holo(I)
 	holopads -= src
 	return ..()
 
@@ -91,20 +102,58 @@ Possible to do for anyone motivated enough:
 		return
 	return ..()
 
+/obj/machinery/holopad/proc/CheckCallClose()
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(usr == HC.eye)
+			HC.Disconnect(HC.calling_holopad)	//disconnect via clicking the called holopad
+			return TRUE
+	return FALSE
+
+/obj/machinery/holopad/Click(location,control,params)
+	if(!CheckCallClose())
+		return ..()
+
 /obj/machinery/holopad/AltClick(mob/living/carbon/human/user)
-	interact(user)
+	if(!CheckCallClose())
+		interact(user)
 
 /obj/machinery/holopad/interact(mob/living/carbon/human/user) //Carn: Hologram requests.
 	if(!istype(user))
 		return
-	if(user.stat || !is_operational())
+
+	if(outgoing_call || user.incapacitated() || !is_operational())
 		return
+
 	user.set_machine(src)
 	var/dat
 	if(temp)
 		dat = temp
 	else
-		dat = "<A href='?src=\ref[src];AIrequest=1'>request an AI's presence.</A>"
+		dat = "<a href='?src=\ref[src];AIrequest=1'>Request an AI's presence.</a><br>"
+		dat += "<a href='?src=\ref[src];Holocall=1'>Call another holopad.</a><br>"
+
+		if(LAZYLEN(holo_calls))
+			dat += "=====================================================<br>"
+
+		var/one_answered_call = FALSE
+		var/one_unanswered_call = FALSE
+		for(var/I in holo_calls)
+			var/datum/holocall/HC = I
+			if(HC.connected_holopad != src)
+				dat += "<a href='?src=\ref[src];connectcall=\ref[HC]'>Answer call from [get_area(HC.calling_holopad)].</a><br>"
+				one_unanswered_call = TRUE
+			else
+				one_answered_call = TRUE
+
+		if(one_answered_call && one_unanswered_call)
+			dat += "=====================================================<br>"
+		//we loop twice for formatting
+		for(var/I in holo_calls)
+			var/datum/holocall/HC = I
+			if(HC.connected_holopad == src)
+				dat += "<a href='?src=\ref[src];disconnectcall=\ref[HC]'>Disconnect call from [HC.user].</a><br>"
+
 
 	var/datum/browser/popup = new(user, "holopad", name, 300, 130)
 	popup.set_content(dat)
@@ -112,7 +161,10 @@ Possible to do for anyone motivated enough:
 	popup.open()
 
 /obj/machinery/holopad/Topic(href, href_list)
-	if(..() || !is_operational())
+	if(..() || isAI(usr))
+		return
+	add_fingerprint(usr)
+	if(!is_operational())
 		return
 	if (href_list["AIrequest"])
 		if(last_request + 200 < world.time)
@@ -120,7 +172,7 @@ Possible to do for anyone motivated enough:
 			temp = "You requested an AI's presence.<BR>"
 			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
 			var/area/area = get_area(src)
-			for(var/mob/living/silicon/ai/AI in GLOB.living_mob_list)
+			for(var/mob/living/silicon/ai/AI in GLOB.silicon_mobs)
 				if(!AI.client)
 					continue
 				to_chat(AI, "<span class='info'>Your presence is requested at <a href='?src=\ref[AI];jumptoholopad=\ref[src]'>\the [area]</a>.</span>")
@@ -128,12 +180,49 @@ Possible to do for anyone motivated enough:
 			temp = "A request for AI presence was already sent recently.<BR>"
 			temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
 
-	else if(href_list["mainmenu"])
+	else if(href_list["Holocall"])
+		if(outgoing_call)
+			return
+
+		temp = "You must stand on the holopad to make a call!<br>"
+		temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+		if(usr.loc == loc)
+			var/list/callnames = list()
+			for(var/I in holopads)
+				var/area/A = get_area(I)
+				if(A)
+					LAZYADD(callnames[A], I)
+			callnames -= get_area(src)
+
+			var/result = input(usr, "Choose an area to call", "Holocall") as null|anything in callnames
+			if(QDELETED(usr) || !result || outgoing_call)
+				return
+
+			if(usr.loc == loc)
+				temp = "Dialing...<br>"
+				temp += "<A href='?src=\ref[src];mainmenu=1'>Main Menu</A>"
+				new /datum/holocall(usr, src, callnames[result])
+
+	else if(href_list["connectcall"])
+		var/datum/holocall/call_to_connect = locate(href_list["connectcall"])
+		if(!QDELETED(call_to_connect))
+			call_to_connect.Answer(src)
 		temp = ""
 
-	updateDialog()
-	add_fingerprint(usr)
+	else if(href_list["disconnectcall"])
+		var/datum/holocall/call_to_disconnect = locate(href_list["disconnectcall"])
+		if(!QDELETED(call_to_disconnect))
+			call_to_disconnect.Disconnect(src)
+		temp = ""
 
+	else if(href_list["mainmenu"])
+		temp = ""
+		if(outgoing_call)
+			outgoing_call.Disconnect()
+
+	updateDialog()
+
+//do not allow AIs to answer calls or people will use it to meta the AI sattelite
 /obj/machinery/holopad/attack_ai(mob/living/silicon/ai/user)
 	if (!istype(user))
 		return
@@ -148,39 +237,75 @@ Possible to do for anyone motivated enough:
 		clear_holo(user)
 
 /obj/machinery/holopad/process()
-	if(masters.len)//If there is a hologram.
-		for (var/mob/living/silicon/ai/master in masters)
-			if(master && !master.stat && master.client && master.eyeobj)//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
-				if(!(stat & NOPOWER))//If the  machine has power.
-					if(HOLOPAD_MODE == RANGE_BASED)
-						if(get_dist(master.eyeobj, src) <= holo_range)
-							return TRUE
-						else
-							var/obj/machinery/holopad/pad_close = get_closest_atom(/obj/machinery/holopad, holopads, master.eyeobj)
-							if(get_dist(pad_close, master.eyeobj) <= holo_range)
-								var/obj/effect/overlay/holo_pad_hologram/h = masters[master]
-								unset_holo(master)
-								pad_close.set_holo(master, h)
-								return TRUE
+	for(var/I in masters)
+		var/mob/living/master = I
+		var/mob/living/silicon/ai/AI = master
+		if(!istype(AI))
+			AI = null
 
-					else if (HOLOPAD_MODE == AREA_BASED)
+		if(!QDELETED(master) && !master.incapacitated() && master.client && (!AI || AI.eyeobj))//If there is an AI attached, it's not incapacitated, it has a client, and the client eye is centered on the projector.
+			if(is_operational())//If the  machine has power.
+				if(AI)	//ais are range based
+					if(get_dist(AI.eyeobj, src) <= holo_range)
+						continue
+					else
+						var/obj/machinery/holopad/pad_close = get_closest_atom(/obj/machinery/holopad, holopads, AI.eyeobj)
+						if(get_dist(pad_close, AI.eyeobj) <= holo_range)
+							var/obj/effect/overlay/holo_pad_hologram/h = masters[master]
+							unset_holo(master)
+							pad_close.set_holo(master, h)
+							continue
+				else
+					continue
+		clear_holo(master)//If not, we want to get rid of the hologram.
 
-						var/area/holo_area = get_area(src)
-						var/area/eye_area = get_area(master.eyeobj)
+	if(outgoing_call)
+		outgoing_call.Check()
 
-						if(eye_area in holo_area.related)
-							return TRUE
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(HC.connected_holopad != src)
+			if(force_answer_call && world.time > (HC.call_start_time + (HOLOPAD_MAX_DIAL_TIME / 2)))
+				HC.Answer(src)
+				break
+			if(outgoing_call)
+				HC.Disconnect(src)//can't answer calls while calling
+			else
+				playsound(src, 'sound/machines/twobeep.ogg', 100)	//bring, bring!
 
-			clear_holo(master)//If not, we want to get rid of the hologram.
-	return TRUE
+/obj/machinery/holopad/proc/activate_holo(mob/living/user)
+	var/mob/living/silicon/ai/AI = user
+	if(!istype(AI))
+		AI = null
 
-/obj/machinery/holopad/proc/activate_holo(mob/living/silicon/ai/user)
-	if(!(stat & NOPOWER) && user.eyeobj.loc == src.loc)//If the projector has power and client eye is on it
-		if (istype(user.current, /obj/machinery/holopad))
+	if(is_operational() && (!AI || AI.eyeobj.loc == loc))//If the projector has power and client eye is on it
+		if (AI && istype(AI.current, /obj/machinery/holopad))
 			to_chat(user, "<span class='danger'>ERROR:</span> \black Image feed in progress.")
 			return
-		create_holo(user)//Create one.
-		src.visible_message("A holographic image of [user] flicks to life right before your eyes!")
+
+		var/obj/effect/overlay/holo_pad_hologram/Hologram = new(loc)//Spawn a blank effect at the location.
+		if(AI)
+			Hologram.icon = AI.holo_icon
+		else	//make it like real life
+			Hologram.icon = user.icon
+			Hologram.icon_state = user.icon_state
+			Hologram.copy_overlays(user, TRUE)
+			//codersprite some holo effects here
+			Hologram.alpha = 100
+			Hologram.add_atom_colour("#77abff", FIXED_COLOUR_PRIORITY)
+			Hologram.Impersonation = user
+
+		Hologram.languages = user.languages
+		Hologram.mouse_opacity = 0//So you can't click on it.
+		Hologram.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
+		Hologram.anchored = 1//So space wind cannot drag it.
+		Hologram.name = "[user.name] (Hologram)"//If someone decides to right click.
+		Hologram.set_light(2)	//hologram lighting
+
+		set_holo(user, Hologram)
+		visible_message("A holographic image of [user] flicks to life right before your eyes!")
+
+		return Hologram
 	else
 		to_chat(user, "<span class='danger'>ERROR:</span> \black Unable to project hologram.")
 
@@ -192,58 +317,80 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 			if(masters[master] && speaker != master)
 				master.relay_speech(message, speaker, message_language, raw_message, radio_freq, spans, message_mode)
 
-/obj/machinery/holopad/proc/create_holo(mob/living/silicon/ai/A, turf/T = loc)
-	var/obj/effect/overlay/holo_pad_hologram/h = new(T)//Spawn a blank effect at the location.
-	h.icon = A.holo_icon
-	h.mouse_opacity = 0//So you can't click on it.
-	h.layer = FLY_LAYER//Above all the other objects/mobs. Or the vast majority of them.
-	h.anchored = 1//So space wind cannot drag it.
-	h.name = "[A.name] (Hologram)"//If someone decides to right click.
-	h.set_light(2)	//hologram lighting
-	set_holo(A, h)
+	for(var/I in holo_calls)
+		var/datum/holocall/HC = I
+		if(HC.connected_holopad == src && speaker != HC.hologram)
+			HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans)
+
+	if(outgoing_call && speaker == outgoing_call.user)
+		outgoing_call.hologram.say(raw_message)
+
+/obj/machinery/holopad/proc/SetLightsAndPower()
+	var/total_users = masters.len + LAZYLEN(holo_calls)
+	use_power = HOLOPAD_PASSIVE_POWER_USAGE + HOLOGRAM_POWER_USAGE * total_users
+	if(total_users)
+		set_light(2)
+		icon_state = "holopad1"
+	else
+		set_light(0)
+		icon_state = "holopad0"
+
+/obj/machinery/holopad/proc/set_holo(mob/living/user, var/obj/effect/overlay/holo_pad_hologram/h)
+	masters[user] = h
+	var/mob/living/silicon/ai/AI = user
+	if(istype(AI))
+		AI.current = src
+	SetLightsAndPower()
 	return TRUE
 
-/obj/machinery/holopad/proc/set_holo(mob/living/silicon/ai/A, var/obj/effect/overlay/holo_pad_hologram/h)
-	masters[A] = h
-	set_light(2) // pad lighting
-	icon_state = "holopad1"
-	A.current = src
-	use_power += HOLOGRAM_POWER_USAGE
-	return TRUE
-
-/obj/machinery/holopad/proc/clear_holo(mob/living/silicon/ai/user)
+/obj/machinery/holopad/proc/clear_holo(mob/living/user)
 	qdel(masters[user]) // Get rid of user's hologram
 	unset_holo(user)
 	return TRUE
 
-/obj/machinery/holopad/proc/unset_holo(mob/living/silicon/ai/user)
-	if(user.current == src)
-		user.current = null
+/obj/machinery/holopad/proc/unset_holo(mob/living/user)
+	var/mob/living/silicon/ai/AI = user
+	if(istype(AI) && AI.current == src)
+		AI.current = null
 	masters -= user // Discard AI from the list of those who use holopad
-	use_power = max(HOLOPAD_PASSIVE_POWER_USAGE, use_power - HOLOGRAM_POWER_USAGE)//Reduce power usage
-	if (!masters.len) // If no users left
-		set_light(0) // pad lighting (hologram lighting will be handled automatically since its owner was deleted)
-		icon_state = "holopad0"
-		use_power = HOLOPAD_PASSIVE_POWER_USAGE
+	SetLightsAndPower()
 	return TRUE
 
-/obj/machinery/holopad/proc/move_hologram(mob/living/silicon/ai/user)
+/obj/machinery/holopad/proc/move_hologram(mob/living/user, turf/new_turf)
 	if(masters[user])
-		step_to(masters[user], user.eyeobj)
 		var/obj/effect/overlay/holo_pad_hologram/H = masters[user]
-		H.loc = get_turf(user.eyeobj)
+		step_to(H, new_turf)
+		H.loc = new_turf
+		var/area/holo_area = get_area(src)
+		var/area/eye_area = new_turf.loc
+
+		if(!(eye_area in holo_area.related))
+			clear_holo(user)
 	return TRUE
 
+/obj/effect/overlay/holo_pad_hologram
+	var/mob/living/Impersonation
+	var/datum/holocall/HC
+
+/obj/effect/overlay/holo_pad_hologram/Destroy()
+	Impersonation = null
+	if(HC)
+		HC.Disconnect(HC.calling_holopad)
+	return ..()
+
 /obj/effect/overlay/holo_pad_hologram/Process_Spacemove(movement_dir = 0)
 	return 1
 
+/obj/effect/overlay/holo_pad_hologram/examine(mob/user)
+	if(Impersonation)
+		return Impersonation.examine(user)
+	return ..()
+
 /obj/item/weapon/circuitboard/machine/holopad
 	name = "AI Holopad (Machine Board)"
 	build_path = /obj/machinery/holopad
 	origin_tech = "programming=1"
 	req_components = list(/obj/item/weapon/stock_parts/capacitor = 1)
 
-#undef RANGE_BASED
-#undef AREA_BASED
 #undef HOLOPAD_PASSIVE_POWER_USAGE
-#undef HOLOGRAM_POWER_USAGE
+#undef HOLOGRAM_POWER_USAGE

code/game/machinery/newscaster.dm

@@ -535,7 +535,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				if(choice=="Confirm")
 					scan_user(usr)
 					GLOB.news_network.CreateFeedChannel(channel_name, scanned_user, c_locked)
-					feedback_inc("newscaster_channels",1)
+					SSblackbox.inc("newscaster_channels",1)
 					screen=5
 			updateUsrDialog()
 		else if(href_list["set_channel_receiving"])
@@ -558,7 +558,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 				screen=6
 			else
 				GLOB.news_network.SubmitArticle("<font face=\"[PEN_FONT]\">[parsepencode(msg, usr, SIGNFONT)]</font>", scanned_user, channel_name, photo, 0, allow_comments)
-				feedback_inc("newscaster_stories",1)
+				SSblackbox.inc("newscaster_stories",1)
 				screen=4
 				msg = ""
 			updateUsrDialog()
@@ -850,7 +850,7 @@ GLOBAL_LIST_EMPTY(allCasters)
 		return
 
 /obj/machinery/newscaster/proc/print_paper()
-	feedback_inc("newscaster_newspapers_printed",1)
+	SSblackbox.inc("newscaster_newspapers_printed",1)
 	var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper
 	for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
 		NEWSPAPER.news_content += FC

code/game/machinery/pipe/construction.dm

@@ -251,6 +251,8 @@ GLOBAL_LIST_INIT(pipeID2State, list(
 			var/mob/living/carbon/C = user
 			for(var/i=1 to 20)
 				C.vomit(0,1,0,4,0)
+				if(prob(20))
+					C.spew_organ()
 				sleep(5)
 			C.blood_volume = 0
 		return(OXYLOSS|BRUTELOSS)

code/game/machinery/porta_turret/portable_turret.dm

@@ -364,6 +364,10 @@
 	var/list/targets = list()
 	var/turretview = view(scan_range, base)
 	for(var/A in turretview)
+		var/atom/AA = A
+		if(AA.invisibility>SEE_INVISIBLE_LIVING)
+			continue
+
 		if(check_anomalies)//if it's set to check for simple animals
 			if(istype(A, /mob/living/simple_animal))
 				var/mob/living/simple_animal/SA = A

code/game/machinery/telecomms/broadcasting.dm

@@ -144,30 +144,7 @@
 		// --- This following recording is intended for research and feedback in the use of department radio channels ---
 
 		var/blackbox_msg = "[AM] [AM.say_quote(message, spans)]"
-		if(istype(GLOB.blackbox))
-			switch(freq)
-				if(1459)
-					GLOB.blackbox.msg_common += blackbox_msg
-				if(1351)
-					GLOB.blackbox.msg_science += blackbox_msg
-				if(1353)
-					GLOB.blackbox.msg_command += blackbox_msg
-				if(1355)
-					GLOB.blackbox.msg_medical += blackbox_msg
-				if(1357)
-					GLOB.blackbox.msg_engineering += blackbox_msg
-				if(1359)
-					GLOB.blackbox.msg_security += blackbox_msg
-				if(1441)
-					GLOB.blackbox.msg_deathsquad += blackbox_msg
-				if(1213)
-					GLOB.blackbox.msg_syndicate += blackbox_msg
-				if(1349)
-					GLOB.blackbox.msg_service += blackbox_msg
-				if(1347)
-					GLOB.blackbox.msg_cargo += blackbox_msg
-				else
-					GLOB.blackbox.messages += blackbox_msg
+		SSblackbox.LogBroadcast(blackbox_msg, freq)
 
 	sleep(50)
 	if(!QDELETED(virt)) //It could happen to YOU

code/game/machinery/vending.dm

@@ -56,6 +56,7 @@
 	var/dish_quants = list()  //used by the snack machine's custom compartment to count dishes.
 
 	var/obj/item/weapon/vending_refill/refill_canister = null		//The type of refill canisters used by this machine.
+	var/refill_count = 3		//The number of canisters the vending machine uses
 
 /obj/machinery/vending/Initialize()
 	..()
@@ -88,7 +89,9 @@
 							/obj/machinery/vending/cola = "Robust Softdrinks",
 							/obj/machinery/vending/cigarette = "ShadyCigs Deluxe",
 							/obj/machinery/vending/autodrobe = "AutoDrobe",
-							/obj/machinery/vending/clothing = "ClothesMate")
+							/obj/machinery/vending/clothing = "ClothesMate",
+							/obj/machinery/vending/medical = "NanoMed Plus",
+							/obj/machinery/vending/wallmed = "NanoMed")
 
 /obj/item/weapon/circuitboard/machine/vendor/attackby(obj/item/I, mob/user, params)
 	if(istype(I, /obj/item/weapon/screwdriver))
@@ -104,7 +107,7 @@
 /obj/item/weapon/circuitboard/machine/vendor/proc/set_type(var/obj/machinery/vending/typepath)
 	build_path = typepath
 	name = "[names_paths[build_path]] Vendor (Machine Board)"
-	req_components = list(initial(typepath.refill_canister) = 3)
+	req_components = list(initial(typepath.refill_canister) = initial(typepath.refill_count))
 
 /obj/item/weapon/circuitboard/machine/vendor/apply_default_parts(obj/machinery/M)
 	for(var/typepath in names_paths)
@@ -113,7 +116,6 @@
 			break
 	..()
 
-
 /obj/machinery/vending/Destroy()
 	qdel(wires)
 	wires = null
@@ -297,7 +299,7 @@
 			to_chat(user, "<span class='notice'>You [panel_open ? "open" : "close"] the maintenance panel.</span>")
 			cut_overlays()
 			if(panel_open)
-				add_overlay("[initial(icon_state)]-panel")
+				add_overlay("[initial(icon_state)]-panel")
 			playsound(src.loc, W.usesound, 50, 1)
 			updateUsrDialog()
 		else
@@ -307,7 +309,10 @@
 		if(panel_open)
 			attack_hand(user)
 		return
-	else if(istype(W, /obj/item/weapon/coin) && premium.len > 0)
+	else if(istype(W, /obj/item/weapon/coin))
+		if(!premium.len)
+			to_chat(user, "<span class='warning'>[src] doesn't have a coin slot.</span>")
+			return
 		if(!user.drop_item())
 			return
 		W.loc = src
@@ -528,7 +533,7 @@
 		if(icon_vend) //Show the vending animation if needed
 			flick(icon_vend,src)
 		new R.product_path(get_turf(src))
-		feedback_add_details("vending_machine_usage","[src.type]|[R.product_path]")
+		SSblackbox.add_details("vending_machine_usage","[src.type]|[R.product_path]")
 		vend_ready = 1
 		return
 
@@ -732,8 +737,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	icon_state = "sustenance"
 	products = list(/obj/item/weapon/reagent_containers/food/snacks/tofu = 24,
 					/obj/item/weapon/reagent_containers/food/drinks/ice = 12,
-					/obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6,
-					/obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10)
+					/obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6,
+					/obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/weapon/kitchen/knife = 6,
 					/obj/item/weapon/reagent_containers/food/drinks/coffee = 12,
 					/obj/item/weapon/tank/internals/emergency_oxygen = 6,
@@ -750,7 +755,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10,
 					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10,
-					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10)
+					/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10,/obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10)
 	contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 6)
 	premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1,/obj/item/weapon/reagent_containers/food/drinks/soda_cans/air = 1)
 	refill_canister = /obj/item/weapon/vending_refill/cola
@@ -874,6 +879,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	premium = list(/obj/item/weapon/storage/box/hug/medical = 1,/obj/item/weapon/reagent_containers/hypospray/medipen = 3, /obj/item/weapon/storage/belt/medical = 3, /obj/item/weapon/wrench/medical = 1)
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF
+	refill_canister = /obj/item/weapon/vending_refill/medical
 
 //This one's from bay12
 /obj/machinery/vending/plasmaresearch
@@ -896,6 +902,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2,/obj/item/weapon/reagent_containers/pill/morphine = 2)
 	armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50)
 	resistance_flags = FIRE_PROOF
+	refill_canister = /obj/item/weapon/vending_refill/medical
+	refill_count = 1
 
 /obj/machinery/vending/security
 	name = "\improper SecTech"
@@ -1120,7 +1128,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	/obj/item/clothing/head/beanie=1, /obj/item/clothing/head/beanie/black=1, /obj/item/clothing/head/beanie/red=1, /obj/item/clothing/head/beanie/green=1, /obj/item/clothing/head/beanie/darkblue=1,
 	/obj/item/clothing/head/beanie/purple=1, /obj/item/clothing/head/beanie/yellow=1, /obj/item/clothing/head/beanie/orange=1, /obj/item/clothing/head/beanie/cyan=1, /obj/item/clothing/head/beanie/christmas=1,
 	/obj/item/clothing/head/beanie/striped=1, /obj/item/clothing/head/beanie/stripedred=1, /obj/item/clothing/head/beanie/stripedblue=1, /obj/item/clothing/head/beanie/stripedgreen=1,
-	/obj/item/clothing/suit/jacket/letterman_red=1)
+	/obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/head/hunter=2)
 	contraband = list(/obj/item/clothing/under/syndicate/tacticool=1,/obj/item/clothing/mask/balaclava=1,/obj/item/clothing/head/ushanka=1,/obj/item/clothing/under/soviet=1,/obj/item/weapon/storage/belt/fannypack/black=2,/obj/item/clothing/suit/jacket/letterman_syndie=1,/obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1)
 	premium = list(/obj/item/clothing/under/suit_jacket/checkered=1,/obj/item/clothing/head/mailman=1,/obj/item/clothing/under/rank/mailman=1,/obj/item/clothing/suit/jacket/leather=1,/obj/item/clothing/suit/jacket/leather/overcoat=1,/obj/item/clothing/under/pants/mustangjeans=1,/obj/item/clothing/neck/necklace/dope=3,/obj/item/clothing/suit/jacket/letterman_nanotrasen=1)
 	refill_canister = /obj/item/weapon/vending_refill/clothing