Merge branch 'master' into UpstreamMergeApril2020

code/modules/games/cah_white_cards.dm

@@ -383,6 +383,7 @@
 	"Jafar.",
 	"Jean-Claude Van Damme.",
 	"Jeff Goldblum.",
+	"Jello.",
 	"Jerking off into a pool of children's tears.",
 	"Jew-fros.",
 	"Jewish fraternities.",
@@ -715,7 +716,7 @@
 	"Gay aliens.",
 	"The way white people is.",
 	"Reverse cowgirl.",
-	"The Quesadilla Explosion Salad from Chili’s.",
+	"The Quesadilla Explosion Salad from Chili's.",
 	"Actually getting shot, for real.",
 	"Not having sex.",
 	"Vietnam flashbacks.",
@@ -740,7 +741,7 @@
 	"A greased-up Matthew McConaughey.",
 	"An unstoppable wave of fire ants.",
 	"Not contributing to society in any meaningful way.",
-	"An all-midget production of Shakespeare’s Richard III.",
+	"An all-midget production of Shakespeare's Richard III.",
 	"Screaming like a maniac.",
 	"The moist, demanding chasm of his mouth.",
 	"Filling every orifice with butterscotch pudding.",
@@ -749,7 +750,7 @@
 	"Velcro.",
 	"A PowerPoint presentation.",
 	"A surprising amount of hair.",
-	"Eating Tom Selleck’s mustache to gain his powers.",
+	"Eating Tom Selleck's mustache to gain his powers.",
 	"Roland the Farter, flatulist to the king.",
 	"A pile of squirming bodies.",
 	"Buying the right pants to be cool.",
@@ -761,7 +762,7 @@
 	"A lamprey swimming up the toilet and latching onto your taint.",
 	"Jumping out at people.",
 	"A black male in his early 20s, last seen wearing a hoodie.",
-	"Mufasa’s death scene.",
+	"Mufasa's death scene.",
 	"Bill Clinton, naked on a bearskin rug with a saxophone.",
 	"Demonic possession.",
 	"The Harlem Globetrotters.",
@@ -775,7 +776,7 @@
 	"Getting your dick stuck in a Chinese finger trap with another dick.",
 	"Fisting.",
 	"The thin veneer of situational causality that underlies porn.",
-	"Girls that always be textin’.",
+	"Girls that always be textin'.",
 	"Blowing some dudes in an alley.",
 	"Drinking ten 5-hour ENERGYs to get fifty continuous hours of energy.",
 	"Sneezing, farting, and coming at the same time."

code/modules/mob/new_player/sprite_accessories_ch.dm

@@ -106,9 +106,13 @@
 
 //TFF 16/1/20 - Cotton hair backport
 /datum/sprite_accessory/hair/ch
+	icon = 'icons/mob/human_face_ch.dmi'
+	icon_add = 'icons/mob/human_face_ch_add.dmi'
 	cotton
 		name = "Cotton"
 		icon_state = "hair_cotton"
-		icon_add = 'icons/mob/human_face_ch_add.dmi'
-		icon = 'icons/mob/human_face_ch.dmi'
 
+
+	unshavenreversemohawk
+		name = "Mohawk Reverse Unshaven"
+		icon_state = "hair_unshaven_reversemohawk"

vorestation.dme

@@ -3568,6 +3568,7 @@
 #include "code\modules\vore\eating\vorehooks_vr.dm"
 #include "code\modules\vore\eating\vorepanel_ch.dm"
 #include "code\modules\vore\eating\vorepanel_vr.dm"
+#include "code\modules\vore\fluffstuff\axisrus_yw.dm"
 #include "code\modules\vore\fluffstuff\custom_boxes_ch.dm"
 #include "code\modules\vore\fluffstuff\axisrus_yw.dm"
 #include "code\modules\vore\fluffstuff\custom_boxes_vr.dm"