Merge remote-tracking branch 'origin/master' into semi-sync

code/modules/mob/dead/new_player/new_player.dm

@@ -375,7 +375,9 @@
 		ready = PLAYER_NOT_READY
 		return FALSE
 
-	var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to play this round!","Player Setup","Yes","No")
+	var/mintime = max(CONFIG_GET(number/respawn_delay), (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) - world.time, 0)
+
+	var/this_is_like_playing_right = alert(src,"Are you sure you wish to observe? You will not be able to respawn for [round(mintime / 600, 0.1)] minutes!!","Player Setup","Yes","No")
 
 	if(QDELETED(src) || !src.client || this_is_like_playing_right != "Yes")
 		ready = PLAYER_NOT_READY
@@ -397,6 +399,7 @@
 		stack_trace("There's no freaking observer landmark available on this map or you're making observers before the map is initialised")
 	transfer_ckey(observer, FALSE)
 	observer.client = client
+	observer.client.prefs?.respawn_time_of_death = world.time
 	observer.set_ghost_appearance()
 	if(observer.client && observer.client.prefs)
 		observer.real_name = observer.client.prefs.real_name
@@ -463,6 +466,9 @@
 		alert(src, "An administrator has disabled late join spawning.")
 		return FALSE
 
+	if(!respawn_latejoin_check(notify = TRUE))
+		return FALSE
+
 	var/arrivals_docked = TRUE
 	if(SSshuttle.arrivals)
 		close_spawn_windows()	//In case we get held up
@@ -526,6 +532,8 @@
 
 	GLOB.joined_player_list += character.ckey
 	GLOB.latejoiners += character
+	LAZYOR(character.client.prefs.slots_joined_as, character.client.prefs.default_slot)
+	LAZYOR(character.client.prefs.characters_joined_as, character.real_name)
 
 	if(CONFIG_GET(flag/allow_latejoin_antagonists) && humanc)	//Borgs aren't allowed to be antags. Will need to be tweaked if we get true latejoin ais.
 		if(SSshuttle.emergency)

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

@@ -264,7 +264,7 @@ Transfer_mind is there to check if mob is being deleted/not going to have a body
 Works together with spawning an observer, noted above.
 */
 
-/mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE)
+/mob/proc/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE, cryo = FALSE)
 	var/sig_flags = SEND_SIGNAL(src, COMSIG_MOB_GHOSTIZE, can_reenter_corpse, special, penalize)
 	penalize = !(sig_flags & COMPONENT_DO_NOT_PENALIZE_GHOSTING) && (suiciding || penalize) // suicide squad.
 	voluntary_ghosted = voluntary
@@ -277,6 +277,12 @@ Works together with spawning an observer, noted above.
 	if (client && client.prefs && client.prefs.auto_ooc)
 		if (!(client.prefs.chat_toggles & CHAT_OOC))
 			client.prefs.chat_toggles ^= CHAT_OOC
+	if(ckey && penalize)
+		var/datum/preferences/P = GLOB.preferences_datums[ckey]
+		if(P)
+			P.respawn_restrictions_active = TRUE
+			P.respawn_time_of_death = world.time
+			P.respawn_did_cryo = cryo
 	transfer_ckey(ghost, FALSE)
 	ghost.client.init_verbs()
 	if(penalize)
@@ -423,12 +429,14 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		to_chat(usr, "<span class='warning'>You're already stuck out of your body!</span>")
 		return FALSE
 
-	var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. ","Are you sure you want to stay dead?","Yes","No")
+	var/response = alert(src, "Are you sure you want to prevent (almost) all means of resuscitation? This cannot be undone. THIS WILL ALSO STOP YOU FROM RESPAWNING!!!","Are you sure you want to stay dead and never respawn?","Yes","No")
+
 	if(response != "Yes")
 		return
 
 	can_reenter_corpse = FALSE
-	to_chat(src, "You can no longer be brought back into your body.")
+	client.prefs?.dnr_triggered = TRUE
+	to_chat(src, "You can no longer be brought back into your body or respawn.")
 	return TRUE
 
 /mob/dead/observer/proc/notify_cloning(var/message, var/sound, var/atom/source, flashwindow = TRUE)

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

