Merge branch 'master' into reagentToDefines

maps/groundbase/gb-z1.dmm

@@ -1820,6 +1820,15 @@
 /obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
+/obj/structure/closet/walllocker_double/hydrant/south,
+/obj/item/hand_labeler,
+/obj/item/storage/box/glasses/coffeecup,
+/obj/item/storage/box/glasses/coffeecup,
+/obj/item/storage/box/glasses/coffeecup,
+/obj/item/storage/box/glasses/coffeecup,
+/obj/item/storage/box/glasses/coffeecup_tall,
+/obj/item/storage/box/glasses/coffeecup_grande,
+/obj/item/storage/box/glasses/coffeecup_venti,
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)
 "dW" = (
@@ -5875,8 +5884,12 @@
 /obj/random/mug,
 /obj/random/mug,
 /obj/item/reagent_containers/food/drinks/shaker{
-	pixel_x = 5;
-	pixel_y = 6
+	pixel_x = -7;
+	pixel_y = 18
+	},
+/obj/machinery/chemical_dispenser/bar_syrup/full{
+	dir = 8;
+	pixel_x = 7
 	},
 /turf/simulated/floor/lino,
 /area/groundbase/civilian/cafe)

maps/groundbase/groundbase_areas.dm

@@ -359,18 +359,21 @@
 	icon_state = "grewhisqu"
 	ambience = AMBIENCE_FOREBODING
 	lightswitch = 0
+
 /area/groundbase/civilian/arrivals
 	name = "Arrivals"
 	lightswitch = 1
-	forbid_events = TRUE
-	forbid_singulo = TRUE
+	flags = AREA_FORBID_EVENTS | AREA_FORBID_SINGULO
+
 /area/groundbase/civilian/toolstorage
 	name = "Tool Storage"
 	lightswitch = 1
+
 /area/groundbase/civilian/bar
 	name = "Bar"
 	sound_env = LARGE_ENCLOSED
 	lightswitch = 1
+
 /area/groundbase/civilian/bar/upper
 	name = "Bar Balcony"
 	base_turf = /turf/simulated/open/virgo3c
@@ -379,14 +382,17 @@
 	name = "Cafe"
 	sound_env = SMALL_SOFTFLOOR
 	lightswitch = 1
+
 /area/groundbase/civilian/hydroponics
 	name = "Hydroponics"
 	lightswitch = 1
+
 /area/groundbase/civilian/hydroponics/out
 	name = "Hydroponics Animal Pen"
 /area/groundbase/civilian/kitchen
 	name = "Kitchen"
 	lightswitch = 1
+
 /area/groundbase/civilian/kitchen/freezer
 	name = "Kitchen Freezer"
 /area/groundbase/civilian/kitchen/backroom
@@ -420,14 +426,15 @@
 	sound_env = SMALL_SOFTFLOOR
 /area/groundbase/civilian/mensrestroom
 	name = "Men's Restroom"
+	flags = AREA_FORBID_EVENTS
 	sound_env = SOUND_ENVIRONMENT_BATHROOM
 	lightswitch = 1
-	forbid_events = TRUE
+
 /area/groundbase/civilian/womensrestroom
 	name = "Women's Restroom"
+	flags = AREA_FORBID_EVENTS
 	sound_env = SOUND_ENVIRONMENT_BATHROOM
 	lightswitch = 1
-	forbid_events = TRUE
 
 /area/groundbase/civilian/entrepreneur
 	name = "\improper Shared Office"
@@ -456,13 +463,7 @@
 	holomap_color = HOLOMAP_AREACOLOR_DORMS
 	icon_state = "grawhisqu"
 	ambience = AMBIENCE_GENERIC
-	flags = RAD_SHIELDED| BLUE_SHIELDED |AREA_FLAG_IS_NOT_PERSISTENT
-	soundproofed = TRUE
-	limit_mob_size = FALSE
-	block_suit_sensors = TRUE
-	block_tracking = TRUE
-	forbid_events = TRUE
-	forbid_singulo = TRUE
+	flags = RAD_SHIELDED | BLUE_SHIELDED | AREA_FLAG_IS_NOT_PERSISTENT | AREA_FORBID_EVENTS | AREA_FORBID_SINGULO | AREA_SOUNDPROOF | AREA_ALLOW_LARGE_SIZE | AREA_BLOCK_SUIT_SENSORS | AREA_BLOCK_TRACKING
 
 /area/groundbase/dorms/bathroom
 	name = "Dormitory Bathroom"

maps/groundbase/groundbase_events.dm

@@ -70,6 +70,7 @@
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Drone Pod Drop",			/datum/event/drone_pod_drop,			40,		list(ASSIGNMENT_SCIENTIST = 40), 1),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Morph Spawn",				/datum/event/morph_spawn,				75,		list(ASSIGNMENT_ANY = 5), 0),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Predator",		/datum/event/maintenance_predator,		100,	list(ASSIGNMENT_ANY = 5), 0),
+		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Maintenance Lurker",		/datum/event/maintenance_lurker,		100,	list(ASSIGNMENT_ANY = 5), 0),
 		new /datum/event_meta(EVENT_LEVEL_MODERATE, "Roaming Wildlife",			/datum/event/roaming_wildlife,  		20,		list(ASSIGNMENT_SECURITY = 20, ASSIGNMENT_MEDICAL = 5), min_jobs = list(ASSIGNMENT_SECURITY = 2)),
 	)
 	add_disabled_events(list(