commit

code/game/atoms_movable.dm

@@ -13,10 +13,9 @@
 	var/throw_speed = 2 //How many tiles to move per ds when being thrown. Float values are fully supported
 	var/throw_range = 7
 	var/mob/pulledby = null
-	var/list/languages
-	var/list/initial_languages = list(/datum/language/common)
-	var/only_speaks_language = null
-	var/datum/language_menu/language_menu = null
+	var/initial_language_holder = /datum/language_holder
+	var/datum/language_holder/language_holder
+	var/datum/language_menu/language_menu = null
 	var/verb_say = "says"
 	var/verb_ask = "asks"
 	var/verb_exclaim = "exclaims"
@@ -45,10 +44,6 @@
 		return FALSE
 	return ..()
 
-/atom/movable/Initialize(mapload)
-	. = ..()
-	for(var/L in initial_languages)
-		grant_language(L)
 
 /atom/movable/Move(atom/newloc, direct = 0)
 	if(!loc || !newloc) return 0
@@ -178,7 +173,7 @@
 		STOP_PROCESSING(SSinbounds, src)
 
 	QDEL_NULL(proximity_monitor)
-	QDEL_NULL(language_menu)
+	QDEL_NULL(language_holder)
 
 	. = ..()
 	if(loc)
@@ -578,44 +573,70 @@
 
 
 /* Language procs */
+/atom/movable/proc/get_language_holder(shadow=TRUE)
+	if(language_holder)
+		return language_holder
+	else
+		language_holder = new initial_language_holder(src)
+		return language_holder
+
+
 /atom/movable/proc/grant_language(datum/language/dt)
-	LAZYINITLIST(languages)
-	languages[dt] = TRUE
+	var/datum/language_holder/H = get_language_holder()
+	H.grant_language(dt)
 
 /atom/movable/proc/grant_all_languages(omnitongue=FALSE)
-	for(var/la in subtypesof(/datum/language))
-		grant_language(la)
-
-	if(omnitongue)
-		SET_SECONDARY_FLAG(src, OMNITONGUE)
+	var/datum/language_holder/H = get_language_holder()
+	H.grant_all_languages(omnitongue)
 
 /atom/movable/proc/get_random_understood_language()
-	var/list/possible = list()
-	for(var/dt in languages)
-		possible += dt
-	. = safepick(possible)
+	var/datum/language_holder/H = get_language_holder()
+	. = H.get_random_understood_language()
 
 /atom/movable/proc/remove_language(datum/language/dt)
-	LAZYREMOVE(languages, dt)
+	var/datum/language_holder/H = get_language_holder()
+	H.remove_language(dt)
 
 /atom/movable/proc/remove_all_languages()
-	LAZYCLEARLIST(languages)
+	var/datum/language_holder/H = get_language_holder()
+	H.remove_all_languages()
 
 /atom/movable/proc/has_language(datum/language/dt)
-	. = is_type_in_typecache(dt, languages)
+	var/datum/language_holder/H = get_language_holder()
+	. = H.has_language(dt)
+
+// Whether an AM can speak in a language or not, independent of whether
+// it KNOWS the language
+/atom/movable/proc/could_speak_in_language(datum/language/dt)
+	. = TRUE
 
 /atom/movable/proc/can_speak_in_language(datum/language/dt)
-	. = has_language(dt)
-	if(only_speaks_language && !HAS_SECONDARY_FLAG(src, OMNITONGUE))
-		. = . && ispath(only_speaks_language, dt)
+	var/datum/language_holder/H = get_language_holder()
+
+	if(!H.has_language(dt))
+		return FALSE
+	else if(H.omnitongue || could_speak_in_language(dt))
+		return TRUE
+	else
+		return FALSE
 
 /atom/movable/proc/get_default_language()
 	// if no language is specified, and we want to say() something, which
 	// language do we use?
+	var/datum/language_holder/H = get_language_holder()
+
+	if(H.selected_default_language)
+		if(H.has_language(H.selected_default_language))
+			return H.selected_default_language
+		else
+			H.selected_default_language = null
+
+
+
 	var/datum/language/chosen_langtype
 	var/highest_priority
 
-	for(var/lt in languages)
+	for(var/lt in H.languages)
 		var/datum/language/langtype = lt
 		if(!can_speak_in_language(langtype))
 			continue
@@ -624,8 +645,10 @@
 		if(!highest_priority || (pri > highest_priority))
 			chosen_langtype = langtype
 			highest_priority = pri
-
+	H.selected_default_language = .
 	. = chosen_langtype
+
+/* End language procs */
 /atom/movable/proc/ConveyorMove(movedir)
 	set waitfor = FALSE
 	if(!anchored && has_gravity())

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,32 @@ 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)
+
+	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 +101,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 +160,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 +171,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 +179,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 +236,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.language_holder = user.get_language_holder()
+		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 +316,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

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

@@ -117,9 +117,12 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 
 	animate(src, pixel_y = 2, time = 10, loop = -1)
 
-	grant_all_languages()
+	GLOB.dead_mob_list += src
+
 	..()
 
+	grant_all_languages()
+
 /mob/dead/observer/narsie_act()
 	var/old_color = color
 	color = "#960000"
@@ -269,25 +272,24 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 
 /mob/dead/observer/Move(NewLoc, direct)
 	if(updatedir)
-		setDir(direct )//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
+		setDir(direct)//only update dir if we actually need it, so overlays won't spin on base sprites that don't have directions of their own
+	var/oldloc = loc
+
 	if(NewLoc)
 		loc = NewLoc
-		for(var/obj/effect/step_trigger/S in NewLoc)
-			S.Crossed(src)
 		update_parallax_contents()
-		return
-	loc = get_turf(src) //Get out of closets and such as a ghost
-	if((direct & NORTH) && y < world.maxy)
-		y++
-	else if((direct & SOUTH) && y > 1)
-		y--
-	if((direct & EAST) && x < world.maxx)
-		x++
-	else if((direct & WEST) && x > 1)
-		x--
+	else
+		loc = get_turf(src) //Get out of closets and such as a ghost
+		if((direct & NORTH) && y < world.maxy)
+			y++
+		else if((direct & SOUTH) && y > 1)
+			y--
+		if((direct & EAST) && x < world.maxx)
+			x++
+		else if((direct & WEST) && x > 1)
+			x--
 
-	for(var/obj/effect/step_trigger/S in locate(x, y, z))	//<-- this is dumb
-		S.Crossed(src)
+	Moved(oldloc, direct)
 
 /mob/dead/observer/is_active()
 	return 0
@@ -296,9 +298,6 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	..()
 	if(statpanel("Status"))
 		if(SSticker.HasRoundStarted())
-			for(var/datum/gang/G in SSticker.mode.gangs)
-				if(G.is_dominating)
-					stat(null, "[G.name] Gang Takeover: [max(G.domination_time_remaining(), 0)]")
 			if(istype(SSticker.mode, /datum/game_mode/blob))
 				var/datum/game_mode/blob/B = SSticker.mode
 				if(B.message_sent)