@@ -0,0 +1,181 @@
+// ADMIN VERBS BEGIN
+/**
+ * Fully returns a player to lobby, allowing them to bypass all respawn restrictions
+ * Works on ghosts or new players (lobby players)
+ * If a lobby player is selected, their restrictions are removed.
+ */
+/client/proc/admin_cmd_respawn_return_to_lobby()
+	set name = "Respawn Player (Unrestricted)"
+	set desc = "Gives a player an unrestricted respawn, resetting all respawn restrictions for them."
+	set category = "Admin"
+
+	var/list/mob/valid = list()
+	for(var/mob/dead/observer/I in GLOB.dead_mob_list)
+		if(!I.client)
+			continue
+		valid["[I.ckey] - Observing: [I]"] = I.ckey
+	for(var/mob/dead/new_player/I in GLOB.dead_mob_list)
+		if(!I.client || !I.client.prefs.respawn_restrictions_active)
+			continue
+		valid["[I.ckey] - IN LOBBY"] = I.ckey
+	if(!valid.len)
+		to_chat(src, "<span class='warning'>No player found that is either a ghost or is in lobby with restrictions active.</span>")
+		return
+	var/ckey = valid[input(src, "Choose a player (only showing logged in players who have restrictions)", "Unrestricted Respawn") as null|anything in valid]
+	var/client/player = GLOB.directory[ckey]
+	if(!player)
+		to_chat(src, "<span class='warning'>Client not found.</span>")
+		return
+	var/mob/M = player.mob
+	if(istype(M, /mob/dead/observer))
+		var/mob/dead/observer/O = M
+		var/confirm = alert(src, "Send [O]([ckey]) back to the lobby without respawn restrictions?", "Send to Lobby", "Yes", "No")
+		if(confirm != "Yes")
+			return
+		message_admins("[key_name_admin(src)] gave [key_name_admin(O)] a full respawn and sent them back to the lobby.")
+		log_admin("[key_name(src)] gave [key_name(O)] a full respawn and sent them back to the lobby.")
+		to_chat(O, "<span class='userdanger'>You have been given a full respawn.</span>")
+		O.do_respawn(FALSE)
+		O.client.prefs.dnr_triggered = FALSE
+	else if(istype(M, /mob/dead/new_player))
+		var/mob/dead/new_player/NP = M
+		var/confirm = alert(src, "Remove [NP]'s respawn restrictions?", "Remove Restrictions", "Yes", "No")
+		if(confirm != "Yes")
+			return
+		message_admins("[key_name_admin(src)] removed [ckey]'s respawn restrictions.")
+		log_admin("[key_name(src)] removed [ckey]'s respawn restrictions")
+		NP.client.prefs.respawn_restrictions_active = FALSE
+		NP.client.prefs.dnr_triggered = FALSE
+		to_chat(NP, "<span class='boldnotie'>Your respawn restrictions have been removed.")
+	else
+		CRASH("Invalid mobtype")
+
+/**
+ * Allows a ghost to bypass respawn delay without lifting respawn restrictions
+ */
+/client/proc/admin_cmd_remove_ghost_respawn_timer()
+	set name = "Remove Respawn Timer for Player"
+	set desc = "Removes a player's respawn timer without removing their respawning restrictions."
+	set category = "Admin"
+
+	var/list/mob/dead/observer/valid = list()
+	for(var/mob/dead/observer/I in GLOB.dead_mob_list)
+		if(!I.client)
+			continue
+		valid["[I.ckey] - [I.name]"] = I
+
+	if(!valid.len)
+		to_chat(src, "<span class='warning'>No logged in ghosts found.</span>")
+		return
+	var/mob/dead/observer/O = valid[input(src, "Choose a player (only showing logged in)", "Remove Respawn Timer") as null|anything in valid]
+
+	if(!O.client)
+		to_chat(src, "<span class='warning'>[O] has no client.</span>")
+		return
+	var/timeleft = O.time_left_to_respawn()
+	if(!timeleft)
+		to_chat(src, "<span class='warning'>[O] can already respawn.")
+		return
+	message_admins("[key_name_admin(src)] removed [key_name_admin(O)]'s respawn timer.")
+	log_admin("[key_name(src)] removed [key_name(O)]'s respawn timer.")
+	O.client.prefs.respawn_time_of_death = -INFINITY
+	to_chat(O, "<span class='boldnotice'>Your respawn timer has been removed.")
+
+// ADMIN VERBS END
+
+/**
+ * Checks if we can latejoin on the currently selected slot, taking into account respawn status.
+ */
+/mob/dead/new_player/proc/respawn_latejoin_check(notify = FALSE)
+	if(!client.prefs.respawn_restrictions_active)
+		return TRUE
+	var/can_same_person = CONFIG_GET(flag/allow_same_character_respawn)
+	if(can_same_person)
+		return TRUE
+	var/nameless = client.prefs.nameless
+	var/randomname = client.prefs.be_random_name
+	var/randombody = client.prefs.be_random_body
+	if(randombody && (nameless || randomname))
+		return TRUE			// somewhat unrecognizable
+	if(client.prefs.slots_joined_as && (client.prefs.default_slot in client.prefs.slots_joined_as))
+		if(notify)
+			to_chat(src, "<span class='userdanger'>You cannot respawn on the same slot. Joined slots: [english_list(client.prefs.slots_joined_as)].")
+		return FALSE
+	if((!nameless && !randomname) && (client.prefs.characters_joined_as && (client.prefs.real_name in client.prefs.characters_joined_as)))
+		if(notify)
+			to_chat(src, "<span class='userdanger'>You cannot respawn on the same character. Joined slots: [english_list(client.prefs.characters_joined_as)].")
+		return FALSE
+	return TRUE
+
+/**
+ * Attempts to respawn.
+ */
+/mob/dead/observer/verb/respawn()
+	set name = "Respawn"
+	set category = "OOC"
+
+	if(!CONFIG_GET(flag/respawns_enabled))
+		to_chat(src, "<span class='warning'>Respawns are disabled in configuration.</span>")
+		return
+
+	if(client.prefs.dnr_triggered)
+		to_chat(src, "<span class='danger'>You cannot respawn as you have enabled DNR.</span>")
+		return
+
+	var/roundstart_timeleft = (SSticker.round_start_time + (CONFIG_GET(number/respawn_minimum_delay_roundstart) * 600)) - world.time
+	if(roundstart_timeleft > 0)
+		to_chat(src, "<span class='warning'>It's been too short of a time since the round started! Please wait [CEILING(roundstart_timeleft / 600, 0.1)] more minutes.</span>")
+		return
+
+	var/list/banned_modes = CONFIG_GET(keyed_list/respawn_chaos_gamemodes)
+	if(SSticker.mode && banned_modes[lowertext(SSticker.mode.config_tag)])
+		to_chat(src, "<span class='warning'>The current mode tag, [SSticker.mode.config_tag], is not eligible for respawn.</span>")
+		return
+
+	var/timeleft = time_left_to_respawn()
+	if(timeleft)
+		to_chat(src, "<span class='warning'>It's been too short of a time since you died/observed! Please wait [round(timeleft / 600, 0.1)] more minutes.</span>")
+		return
+	do_respawn(TRUE)
+
+/**
+ * Gets time left until we can respawn. Returns 0 if we can respawn now.
+ */
+/mob/dead/observer/verb/time_left_to_respawn()
+	ASSERT(client)
+	return max(0, ((client.prefs.respawn_did_cryo? CONFIG_GET(number/respawn_delay_cryo) : CONFIG_GET(number/respawn_delay)) MINUTES + client.prefs.respawn_time_of_death) - world.time)
+
+/**
+ * Handles respawning
+ */
+/mob/dead/observer/proc/do_respawn(penalize)
+	if(!client)
+		return
+	if(isnull(penalize))
+		penalize = client.prefs.respawn_restrictions_active
+	client.prefs.respawn_restrictions_active = penalize
+
+	to_chat(src, "<span class='userdanger'>You have been respawned to the lobby. \
+	Remember to take heed of rules regarding round knowledge - notably, that ALL past lives are forgotten. \
+	Any character you join as has NO knowledge of round events unless specified otherwise by an admin.</span>")
+
+	message_admins("[key_name_admin(src)] was respawned to lobby [penalize? "with" : "without"] restrictions.")
+	log_game("[key_name(src)] was respawned to lobby [penalize? "with" : "without"] restrictions.")
+	transfer_to_lobby()
+
+/**
+ * Actual proc that removes us and puts us back on lobby
+ */
+/mob/dead/observer/proc/transfer_to_lobby()
+	if(!client)		// if no one's in us we can just be deleted
+		qdel(src)
+		return
+	client.screen.Cut()
+	client.view_size.resetToDefault()
+	client.generate_clickcatcher()
+	client.apply_clickcatcher()
+	client.view_size.setDefault(getScreenSize(client.prefs.widescreenpref))
+	client.view_size.resetToDefault()
+
+	var/mob/dead/new_player/M = new /mob/dead/new_player
+	M.ckey = ckey

