Coffee machines for all Galactic Conquest maps & Syndicate coffee mood (

#2576)
BeeStation · Nov 10, 2023 · 5d223fc · 5d223fc
1 parent 5ad99a7
commit 5d223fc
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 11 deletions.
diff --git a/_maps/map_files/Instanced/map_files/Babylon2.dmm b/_maps/map_files/Instanced/map_files/Babylon2.dmm
diff --git a/_maps/map_files/Instanced/map_files/Hammurabi1.dmm b/_maps/map_files/Instanced/map_files/Hammurabi1.dmm
diff --git a/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm b/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm
diff --git a/nsv13/code/datums/mood_events/nsv_events.dm b/nsv13/code/datums/mood_events/nsv_events.dm
@@ -43,6 +43,11 @@
 	mood_change = 10
 	timeout = 10 MINUTES
 
+/datum/mood_event/drink_navy_coffee/add_effects(list/faction)
+	if("Syndicate" in faction)
+		description = "<span class='nicegreen'><b>THAT SHIT TASTED FUCKING DELICIOUS LET'S GO FUCK SOME NANOTRASEN SHIPS UP, NAVY FOR LIFE WOOOOOO!!</b></span>\n"
+
+
 /datum/mood_event/cheers
 	description = "<span class='nicegreen'>Cheers! ¡Salud! Kanpai! Prost! Skål! Santé! Sláinte! Saúde!</span>\n"
 	mood_change = 3

diff --git a/nsv13/code/modules/reagents/chemistry/reagents/other_reagents.dm b/nsv13/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -27,7 +27,7 @@
 	M.dizziness = max(0,M.dizziness-5)
 	M.drowsyness = max(0,M.drowsyness-3)
 	M.AdjustSleeping(-40, FALSE)
-	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "navy_coffee", /datum/mood_event/drink_navy_coffee)
+	SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "navy_coffee", /datum/mood_event/drink_navy_coffee, M.faction)
 	..()
 	. = 1