Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui

code/datums/mood_events/generic_negative_events.dm

@@ -294,3 +294,8 @@
 	description = "<span class='boldwarning'>I hate when my shoes come untied!</span>\n"
 	mood_change = -3
 	timeout = 1 MINUTES
+
+/datum/mood_event/sacrifice_bad
+	description = "<span class='warning'>Those darn savages!</span>\n"
+	mood_change = -5
+	timeout = 2 MINUTES

code/datums/mood_events/generic_positive_events.dm

@@ -205,3 +205,8 @@
 /datum/mood_event/cleared_stomach
 	description = "<span class='nicegreen'>Feels nice to get that out of the way!</span>\n"
 	mood_change = 3
+
+/datum/mood_event/sacrifice_good
+	description = "<span class='nicegreen'>The gods are pleased with this offering!</span>\n"
+	mood_change = 5
+	timeout = 3 MINUTES

code/datums/mutations/space_adaptation.dm

@@ -13,6 +13,7 @@
 		return
 	ADD_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
 	ADD_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")
+	ADD_TRAIT(owner, TRAIT_LOWPRESSURECOOLING, "cold_resistance")
 	owner.add_filter("space_glow", 2, list("type" = "outline", "color" = "#ffe46bd8", "size" = 1))
 	addtimer(CALLBACK(src, .proc/glow_loop, owner), rand(1,19))
 
@@ -27,5 +28,6 @@
 		return
 	REMOVE_TRAIT(owner, TRAIT_RESISTCOLD, "cold_resistance")
 	REMOVE_TRAIT(owner, TRAIT_RESISTLOWPRESSURE, "cold_resistance")
+	REMOVE_TRAIT(owner, TRAIT_LOWPRESSURECOOLING, "cold_resistance")
 	owner.remove_filter("space_glow")