Merge branch 'master' into familyport

2022-02-11 14:04:57 -05:00
parent 632b1b36cc e25aa3cf61
commit f1ca283318
1209 changed files with 276175 additions and 55667 deletions
@@ -325,3 +325,8 @@

 	mood_change *= people_laughing_at_you
 	return ..()
+
+/datum/mood_event/sacrifice_bad
+	description = "<span class='warning'>Those darn savages!</span>\n"
+	mood_change = -5
+	timeout = 2 MINUTES
@@ -220,3 +220,8 @@
 	description = "<span class='nicegreen'>HA! What a rube, they never stood a chance...</span>\n"
 	mood_change = 4
 	timeout = 1.5 MINUTES
+
+/datum/mood_event/sacrifice_good
+	description = "<span class='nicegreen'>The gods are pleased with this offering!</span>\n"
+	mood_change = 5
+	timeout = 3 MINUTES