Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

code/datums/brain_damage/imaginary_friend.dm

@@ -46,7 +46,7 @@
 	var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s imaginary friend?", ROLE_PAI, null, null, 75, friend)
 	if(LAZYLEN(candidates))
 		var/mob/dead/observer/C = pick(candidates)
-		friend.key = C.key
+		C.transfer_ckey(friend, FALSE)
 		friend_initialized = TRUE
 	else
 		qdel(src)

code/datums/brain_damage/split_personality.dm

@@ -26,7 +26,7 @@
 	var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s split personality?", ROLE_PAI, null, null, 75, stranger_backseat)
 	if(LAZYLEN(candidates))
 		var/mob/dead/observer/C = pick(candidates)
-		stranger_backseat.key = C.key
+		C.transfer_ckey(stranger_backseat, FALSE)
 		log_game("[key_name(stranger_backseat)] became [key_name(owner)]'s split personality.")
 		message_admins("[ADMIN_LOOKUPFLW(stranger_backseat)] became [ADMIN_LOOKUPFLW(owner)]'s split personality.")
 	else
@@ -184,7 +184,7 @@
 	var/list/mob/dead/observer/candidates = pollCandidatesForMob("Do you want to play as [owner]'s brainwashed mind?", null, null, null, 75, stranger_backseat)
 	if(LAZYLEN(candidates))
 		var/mob/dead/observer/C = pick(candidates)
-		stranger_backseat.key = C.key
+		C.transfer_ckey(stranger_backseat, FALSE)
 	else
 		qdel(src)
 

code/datums/components/riding.dm

@@ -162,12 +162,12 @@
 		if(!Process_Spacemove(direction) || !isturf(AM.loc))
 			return
 		step(AM, direction)
-		
+
 		if((direction & (direction - 1)) && (AM.loc == next))		//moved diagonally
 			last_move_diagonal = TRUE
 		else
 			last_move_diagonal = FALSE
-		
+
 		handle_vehicle_layer()
 		handle_vehicle_offsets()
 	else
@@ -234,7 +234,7 @@
 		return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(0, 6), TEXT_WEST = list(0, 6))
 	else
 		return list(TEXT_NORTH = list(0, 6), TEXT_SOUTH = list(0, 6), TEXT_EAST = list(-6, 4), TEXT_WEST = list( 6, 4))
-	
+
 
 /datum/component/riding/human/force_dismount(mob/living/user)
 	var/atom/movable/AM = parent

code/datums/components/uplink.dm

@@ -24,8 +24,9 @@ GLOBAL_LIST_EMPTY(uplinks)
 	var/unlock_note
 	var/unlock_code
 	var/failsafe_code
+	var/datum/ui_state/checkstate
 
-/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20)
+/datum/component/uplink/Initialize(_owner, _lockable = TRUE, _enabled = FALSE, datum/game_mode/_gamemode, starting_tc = 20, datum/ui_state/_checkstate)
 	if(!isitem(parent))
 		return COMPONENT_INCOMPATIBLE
 
@@ -57,6 +58,7 @@ GLOBAL_LIST_EMPTY(uplinks)
 	active = _enabled
 	gamemode = _gamemode
 	telecrystals = starting_tc
+	checkstate = _checkstate
 	if(!lockable)
 		active = TRUE
 		locked = FALSE
@@ -115,6 +117,7 @@ GLOBAL_LIST_EMPTY(uplinks)
 
 /datum/component/uplink/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \
 									datum/tgui/master_ui = null, datum/ui_state/state = GLOB.inventory_state)
+	state = checkstate ? checkstate : state
 	active = TRUE
 	ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
 	if(!ui)
@@ -123,6 +126,12 @@ GLOBAL_LIST_EMPTY(uplinks)
 		ui.set_style("syndicate")
 		ui.open()
 
+/datum/component/uplink/ui_host(mob/user)
+	if(istype(parent, /obj/item/implant)) //implants are like organs, not really located inside mobs codewise.
+		var/obj/item/implant/I = parent
+		return I.imp_in
+	return ..()
+
 /datum/component/uplink/ui_data(mob/user)
 	if(!user.mind)
 		return

