Merge remote-tracking branch 'upstream/master' into RBMK_Branch_Simple

code/game/area/Space_Station_13_areas.dm

@@ -177,6 +177,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 	xenobiology_compatible = TRUE
 
 
+
 //Maintenance - Generic
 
 /area/maintenance/arrivals/north
@@ -1365,11 +1366,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 
 /area/xenoarch/sec
 	name = "Xenoarchaeology Security"
-	icon_state = "xenosec" 
+	icon_state = "xenosec"
 
 /area/xenoarch/med
 	name = "Xenoarchaeology Medical"
-	icon_state = "xenomed" 
+	icon_state = "xenomed"
 
 //Pool
 /area/crew_quarters/fitness/pool
@@ -1384,3 +1385,11 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
 /area/arcade
 	name = "Arcade"
 	icon_state = "yellow"
+
+//Diner
+/area/diner
+	name = "Space Diner"
+	icon_state = "bar"
+	requires_power = FALSE
+	has_gravity = STANDARD_GRAVITY
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED

code/game/objects/empulse.dm

@@ -8,6 +8,8 @@
 	if(log)
 		message_admins("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
 		log_game("EMP with size ([heavy_range], [light_range]) in area [epicenter.loc.name] ")
+	
+	deadchat_broadcast("<span class='deadsay bold'>EMP with size ([heavy_range], [light_range]) has occured at [epicenter.loc.name]</span>", turf_target = get_turf(epicenter))
 
 	if(heavy_range >= 1)
 		new /obj/effect/temp_visual/emp/pulse(epicenter)

code/game/objects/items/devices/desynchronizer.dm

@@ -1,5 +1,3 @@
-//NOT YET IMPLEMENTED -- Archie
-
 /obj/item/desynchronizer
 	name = "desynchronizer"
 	desc = "An experimental device that can temporarily desynchronize the user from spacetime, effectively making them disappear while it's active."