code/modules/mob/living/carbon/human/human_defines.dm

@@ -14,6 +14,7 @@
 	blocks_emissive = EMISSIVE_BLOCK_UNIQUE
 
 	block_parry_data = /datum/block_parry_data/unarmed/human
+	default_block_parry_data = /datum/block_parry_data/unarmed/pugilist
 
 	//Hair colour and style
 	var/hair_color = "000"
@@ -98,20 +99,54 @@
 	parry_failed_clickcd_duration = 0.4
 
 	parry_data = list(			// yeah it's snowflake
-		"HUMAN_PARRY_STAGGER" = 3 SECONDS,
-		"HUMAN_PARRY_PUNCH" = TRUE,
-		"HUMAN_PARRY_MININUM_EFFICIENCY" = 0.9
+		"UNARMED_PARRY_STAGGER" = 3 SECONDS,
+		"UNARMED_PARRY_PUNCH" = TRUE,
+		"UNARMED_PARRY_MININUM_EFFICIENCY" = 90
 	)
 
-/mob/living/carbon/human/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time)
+/mob/living/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time)
 	var/datum/block_parry_data/D = return_block_parry_datum(block_parry_data)
+	. = ..()
 	if(!owner.Adjacent(attacker))
-		return ..()
-	if(parry_efficiency < D.parry_data["HUMAN_PARRY_MINIMUM_EFFICIENCY"])
-		return ..()
+		return
+	if(parry_efficiency < D.parry_data["UNARMED_PARRY_MINIMUM_EFFICIENCY"])
+		return
 	visible_message("<span class='warning'>[src] strikes back perfectly at [attacker], staggering them!</span>")