code/datums/components/virtual_reality.dm

@@ -0,0 +1,128 @@
+/datum/component/virtual_reality
+	dupe_mode = COMPONENT_DUPE_ALLOWED //mindswap memes, shouldn't stack up otherwise.
+	var/datum/mind/mastermind // where is my mind t. pixies
+	var/datum/mind/current_mind
+	var/obj/machinery/vr_sleeper/vr_sleeper
+	var/datum/action/quit_vr/quit_action
+	var/you_die_in_the_game_you_die_for_real = FALSE
+	var/datum/component/virtual_reality/inception //The component works on a very fragile link betwixt mind, ckey and death.
+
+/datum/component/virtual_reality/Initialize(mob/M, obj/machinery/vr_sleeper/gaming_pod, yolo = FALSE, new_char = TRUE)
+	if(!ismob(parent) || !istype(M))
+		return COMPONENT_INCOMPATIBLE
+	var/mob/vr_M = parent
+	mastermind = M.mind
+	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED), .proc/game_over)
+	RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, .proc/switch_player)
+	RegisterSignal(mastermind, COMSIG_MIND_TRANSFER, .proc/switch_player)
+	you_die_in_the_game_you_die_for_real = yolo
+	quit_action = new()
+	if(gaming_pod)
+		vr_sleeper = gaming_pod
+		RegisterSignal(vr_sleeper, COMSIG_ATOM_EMAG_ACT, .proc/you_only_live_once)
+		RegisterSignal(vr_sleeper, COMSIG_MACHINE_EJECT_OCCUPANT, .proc/revert_to_reality)
+	vr_M.ckey = M.ckey
+	var/datum/component/virtual_reality/clusterfk = M.GetComponent(/datum/component/virtual_reality)
+	if(clusterfk && !clusterfk.inception)
+		clusterfk.inception = src
+	SStgui.close_user_uis(M, src)
+
+/datum/component/virtual_reality/RegisterWithParent()
+	var/mob/M = parent
+	current_mind = M.mind
+	quit_action.Grant(M)
+	RegisterSignal(quit_action, COMSIG_ACTION_TRIGGER, .proc/revert_to_reality)
+	RegisterSignal(M, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED), .proc/game_over)
+	RegisterSignal(M, COMSIG_MOB_GHOSTIZE, .proc/be_a_quitter)
+	RegisterSignal(M, COMSIG_MOB_KEY_CHANGE, .proc/pass_me_the_remote)
+	RegisterSignal(current_mind, COMSIG_MIND_TRANSFER, .proc/pass_me_the_remote)
+	mastermind.current.audiovisual_redirect = M
+	if(vr_sleeper)
+		vr_sleeper.vr_mob = M
+
+/datum/component/virtual_reality/UnregisterFromParent()
+	quit_action.Remove(parent)
+	UnregisterSignal(parent, list(COMSIG_MOB_DEATH, COMSIG_PARENT_QDELETED, COMSIG_MOB_KEY_CHANGE, COMSIG_MOB_GHOSTIZE))
+	UnregisterSignal(current_mind, COMSIG_MIND_TRANSFER)
+	UnregisterSignal(quit_action, COMSIG_ACTION_TRIGGER)
+	current_mind = null
+	mastermind.current.audiovisual_redirect = null
+
+/datum/component/virtual_reality/proc/switch_player(datum/source, mob/new_mob, mob/old_mob)
+	if(vr_sleeper || !new_mob.mind)
+		// Machineries currently don't deal up with the occupant being polymorphed et similar... Or did something fuck up?
+		revert_to_reality()
+		return
+	old_mob.audiovisual_redirect = null
+	new_mob.audiovisual_redirect = parent
+
+/datum/component/virtual_reality/proc/action_trigger(datum/signal_source, datum/action/source)
+	if(source != quit_action)
+		return COMPONENT_ACTION_BLOCK_TRIGGER
+	revert_to_reality(signal_source)
+
+/datum/component/virtual_reality/proc/you_only_live_once()
+	if(you_die_in_the_game_you_die_for_real || vr_sleeper?.only_current_user_can_interact)
+		return FALSE
+	you_die_in_the_game_you_die_for_real = TRUE
+	return TRUE
+
+/datum/component/virtual_reality/proc/pass_me_the_remote(datum/source, mob/new_mob)
+	if(new_mob == mastermind.current)
+		revert_to_reality(source)
+		return TRUE
+	new_mob.TakeComponent(src)
+	return TRUE
+
+/datum/component/virtual_reality/PostTransfer()
+	if(!ismob(parent))
+		return COMPONENT_INCOMPATIBLE
+
+/datum/component/virtual_reality/proc/revert_to_reality(datum/source)
+	quit_it()
+
+/datum/component/virtual_reality/proc/game_over(datum/source)
+	quit_it(TRUE, TRUE)
+
+/datum/component/virtual_reality/proc/be_a_quitter(datum/source, can_reenter_corpse)
+	quit_it()
+	return COMPONENT_BLOCK_GHOSTING
+
+/datum/component/virtual_reality/proc/virtual_reality_in_a_virtual_reality(mob/player, killme = FALSE, datum/component/virtual_reality/yo_dawg)
+	var/mob/M = parent
+	quit_it(FALSE, killme, player, yo_dawg)
+	yo_dawg.inception = null
+	if(killme)
+		M.death(FALSE)
+
+/datum/component/virtual_reality/proc/quit_it(deathcheck = FALSE, cleanup = FALSE, mob/override)
+	var/mob/M = parent
+	var/mob/dreamer = override ? override : mastermind.current
+	if(!mastermind)
+		to_chat(M, "<span class='warning'>You feel a dreadful sensation, something terrible happened. You try to wake up, but you find yourself unable to...</span>")
+	else
+		var/key_transfer = FALSE
+		if(inception?.parent)
+			inception.virtual_reality_in_a_virtual_reality(dreamer, cleanup, src)
+		else
+			key_transfer = TRUE
+		if(key_transfer)
+			M.transfer_ckey(dreamer, FALSE)
+		dreamer.stop_sound_channel(CHANNEL_HEARTBEAT)
+		dreamer.audiovisual_redirect = null
+		if(deathcheck && you_die_in_the_game_you_die_for_real)
+			to_chat(mastermind, "<span class='warning'>You feel everything fading away...</span>")
+			dreamer.death(FALSE)
+		if(cleanup)
+			var/obj/effect/vr_clean_master/cleanbot = locate() in get_area(M)
+			if(cleanbot)
+				LAZYADD(cleanbot.corpse_party, M)
+			if(vr_sleeper)
+				vr_sleeper.vr_mob = null
+				vr_sleeper = null
+	qdel(src)
+
+/datum/component/virtual_reality/Destroy()
+	var/datum/action/quit_vr/delet_me = quit_action
+	. = ..()
+	qdel(delet_me)

