Merge branch 'master' of https://github.com/MrSky12/GS13

GainStation13/code/modules/mob/living/emote.dm

@@ -50,6 +50,15 @@
 		return FALSE	
 
 	make_noise(user, "brap", FARTING_NOISES)
+	var/obj/item/storage/book/bible/b = locate(/obj/item/storage/book/bible) in get_turf(user) //Biblefart
+	if(b) //Devine Retribution
+		user.visible_message("<span class='danger'>\The [user] farts on \the [b], causing a violent, otherworldly ripple to echo outwards before they explode in a gorey mess of divine retribution!</span>",
+							"<span class='userdanger'>You feel a deep sense of dread as you release pressure from your rear over \the [b], immediately realizing your mistake as Divine Retribution rends your form into a gorey mess.</span>")
+		user.emote("scream")
+		message_admins("[ADMIN_LOOKUPFLW(user)] farted on a bible at [ADMIN_VERBOSEJMP(user)] and was gibbed.")
+		log_game("[key_name(user)] farted on a bible at [AREACOORD(user)] and was gibbed")
+		user.gib()
+		return ..() //Gassy is dead, no fullness to reduce
 
 	. = ..()	
 	reduce_fullness(user, rand(6,12))
@@ -81,7 +90,16 @@
 		return FALSE	
 
 	make_noise(user, "fart", FARTING_NOISES)
-		
+	var/obj/item/storage/book/bible/b = locate(/obj/item/storage/book/bible) in get_turf(user) //Biblefart
+	if(b) //Devine Retribution
+		user.visible_message("<span class='danger'>\The [user] farts on \the [b], causing a violent, otherworldly ripple to echo outwards before they explode in a gorey mess of divine retribution!</span>",
+							"<span class='userdanger'>You feel a deep sense of dread as you release pressure from your rear over \the [b], immediately realizing your mistake as Divine Retribution rends your form into a gorey mess.</span>")
+		user.emote("scream")
+		message_admins("[ADMIN_LOOKUPFLW(user)] farted on a bible at [ADMIN_VERBOSEJMP(user)] and was gibbed.")
+		log_game("[key_name(user)] farted on a bible at [AREACOORD(user)] and was gibbed")
+		user.gib()
+		return ..() //Gassy is dead, no fullness to reduce
+
 	. = ..()	
 	reduce_fullness(user, rand(4,8))
 

GainStation13/code/modules/mob/living/emote_ported.dm

@@ -175,6 +175,24 @@
 	emote_type = EMOTE_AUDIBLE
 	sound = 'GainStation13/sound/voice/teshari/teshscream.ogg'
 
+/datum/emote/living/prbt
+	key = "prbt"
+	key_third_person = "prbts"
+	message = "prbts."
+	message_param = "prbts at %t."
+	emote_type = EMOTE_AUDIBLE
+	sound = 'GainStation13/sound/voice/emotes/prbt.ogg'
+
+/datum/emote/living/mlem
+	key = "mlem"
+	key_third_person = "mlems"
+	message = "mlems their tongue up over their nose. Mlem."
+
+/datum/emote/living/blep
+	key = "blep"
+	key_third_person = "bleps"
+	message = "bleps their tongue out. Blep."
+
 /datum/emote/living/teppi
 	key = "gyoh"
 	key_third_person = "gyohs"