-	if(D.parry_data["HUMAN_PARRY_PUNCH"])
+	if(D.parry_data["UNARMED_PARRY_PUNCH"])
 		UnarmedAttack(attacker, TRUE, INTENT_HARM, ATTACK_IS_PARRY_COUNTERATTACK | ATTACK_IGNORE_ACTION | ATTACK_IGNORE_CLICKDELAY | NO_AUTO_CLICKDELAY_HANDLING)
 	var/mob/living/L = attacker
 	if(istype(L))
-		L.Stagger(D.parry_data["HUMAN_PARRY_STAGGER"])
+		L.Stagger(D.parry_data["UNARMED_PARRY_STAGGER"])
+
+/// Unarmed parry data for pugilists
+/datum/block_parry_data/unarmed/pugilist
+	parry_respect_clickdelay = FALSE
+	parry_stamina_cost = 4
+	parry_attack_types = ATTACK_TYPE_UNARMED | ATTACK_TYPE_PROJECTILE | ATTACK_TYPE_TACKLE | ATTACK_TYPE_THROWN | ATTACK_TYPE_MELEE
+	parry_flags = PARRY_DEFAULT_HANDLE_FEEDBACK | PARRY_LOCK_ATTACKING
+
+	parry_time_windup = 0
+	parry_time_spindown = 0
+	parry_time_active = 5
+
+	parry_time_perfect = 1.5
+	parry_time_perfect_leeway = 1.5
+	parry_imperfect_falloff_percent = 20
+	parry_efficiency_perfect = 100
+	parry_efficiency_perfect_override = list(
+		ATTACK_TYPE_PROJECTILE_TEXT = 60,
+	)
+
+	parry_efficiency_considered_successful = 0.01
+	parry_efficiency_to_counterattack = 0.01
+	parry_max_attacks = INFINITY
+	parry_failed_cooldown_duration =  1.5 SECONDS
+	parry_failed_stagger_duration = 0
+	parry_cooldown = 0
+	parry_failed_clickcd_duration = 0.8
+
+	parry_data = list(			// yeah it's snowflake
+		"UNARMED_PARRY_STAGGER" = 3 SECONDS,
+		"UNARMED_PARRY_PUNCH" = TRUE,
+		"UNARMED_PARRY_MININUM_EFFICIENCY" = 90
+	)