code/datums/diseases/transformation.dm

@@ -67,7 +67,7 @@
 			if(affected_mob.mind)
 				affected_mob.mind.transfer_to(new_mob)
 			else
-				new_mob.key = affected_mob.key
+				affected_mob.transfer_ckey(new_mob)
 
 		new_mob.name = affected_mob.real_name
 		new_mob.real_name = new_mob.name
@@ -82,7 +82,7 @@
 		to_chat(affected_mob, "Your mob has been taken over by a ghost! Appeal your job ban if you want to avoid this in the future!")
 		message_admins("[key_name_admin(C)] has taken control of ([key_name_admin(affected_mob)]) to replace a jobbaned player.")
 		affected_mob.ghostize(0)
-		affected_mob.key = C.key
+		C.transfer_ckey(affected_mob)
 	else
 		to_chat(new_mob, "Your mob has been claimed by death! Appeal your job ban if you want to avoid this in the future!")
 		new_mob.death()

code/datums/mind.dm

@@ -19,9 +19,9 @@
 	-	IMPORTANT NOTE 2, if you want a player to become a ghost, use mob.ghostize() It does all the hard work for you.
 
 	-	When creating a new mob which will be a new IC character (e.g. putting a shade in a construct or randomly selecting
-		a ghost to become a xeno during an event). Simply assign the key or ckey like you've always done.
+		a ghost to become a xeno during an event), use this mob proc.
 
