Fixes #2036

code/game/objects/items/devices/PDA/PDA.dm

@@ -1054,7 +1054,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 
 /obj/item/device/pda/proc/create_message(var/mob/living/U = usr, var/obj/item/device/pda/P, var/tap = 1)
 	if(tap)
-		U.visible_message("<span class='notice'>\The [U] taps on \his PDA's screen.</span>")
+		U.visible_message("<span class='notice'>\The [U] taps on their PDA's screen.</span>")
 	var/t = input(U, "Please enter message", P.name, null) as text
 	t = sanitize(t)
 	//t = readd_quotes(t)

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

@@ -9,7 +9,6 @@
 	var/colour = "red"
 	var/open = 0
 
-
 /obj/item/weapon/lipstick/purple
 	name = "purple lipstick"
 	colour = "purple"
@@ -22,7 +21,6 @@
 	name = "black lipstick"
 	colour = "black"
 
-
 /obj/item/weapon/lipstick/random
 	name = "lipstick"
 
@@ -30,7 +28,6 @@
 	colour = pick("red","purple","jade","black")
 	name = "[colour] lipstick"
 
-
 /obj/item/weapon/lipstick/attack_self(mob/user as mob)
 	user << "<span class='notice'>You twist \the [src] [open ? "closed" : "open"].</span>"
 	open = !open
@@ -67,7 +64,6 @@
 
 //you can wipe off lipstick with paper! see code/modules/paperwork/paper.dm, paper/attack()
 
-
 /obj/item/weapon/haircomb //sparklysheep's comb
 	name = "purple comb"
 	desc = "A pristine purple comb made from flexible plastic."
@@ -77,4 +73,18 @@
 	icon_state = "purplecomb"
 
 /obj/item/weapon/haircomb/attack_self(mob/living/user)
-	user.visible_message(text("<span class='notice'>[] uses [] to comb their hair with incredible style and sophistication. What a [].</span>", user, src, user.gender == FEMALE ? "lady" : "guy"))
+	var/text = "person"
+	if(ishuman(user))
+		var/mob/living/carbon/human/U = user
+		switch(U.identifying_gender)
+			if(MALE)
+				text = "guy"
+			if(FEMALE)
+				text = "lady"
+	else
+		switch(user.gender)
+			if(MALE)
+				text = "guy"
+			if(FEMALE)
+				text = "lady"
+	user.visible_message("<span class='notice'>[user] uses [src] to comb their hair with incredible style and sophistication. What a [text].</span>")

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

@@ -221,14 +221,22 @@
 		H.internal_organs_by_name[organ_tag] = O
 
 
-/datum/species/proc/hug(var/mob/living/carbon/human/H,var/mob/living/target)
+/datum/species/proc/hug(var/mob/living/carbon/human/H, var/mob/living/target)
 
 	var/t_him = "them"
-	switch(target.gender)
-		if(MALE)
-			t_him = "him"
-		if(FEMALE)
-			t_him = "her"
+	if(ishuman(target))
+		var/mob/living/carbon/human/T = target
+		switch(T.identifying_gender)
+			if(MALE)
+				t_him = "him"
+			if(FEMALE)
+				t_him = "her"
+	else
+		switch(target.gender)
+			if(MALE)
+				t_him = "him"
+			if(FEMALE)
+				t_him = "her"
 
 	H.visible_message("<span class='notice'>[H] hugs [target] to make [t_him] feel better!</span>", \
 					"<span class='notice'>You hug [target] to make [t_him] feel better!</span>")