Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Coffee machines for all Galactic Conquest maps & Syndicate coffee mood #2576

Merged
merged 2 commits into from
Nov 10, 2023
+58 −11
Merged

Coffee machines for all Galactic Conquest maps & Syndicate coffee mood #2576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa77213
Coffee for all PVP maps & Syndicate coffee mood
someone543 Oct 27, 2023
8fe2b82
BabyCoffee Fixes
someone543 Nov 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 28 additions & 6 deletions _maps/map_files/Instanced/map_files/Babylon2.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions _maps/map_files/Instanced/map_files/Hammurabi1.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions _maps/map_files/Instanced/map_files/SpaceSHIP.dmm
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions nsv13/code/datums/mood_events/nsv_events.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion nsv13/code/modules/reagents/chemistry/reagents/other_reagents.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Loading