-			new_mob.key = key
+			mob.transfer_ckey(new_mob)
 
 		The Login proc will handle making a new mind for that mobtype (including setting up stuff like mind.name). Simple!
 		However if you want that mind to have any special properties like being a traitor etc you will have to do that
@@ -89,6 +89,7 @@
 	return language_holder
 
 /datum/mind/proc/transfer_to(mob/new_character, var/force_key_move = 0)
+	var/old_character = current
 	if(current)	// remove ourself from our old body's mind variable
 		current.mind = null
 		SStgui.on_transfer(current, new_character)
@@ -99,7 +100,7 @@
 
 	if(key)
 		if(new_character.key != key)					//if we're transferring into a body with a key associated which is not ours
-			new_character.ghostize(1)						//we'll need to ghostize so that key isn't mobless.
+			new_character.ghostize(TRUE, TRUE)						//we'll need to ghostize so that key isn't mobless.
 	else
 		key = new_character.key
 
@@ -123,6 +124,7 @@
 	transfer_martial_arts(new_character)
 	if(active || force_key_move)
 		new_character.key = key		//now transfer the key to link the client to our new body
+	SEND_SIGNAL(src, COMSIG_MIND_TRANSFER, new_character, old_character)
 
 //CIT CHANGE - makes arousal update when transfering bodies
 	if(isliving(new_character)) //New humans and such are by default enabled arousal. Let's always use the new mind's prefs.

code/datums/outfit.dm

@@ -112,7 +112,7 @@
 			H.update_action_buttons_icon()
 		if(implants)
 			for(var/implant_type in implants)
-				var/obj/item/implant/I = new implant_type(H)
+				var/obj/item/implant/I = new implant_type
 				I.implant(H, null, TRUE)
 
 	H.update_body()

code/datums/radiation_wave.dm

@@ -103,7 +103,6 @@
 			/obj/structure/cable,
 			/obj/machinery/atmospherics,
 			/obj/item/ammo_casing,
-			/obj/item/implant,
 			/obj/singularity
 			))
 		if(!can_contaminate || blacklisted[thing.type])

code/datums/status_effects/debuffs.dm

@@ -259,9 +259,9 @@
 	status_type = STATUS_EFFECT_REPLACE
 	alert_type = null
 	var/mutable_appearance/marked_underlay
-	var/obj/item/twohanded/required/kinetic_crusher/hammer_synced
+	var/obj/item/twohanded/kinetic_crusher/hammer_synced
 
-/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/twohanded/required/kinetic_crusher/new_hammer_synced)
+/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/twohanded/kinetic_crusher/new_hammer_synced)
 	. = ..()
 	if(.)
 		hammer_synced = new_hammer_synced

code/datums/traits/negative.dm

@@ -357,6 +357,7 @@
 		to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to be heard.</span>")
 		qdel(src)
 
+
 /datum/quirk/unstable
 	name = "Unstable"
 	desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!"
@@ -365,3 +366,21 @@
 	gain_text = "<span class='danger'>There's a lot on your mind right now.</span>"
 	lose_text = "<span class='notice'>Your mind finally feels calm.</span>"
 	medical_record_text = "Patient's mind is in a vulnerable state, and cannot recover from traumatic events."
+
+/datum/quirk/blindness
+	name = "Blind"
+	desc = "You are completely blind, nothing can counteract this."
+	value = -4
+	gain_text = "<span class='danger'>You can't see anything.</span>"
+	lose_text = "<span class='notice'>You miraculously gain back your vision.</span>"
+	medical_record_text = "Subject has permanent blindness."
+
+/datum/quirk/blindness/add()
+	quirk_holder.become_blind(ROUNDSTART_TRAIT)
+
+/datum/quirk/blindness/on_spawn()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/obj/item/clothing/glasses/sunglasses/blindfold/white/glasses = new(get_turf(H))
+	if(!H.equip_to_slot_if_possible(glasses, SLOT_GLASSES, bypass_equip_delay_self = TRUE)) //if you can't put it on the user's eyes, put it in their hands, otherwise put it on their eyes eyes
+		H.put_in_hands(glasses)
+	H.regenerate_icons()