Revert "Merge branch 'master' into Yeehaw"

This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.

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

@@ -74,5 +74,4 @@
 
 /datum/sprite_accessory/underwear
 	icon = 'icons/mob/underwear.dmi'
-	var/has_color = FALSE
-	var/has_digitigrade = FALSE
+	var/has_color = FALSE

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

@@ -2,9 +2,6 @@
 // Socks Definitions //
 ///////////////////////
 
-/datum/sprite_accessory/underwear/socks
-	has_digitigrade = TRUE
-
 /datum/sprite_accessory/underwear/socks/nude
 	name = "Nude"
 	icon_state = null

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

@@ -28,49 +28,41 @@
 	name = "Boxers"
 	icon_state = "boxers"
 	has_color = TRUE
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_bee
 	name = "Boxers - Bee"
 	icon_state = "bee_shorts"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_hearts
 	name = "Boxers - Heart"
 	icon_state = "boxers_heart"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_stripe
 	name = "Boxers - Striped"
 	icon_state = "boxers_striped"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_commie
 	name = "Boxers - Striped Communist"
 	icon_state = "boxers_commie"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_usastripe
 	name = "Boxers - Striped Freedom"
 	icon_state = "boxers_assblastusa"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/male_uk
 	name = "Boxers - Striped UK"
 	icon_state = "boxers_uk"
-	has_digitigrade = TRUE
 	gender = MALE
 
 /datum/sprite_accessory/underwear/bottom/boxer_briefs
 	name = "Boxer Briefs"
 	icon_state = "boxer_briefs"
-	has_digitigrade = TRUE
 	has_color = TRUE
 
 /datum/sprite_accessory/underwear/bottom/panties
@@ -148,7 +140,6 @@
 /datum/sprite_accessory/underwear/bottom/longjon
 	name = "Long John Bottoms"
 	icon_state = "ljonb"
-	has_digitigrade = TRUE
 	has_color = TRUE
 
 /datum/sprite_accessory/underwear/bottom/swimsuit_red

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

@@ -18,6 +18,3 @@
 
 	update_icon(preferred_form)
 	updateghostimages()
-
-	client.reenter_round_timeout = max(client.reenter_round_timeout, clientless_round_timeout)
-	clientless_round_timeout = client.reenter_round_timeout

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

@@ -3,6 +3,8 @@ GLOBAL_LIST_EMPTY(ghost_images_simple) //this is a list of all ghost images as t
 
 GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 
+#define CANT_REENTER_ROUND -1
+
 /mob/dead/observer
 	name = "ghost"
 	desc = "It's a g-g-g-g-ghooooost!" //jinkies!
@@ -19,7 +21,7 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
 	hud_type = /datum/hud/ghost
 	movement_type = GROUND | FLYING
 	var/can_reenter_corpse
-	var/clientless_round_timeout = 0 //mobs will lack a client as long as their player is disconnected. See client_defines.dm "reenter_round_timeout"
+	var/reenter_round_timeout = 0 // used to prevent people from coming back through ghost roles/midround antags as they suicide/cryo for a duration set by CONFIG_GET(number/suicide_reenter_round_timer) and CONFIG_GET(number/roundstart_suicide_time_limit)
 	var/datum/hud/living/carbon/hud = null // hud
 	var/bootime = 0
 	var/started_as_observer //This variable is set to 1 when you enter the game as an observer.
@@ -276,16 +278,9 @@ Works together with spawning an observer, noted above.
 		if(world.time < roundstart_quit_limit) //add up the time difference to their antag rolling penalty if they quit before half a (ingame) hour even passed.
 			penalty += roundstart_quit_limit - world.time
 		if(penalty)
-			penalty += world.realtime
-			if(penalty - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
-				penalty = CANT_REENTER_ROUND
-			if(client)
-				client.reenter_round_timeout = penalty
-			else //A disconnected player (quite likely for cryopods)
-				ghost.clientless_round_timeout = penalty
-	if (client && client.prefs && client.prefs.auto_ooc)
-		if (!(client.prefs.chat_toggles & CHAT_OOC))
-			client.prefs.chat_toggles ^= CHAT_OOC
+			ghost.reenter_round_timeout = world.realtime + penalty
+			if(ghost.reenter_round_timeout - SSshuttle.realtimeofstart > SSshuttle.auto_call + SSshuttle.emergencyCallTime + SSshuttle.emergencyDockTime + SSshuttle.emergencyEscapeTime)
+				ghost.reenter_round_timeout = CANT_REENTER_ROUND
 	transfer_ckey(ghost, FALSE)
 	return ghost
 
@@ -344,13 +339,10 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	ghostize(0, penalize = TRUE)
 
 /mob/dead/observer/proc/can_reenter_round(silent = FALSE)
-	var/timeout = clientless_round_timeout
-	if(client)
-		timeout = client.reenter_round_timeout
-	if(timeout != CANT_REENTER_ROUND && timeout <= world.realtime)
+	if(reenter_round_timeout != CANT_REENTER_ROUND && reenter_round_timeout <= world.realtime)
 		return TRUE
-	if(!silent && client)
-		to_chat(src, "<span class='warning'>You are unable to reenter the round[timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(timeout - world.realtime)]" : ""].</span>")
+	if(!silent)
+		to_chat(src, "<span class='warning'>You are unable to reenter the round[reenter_round_timeout != CANT_REENTER_ROUND ? " yet. Your ghost role blacklist will expire in [DisplayTimeText(reenter_round_timeout - world.realtime)]" : ""].</span>")
 	return FALSE
 
 /mob/dead/observer/Move(NewLoc, direct)
@@ -906,3 +898,5 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		spawners_menu = new(src)
 
 	spawners_menu.ui_interact(src)
+
+#undef CANT_REENTER_ROUND