diff --git a/_maps/map_files/Instanced/map_files/Babylon2.dmm b/_maps/map_files/Instanced/map_files/Babylon2.dmm index 17033165d0d..c15891698d4 100644 --- a/_maps/map_files/Instanced/map_files/Babylon2.dmm +++ b/_maps/map_files/Instanced/map_files/Babylon2.dmm @@ -11919,7 +11919,6 @@ /area/quartermaster/pvp) "kIH" = ( /obj/structure/table/wood, -/obj/item/modular_computer/laptop/preset/civillian, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, @@ -11929,6 +11928,7 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/machinery/coffeemaker, /turf/open/floor/mineral/plastitanium/red, /area/crew_quarters/bar/pvp) "kJu" = ( @@ -13570,6 +13570,7 @@ /obj/machinery/power/apc/auto_name/west{ req_access = list(150) }, +/obj/machinery/coffeemaker/pendulum, /turf/open/floor/plasteel/tech/grid, /area/bridge/pvp) "mks" = ( @@ -20407,6 +20408,17 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /turf/open/floor/plasteel/tech/grid, /area/engine/engineering/pvp) +"svI" = ( +/obj/structure/table/wood, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, +/obj/structure/cable{ + icon_state = "1-2" + }, +/obj/item/clothing/mask/cigarette/cigar, +/obj/item/nullrod/fedora, +/turf/open/floor/mineral/plastitanium/red, +/area/crew_quarters/bar/pvp) "sxc" = ( /turf/open/floor/plasteel, /area/quartermaster/pvp) @@ -23724,13 +23736,12 @@ /area/bridge/pvp) "voB" = ( /obj/structure/table/wood, -/obj/item/clothing/mask/cigarette/cigar, -/obj/item/nullrod/fedora, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4, /obj/structure/cable{ icon_state = "1-2" }, +/obj/item/modular_computer/laptop/preset/civillian, /turf/open/floor/mineral/plastitanium/red, /area/crew_quarters/bar/pvp) "vqc" = ( @@ -24218,6 +24229,11 @@ }, /turf/open/floor/wood, /area/hallway/pvp) +"vPc" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/coffee_condi_display, +/turf/open/floor/mineral/plastitanium/red, +/area/crew_quarters/bar/pvp) "vPe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 8 @@ -25488,6 +25504,12 @@ /obj/machinery/firealarm/directional/west, /turf/open/floor/plasteel/white, /area/medical/medbay/pvp) +"wZP" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/coffee_condi_display, +/obj/item/storage/box/coffeepack/robusta, +/turf/open/floor/plasteel/tech/grid, +/area/bridge/pvp) "xaj" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 8 @@ -62230,7 +62252,7 @@ iAi jxM pwS iUo -fGT +wZP mjG qxQ oUp @@ -65345,10 +65367,10 @@ eJJ vfV rpt pPA -pPA +svI voB kIH -fHk +vPc fJp fJp enS diff --git a/_maps/map_files/Instanced/map_files/Hammurabi1.dmm b/_maps/map_files/Instanced/map_files/Hammurabi1.dmm index ed97cca6cd8..4080cbdf9bd 100644 --- a/_maps/map_files/Instanced/map_files/Hammurabi1.dmm +++ b/_maps/map_files/Instanced/map_files/Hammurabi1.dmm @@ -390,6 +390,11 @@ "mv" = ( /turf/closed/wall/r_wall, /area/hammurabi/maintenance/secondary) +"na" = ( +/obj/structure/table/wood, +/obj/item/storage/fancy/coffee_condi_display, +/turf/open/floor/mineral/plastitanium/red, +/area/hammurabi/bar) "nk" = ( /obj/structure/cable{ icon_state = "1-4" @@ -794,6 +799,11 @@ /obj/machinery/door/firedoor/border_only/directional/east, /turf/open/floor/plating, /area/hammurabi/maintenance/secondary) +"AB" = ( +/obj/structure/table/wood, +/obj/machinery/coffeemaker, +/turf/open/floor/mineral/plastitanium/red, +/area/hammurabi/bar) "AR" = ( /obj/machinery/vending/boozeomat/syndicate_access{ payment_department = "SYN" @@ -28547,7 +28557,7 @@ mv mv kw aG -Tk +AB EU UR ki @@ -28804,7 +28814,7 @@ mv AR UR UR -Tk +na EU UR ki diff --git a/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm b/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm index a3e6d0d0a12..259ee20079e 100644 --- a/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm +++ b/_maps/map_files/Instanced/map_files/SpaceSHIP.dmm @@ -7389,6 +7389,11 @@ }, /turf/open/floor/carpet/red, /area/nsv/hanger/pvp/marine) +"rn" = ( +/obj/structure/table/reinforced, +/obj/machinery/coffeemaker, +/turf/open/floor/wood, +/area/crew_quarters/bar/pvp) "ro" = ( /obj/machinery/camera/syndicate{ c_tag = "Chief Medical Officer's Office"; @@ -21708,6 +21713,11 @@ }, /turf/open/floor/durasteel/lino, /area/crew_quarters/heads/captain/pvp/admiral) +"Zv" = ( +/obj/structure/table/reinforced, +/obj/item/storage/fancy/coffee_condi_display, +/turf/open/floor/wood, +/area/crew_quarters/bar/pvp) "Zw" = ( /obj/machinery/atmospherics/components/binary/pump{ dir = 8 @@ -61218,8 +61228,8 @@ jg fx WN jg -jg -jg +rn +Zv oY Ae jn diff --git a/nsv13/code/datums/mood_events/nsv_events.dm b/nsv13/code/datums/mood_events/nsv_events.dm index 6e802afde16..d684925ae08 100644 --- 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 = "THAT SHIT TASTED FUCKING DELICIOUS LET'S GO FUCK SOME NANOTRASEN SHIPS UP, NAVY FOR LIFE WOOOOOO!!\n" + + /datum/mood_event/cheers description = "Cheers! ¡Salud! Kanpai! Prost! Skål! Santé! Sláinte! Saúde!\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 index c90f7122723..49e76832c83 100644 --- 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