code/modules/mob/living/death.dm

@@ -66,6 +66,10 @@
 	GLOB.alive_mob_list -= src
 	if(!gibbed)
 		GLOB.dead_mob_list += src
+	if(ckey)
+		var/datum/preferences/P = GLOB.preferences_datums[ckey]
+		if(P)
+			P.respawn_time_of_death = world.time
 	set_drugginess(0)
 	set_disgust(0)
 	SetSleeping(0, 0)

code/modules/mob/living/living.dm

@@ -264,9 +264,9 @@
 	return FALSE
 
 /mob/living/carbon/human/has_tail()
-	if(!dna || !dna.features)
+	if(!dna || !dna.species)
 		return ..()
-	var/list/L = dna.features		// caches list because i refuse to type it out and because performance
+	var/list/L = dna.species.mutant_bodyparts		// caches list because i refuse to type it out and because performance
 	return (L["mam_tail"] && (L["mam_tail"] != "None")) || (L["tail_human"] && (L["tail_human"] != "None")) || (L["tail_lizard"] && (L["tail_lizard"] != "None"))
 
 /mob/living/start_pulling(atom/movable/AM, state, force = pull_force, supress_message = FALSE)

code/modules/mob/living/living_active_parry.dm

@@ -127,7 +127,7 @@
 	handle_parry_ending_effects(data, effect_text)
 	parrying = NOT_PARRYING
 	parry_start_time = 0
