Merge pull request #2542 from Merek2/Merek

Two Change
ARF-SS13 · Jun 23, 2023 · bf75ff1 · bf75ff1
2 parents 9b24028 + 0374c6a
commit bf75ff1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
@@ -275,9 +275,9 @@
 		temp = getToxLoss()
 		if(temp)
 			if(temp < 25)
-				msg += "[t_He] looks sick\n"
+				msg += "[t_He] looks sick.\n"
 			else if(temp < 50)
-				msg += "<B>[t_He] looks nauseous</B>\n"
+				msg += "<B>[t_He] looks nauseous.</B>\n"
 			else if (temp < 180)
 				msg += "<B>[t_He] looks very unwell!</B>\n"
 			else
@@ -286,7 +286,7 @@
 		temp = getOxyLoss()
 		if(temp)
 			if(temp < 25)
-				msg += "[t_He] looks pale\n"
+				msg += "[t_He] looks pale.\n"
 			else if(temp < 50)
 				msg += "<B>[t_He] Is struggling to breathe!</B>\n"
 			else if (temp < 100)

diff --git a/code/modules/mob/living/emote.dm b/code/modules/mob/living/emote.dm
@@ -207,6 +207,14 @@
 	wing_time = 10
 */
 
+/datum/emote/living/fchuckle
+	key = "fchuckle"
+	key_third_person = "fchuckles"
+	message = "chuckles."
+	message_param = "chuckles at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'sound/f13effects/sunsetsounds/femalechuckle.ogg'
+
 /datum/emote/living/frown
 	key = "frown"
 	key_third_person = "frowns"