Removes Gender (#18628)

* Removes Gender

* Adds herm back

code/game/objects/items/leash.dm

@@ -43,7 +43,7 @@
 		return
 	if(!is_wearing_collar(leash_pet)) //The pet has slipped their collar and is not the pet anymore.
 		leash_pet.visible_message(
-			span_warning("[leash_pet] has slipped out of their collar!"),
+			span_warning("[leash_pet] has slipped out of [leash_pet.p_their()] collar!"),
 			span_warning("You have slipped out of your collar!")
 		)
 		clear_leash()
@@ -124,7 +124,7 @@
 		return
 	if(get_dist(leash_pet, leash_master) > 3 && !leash_pet.stunned)
 		leash_pet.visible_message(
-			span_warning("[leash_pet] is pulled to the ground by their leash!"),
+			span_warning("[leash_pet] is pulled to the ground by [leash_pet.p_their()] leash!"),
 			span_warning("You are pulled to the ground by your leash!")
 		)
 		leash_pet.apply_effect(20, STUN, 0)
@@ -187,7 +187,7 @@
 	STOP_PROCESSING(SSobj, src)
 
 /obj/item/leash/proc/struggle_leash()
-	leash_pet.visible_message(span_danger("\The [leash_pet] is attempting to unhook their leash!"), span_danger("You attempt to unhook your leash"))
+	leash_pet.visible_message(span_danger("\The [leash_pet] is attempting to unhook [leash_pet.p_their()] leash!"), span_danger("You attempt to unhook your leash"))
 	add_attack_logs(leash_master,leash_pet,"Self-unleash (attempt)")
 
 	if(!do_mob(leash_pet, leash_pet, 35))

code/game/objects/items/toys/mech_toys.dm

@@ -166,9 +166,8 @@
 					return
 
 		//extend the offer of battle to the other mech
-		var/datum/gender/T = GLOB.gender_datums[user.get_visible_gender()]
 		to_chat(user, span_notice("You offer battle to [target.name]!"))
-		to_chat(target, span_notice(span_bold("[user.name] wants to battle with [T.His] [name]!") + " " + span_italics("Attack them with a toy mech to initiate combat.")))
+		to_chat(target, span_notice(span_bold("[user.name] wants to battle with [user.p_their()] [name]!") + " " + span_italics("Attack them with a toy mech to initiate combat.")))
 		wants_to_battle = TRUE
 		addtimer(CALLBACK(src, PROC_REF(withdraw_offer), user), 6 SECONDS)
 		return
@@ -391,28 +390,25 @@
  * * target: optional arg used in Mech PvP battles (if used, attacker is target's toy)
  */
 /obj/item/toy/mecha/proc/check_battle_start(mob/living/carbon/user, obj/item/toy/mecha/attacker, mob/living/carbon/target)
-	var/datum/gender/T
-	if(target)
-		T = GLOB.gender_datums[target.get_visible_gender()] // Doing this because Polaris Code has shitty gender datums and it's clunkier than FUCK.
 	if(attacker && attacker.in_combat)
-		to_chat(user, span_notice("[target ? T.His : "Your" ] [attacker.name] is in combat."))
+		to_chat(user, span_notice("[target ? target.p_their() : "Your" ] [attacker.name] is in combat."))
 		if(target)
 			to_chat(target, span_notice("Your [attacker.name] is in combat."))
 		return FALSE
 	if(in_combat)
 		to_chat(user, span_notice("Your [name] is in combat."))
 		if(target)
-			to_chat(target, span_notice("[T.His] [name] is in combat."))
+			to_chat(target, span_notice("[target.p_Their()] [name] is in combat."))
 		return FALSE
 	if(attacker && attacker.timer > world.time)
-		to_chat(user, span_notice("[target?T.His : "Your" ] [attacker.name] isn't ready for battle."))
+		to_chat(user, span_notice("[target ? target.p_their() : "Your" ] [attacker.name] isn't ready for battle."))
 		if(target)
 			to_chat(target, span_notice("Your [attacker.name] isn't ready for battle."))
 		return FALSE
 	if(timer > world.time)
 		to_chat(user, span_notice("Your [name] isn't ready for battle."))
 		if(target)
-			to_chat(target, span_notice("[T.His] [name] isn't ready for battle."))
+			to_chat(target, span_notice("[target.p_Their()] [name] isn't ready for battle."))
 		return FALSE
 
 	return TRUE

code/game/objects/items/weapons/canes.dm

@@ -29,9 +29,8 @@
 	temp_blade.attack_self()
 
 /obj/item/cane/concealed/attack_self(var/mob/user)
-	var/datum/gender/T = GLOB.gender_datums[user.get_visible_gender()]
 	if(concealed_blade)
-		user.visible_message(span_warning("[user] has unsheathed \a [concealed_blade] from [T.his] [src]!"), "You unsheathe \the [concealed_blade] from \the [src].")
+		user.visible_message(span_warning("[user] has unsheathed \a [concealed_blade] from [user.p_their()] [src]!"), "You unsheathe \the [concealed_blade] from \the [src].")
 		// Calling drop/put in hands to properly call item drop/pickup procs
 		playsound(src, 'sound/weapons/holster/sheathout.ogg', 50, 1)
 		user.drop_from_inventory(src)
@@ -46,8 +45,7 @@
 
 /obj/item/cane/concealed/attackby(var/obj/item/material/sword/katana/caneblade/W, var/mob/user)
 	if(!src.concealed_blade && istype(W))
-		var/datum/gender/T = GLOB.gender_datums[user.get_visible_gender()]
-		user.visible_message(span_warning("[user] has sheathed \a [W] into [T.his] [src]!"), "You sheathe \the [W] into \the [src].")
+		user.visible_message(span_warning("[user] has sheathed \a [W] into [user.p_their()] [src]!"), "You sheathe \the [W] into \the [src].")
 		playsound(src, 'sound/weapons/holster/sheathin.ogg', 50, 1)
 		user.drop_from_inventory(W)
 		W.loc = src

code/game/objects/items/weapons/handcuffs.dm

@@ -133,9 +133,7 @@ var/last_chew = 0
 	var/obj/item/organ/external/O = H.organs_by_name[(H.hand ? BP_L_HAND : BP_R_HAND)]
 	if (!O) return
 
-	var/datum/gender/T = GLOB.gender_datums[H.get_visible_gender()]
-
-	var/s = span_warning("[H.name] chews on [T.his] [O.name]!")
+	var/s = span_warning("[H.name] chews on [H.p_their()] [O.name]!")
 	H.visible_message(s, span_warning("You chew on your [O.name]!"))
 	add_attack_logs(H,H,"chewed own [O.name]")
 

code/game/objects/items/weapons/melee/energy.dm

@@ -102,10 +102,9 @@
 			to_chat(user, span_notice("\The [src] does not seem to have power."))
 			return
 
-	var/datum/gender/TU = GLOB.gender_datums[user.get_visible_gender()]
 	if (active)
 		if ((CLUMSY in user.mutations) && prob(50))
-			user.visible_message(span_danger("\The [user] accidentally cuts [TU.himself] with \the [src]."),\
+			user.visible_message(span_danger("\The [user] accidentally cuts [user.p_their()] with \the [src]."),\
 			span_danger("You accidentally cut yourself with \the [src]."))
 			user.take_organ_damage(5,5)
 		deactivate(user)

code/game/objects/structures/kitchen_spike.dm

@@ -19,8 +19,7 @@
 		to_chat(user, span_danger("The spike already has something on it, finish collecting its meat first!"))
 	else
 		if(spike(G.affecting))
-			var/datum/gender/T = GLOB.gender_datums[G.affecting.get_visible_gender()]
-			visible_message(span_danger("[user] has forced [G.affecting] onto the spike, killing [T.him] instantly!"))
+			visible_message(span_danger("[user] has forced [G.affecting] onto the spike, killing [G.p_them()] instantly!"))
 			var/mob/M = G.affecting
 			M.forceMove(src)
 			qdel(G)

code/game/objects/structures/watercloset.dm

@@ -668,10 +668,9 @@
 					R.cell.charge -= 20
 				else
 					B.deductcharge(B.hitcost)
-				var/datum/gender/TU = GLOB.gender_datums[user.get_visible_gender()]
 				user.visible_message( \
-					span_danger("[user] was stunned by [TU.his] wet [O]!"), \
-					span_userdanger("[user] was stunned by [TU.his] wet [O]!"))
+					span_danger("[user] was stunned by [user.p_their()] wet [O]!"), \
+					span_userdanger("[user] was stunned by [user.p_their()] wet [O]!"))
 				return 1
 	else if(istype(O, /obj/item/mop))
 		O.reagents.add_reagent(REAGENT_ID_WATER, 5)