-	parry_end_time_last = world.time
+	parry_end_time_last = world.time + (successful? 0 : data.parry_failed_cooldown_duration)
 	successful_parries = null
 
 /**

code/modules/mob/living/living_blocking_parrying.dm

@@ -154,6 +154,8 @@ GLOBAL_LIST_EMPTY(block_parry_data)
 	var/parry_failed_stagger_duration = 3.5 SECONDS
 	/// Clickdelay duration post-parry if you fail to parry an attack
 	var/parry_failed_clickcd_duration = 2 SECONDS
+	/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
+	var/parry_failed_cooldown_duration = 0 SECONDS
 
 /**
   * Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag.

code/modules/mob/living/living_defines.dm

@@ -32,6 +32,10 @@
 	// Combat - Blocking/Parrying system
 	/// Our block_parry_data for unarmed blocks/parries. Currently only used for parrying, as unarmed block isn't implemented yet. YOU MUST RUN [get_block_parry_data(this)] INSTEAD OF DIRECTLY ACCESSING!
 	var/datum/block_parry_data/block_parry_data = /datum/block_parry_data		// defaults to *something* because [combat_flags] dictates whether or not we can unarmed block/parry.
+	/// Default
+	var/datum/block_parry_data/default_block_parry_data = /datum/block_parry_data
+	/// If we're a pugilist
+	var/datum/block_parry_data/pugilist_block_parry_data = /datum/block_parry_data/unarmed/pugilist
 	// Blocking
 	/// The item the user is actively blocking with if any.
 	var/obj/item/active_block_item

code/modules/mob/living/living_mobility.dm

@@ -1,12 +1,3 @@
-/// IN THE FUTURE, WE WILL PROBABLY REFACTOR TO LESSEN THE NEED FOR UPDATE_MOBILITY, BUT FOR NOW.. WE CAN START DOING THIS.
-/// FOR BLOCKING MOVEMENT, USE TRAIT_MOBILITY_NOMOVE AS MUCH AS POSSIBLE. IT WILL MAKE REFACTORS IN THE FUTURE EASIER.
-/mob/living/ComponentInitialize()
-	. = ..()
-	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), .proc/update_mobility)
-	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), .proc/update_mobility)
-	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), .proc/update_mobility)
-	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), .proc/update_mobility)
-	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), .proc/update_density)
 
 //Stuff like mobility flag updates, resting updates, etc.
 

code/modules/mob/living/living_signals.dm

@@ -0,0 +1,20 @@
+/// IN THE FUTURE, WE WILL PROBABLY REFACTOR TO LESSEN THE NEED FOR UPDATE_MOBILITY, BUT FOR NOW.. WE CAN START DOING THIS.
+/// FOR BLOCKING MOVEMENT, USE TRAIT_MOBILITY_NOMOVE AS MUCH AS POSSIBLE. IT WILL MAKE REFACTORS IN THE FUTURE EASIER.
+/mob/living/ComponentInitialize()
+	. = ..()
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOMOVE), .proc/update_mobility)
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOPICKUP), .proc/update_mobility)
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOUSE), .proc/update_mobility)
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_MOBILITY_NOREST), .proc/update_mobility)
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_LIVING_NO_DENSITY), .proc/update_density)
+	RegisterSignal(src, SIGNAL_TRAIT(TRAIT_PUGILIST), .proc/update_pugilism)
+
+/mob/living/proc/update_pugilism()
+	if(HAS_TRAIT(src, TRAIT_PUGILIST))
+		combat_flags |= COMBAT_FLAG_UNARMED_PARRY
+		block_parry_data = pugilist_block_parry_data
+	else
+		var/initial_combat_flags = initial(combat_flags)
+		if(!(initial_combat_flags & COMBAT_FLAG_UNARMED_PARRY))
+			combat_flags &= ~COMBAT_FLAG_UNARMED_PARRY
+		block_parry_data = default_block_parry_data

code/modules/mob/mob.dm

@@ -457,39 +457,6 @@
 	else
 		to_chat(src, "You don't have a mind datum for some reason, so you can't add a note to it.")
 
-/mob/verb/abandon_mob()
-	set name = "Respawn"
-	set category = "OOC"
-
-	if (CONFIG_GET(flag/norespawn))
-		return
-	if ((stat != DEAD || !( SSticker )))
-		to_chat(usr, "<span class='boldnotice'>You must be dead to use this!</span>")
-		return
-
-	log_game("[key_name(usr)] used abandon mob.")
-
-	to_chat(usr, "<span class='boldnotice'>Please roleplay correctly!</span>")
-
-	if(!client)
-		log_game("[key_name(usr)] AM failed due to disconnect.")
-		return
-	client.screen.Cut()
-	client.screen += client.void
-	if(!client)
-		log_game("[key_name(usr)] AM failed due to disconnect.")
-		return
-
-	var/mob/dead/new_player/M = new /mob/dead/new_player()
-	if(!client)
-		log_game("[key_name(usr)] AM failed due to disconnect.")
-		qdel(M)
-		return
-
-	M.key = key
-//	M.Login()	//wat
-	return
-
 /mob/proc/transfer_ckey(mob/new_mob, send_signal = TRUE)
 	if(!new_mob || (!ckey && new_mob.ckey))
 		CRASH("transfer_ckey() called [new_mob ? "on ckey-less mob with a player mob as target" : "without a valid mob target"]!")
@@ -1002,6 +969,12 @@ GLOBAL_VAR_INIT(exploit_warn_spam_prevention, 0)
 	switch(var_name)
 		if("logging")
 			return debug_variable(var_name, logging, 0, src, FALSE)
+		if(NAMEOF(src, lastKnownIP))
+			if(!check_rights(R_SENSITIVE, FALSE))
+				return "SENSITIVE"
+		if(NAMEOF(src, computer_id))
+			if(!check_rights(R_SENSITIVE, FALSE))
+				return "SENSITIVE"
 	. = ..()
 
 /mob/vv_auto_rename(new_name)