Modular Evacuation

_maps/map_files/generic/CentCom.dmm

@@ -1369,19 +1369,6 @@
 	},
 /turf/open/floor/iron,
 /area/centcom/tdome/observation)
-"dY" = (
-/obj/effect/turf_decal/siding/thinplating_new/dark{
-	dir = 8
-	},
-/obj/structure/table/glass/plasmaglass,
-/obj/item/folder/white,
-/obj/item/pen{
-	pixel_x = 6;
-	pixel_y = 5
-	},
-/obj/machinery/light/cold/directional/west,
-/turf/open/floor/mineral/plastitanium,
-/area/centcom/syndicate_mothership/control)
 "dZ" = (
 /obj/item/kirbyplants{
 	icon_state = "plant-21"
@@ -5647,16 +5634,6 @@
 	},
 /turf/open/floor/iron,
 /area/centcom/central_command_areas/supplypod/loading/ert)
-"pY" = (
-/obj/item/gun/energy/pulse/carbine,
-/obj/item/flashlight/seclite,
-/obj/structure/table/reinforced,
-/obj/machinery/airalarm/directional/south,
-/obj/effect/turf_decal/stripes/line{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/admin/storage)
 "pZ" = (
 /obj/effect/turf_decal/tile/bar,
 /obj/effect/turf_decal/tile/bar{
@@ -5933,6 +5910,10 @@
 	},
 /turf/open/floor/iron/dark,
 /area/centcom/central_command_areas/supplypod)
+"qJ" = (
+/obj/structure/filingcabinet/chestdrawer,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/ferry)
 "qK" = (
 /obj/machinery/air_sensor{
 	chamber_id = "nukiebase";
@@ -6715,6 +6696,12 @@
 	},
 /turf/open/floor/wood,
 /area/centcom/central_command_areas/admin)
+"tm" = (
+/obj/machinery/light/directional/south,
+/obj/effect/turf_decal/tile/neutral/fourcorners,
+/obj/machinery/status_display/evac/directional/south,
+/turf/open/floor/iron/dark,
+/area/centcom/central_command_areas/ferry)
 "tn" = (
 /obj/machinery/power/apc/auto_name/directional/south,
 /obj/structure/cable/smart_cable/color/yellow,
@@ -7004,15 +6991,6 @@
 /obj/effect/turf_decal/siding/thinplating_new/dark,
 /turf/open/floor/mineral/plastitanium/red,
 /area/centcom/syndicate_mothership/expansion_bioterrorism)
-"um" = (
-/obj/machinery/computer/communications{
-	dir = 1
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 5
-	},
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/ferry)
 "uo" = (
 /obj/machinery/light/floor/has_bulb,
 /turf/open/floor/catwalk_floor/titanium,
@@ -8127,17 +8105,6 @@
 /obj/machinery/vending/snack,
 /turf/open/floor/engine/cult,
 /area/centcom/wizard_station)
-"xy" = (
-/obj/structure/table/reinforced,
-/obj/item/paper/fluff/stations/centcom/disk_memo{
-	pixel_x = -6;
-	pixel_y = -7
-	},
-/obj/item/taperecorder{
-	pixel_y = 15
-	},
-/turf/open/floor/carpet,
-/area/centcom/syndicate_mothership/control)
 "xz" = (
 /obj/structure/table/wood/fancy,
 /obj/item/storage/photo_album,
@@ -8720,6 +8687,17 @@
 	},
 /turf/open/misc/asteroid/snow/airless,
 /area/centcom/syndicate_mothership)
+"zv" = (
+/obj/structure/table/reinforced,
+/obj/item/paper/fluff/stations/centcom/disk_memo{
+	pixel_x = -6;
+	pixel_y = -7
+	},
+/obj/item/taperecorder{
+	pixel_y = 15
+	},
+/turf/open/floor/carpet,
+/area/centcom/syndicate_mothership/control)
 "zw" = (
 /obj/structure/sign/nanotrasen,
 /turf/closed/indestructible/reinforced/centcom,
@@ -9467,13 +9445,6 @@
 /obj/effect/turf_decal/tile/neutral/fourcorners,
 /turf/open/floor/iron/dark,
 /area/centcom/tdome/administration)
-"By" = (
-/obj/machinery/light/directional/south,
-/obj/structure/filingcabinet/chestdrawer,
-/obj/effect/turf_decal/tile/neutral/fourcorners,
-/obj/machinery/status_display/evac/directional/south,
-/turf/open/floor/iron/dark,
-/area/centcom/central_command_areas/ferry)
 "Bz" = (
 /obj/effect/light_emitter{
 	set_cap = 1;
@@ -11854,18 +11825,6 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/centcom/syndicate_mothership/expansion_chemicalwarfare)
-"Ir" = (
-/obj/machinery/computer/emergency_shuttle{
-	dir = 1
-	},
-/obj/machinery/newscaster{
-	pixel_y = -32
-	},
-/obj/effect/turf_decal/stripes/line{
-	dir = 9
-	},
-/turf/open/floor/iron,
-/area/centcom/central_command_areas/ferry)
 "Is" = (
 /obj/machinery/igniter/on,
 /obj/effect/turf_decal/delivery,
@@ -13311,6 +13270,18 @@
 /obj/item/reagent_containers/food/drinks/trophy/gold_cup,
 /turf/open/floor/iron/grimy,
 /area/centcom/tdome/observation)
+"Nf" = (
+/obj/machinery/newscaster{
+	pixel_y = -32
+	},
+/obj/machinery/computer/communications{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/ferry)
 "Ng" = (
 /obj/item/storage/box/ids{
 	pixel_x = 3;
@@ -14410,6 +14381,19 @@
 /obj/structure/flora/grass/both,
 /turf/open/misc/asteroid/snow,
 /area/centcom/syndicate_mothership/control)
+"Qt" = (
+/obj/effect/turf_decal/siding/thinplating_new/dark{
+	dir = 8
+	},
+/obj/structure/table/glass/plasmaglass,
+/obj/item/folder/white,
+/obj/item/pen{
+	pixel_x = 6;
+	pixel_y = 5
+	},
+/obj/machinery/light/cold/directional/west,
+/turf/open/floor/mineral/plastitanium,
+/area/centcom/syndicate_mothership/control)
 "Qu" = (
 /obj/structure/window/paperframe{
 	can_atmos_pass = 4
@@ -17322,6 +17306,16 @@
 "Ya" = (
 /turf/closed/indestructible/reinforced/centcom,
 /area/centcom/central_command_areas/armory)
+"Yb" = (
+/obj/item/gun/energy/pulse/carbine,
+/obj/item/flashlight/seclite,
+/obj/structure/table/reinforced,
+/obj/machinery/airalarm/directional/south,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/iron,
+/area/centcom/central_command_areas/admin/storage)
 "Yc" = (
 /obj/structure/fireplace,
 /obj/effect/turf_decal/tile/neutral/fourcorners,
@@ -25613,7 +25607,7 @@ ng
 VX
 XE
 od
-dY
+Qt
 Sr
 nz
 br
@@ -37184,7 +37178,7 @@ nz
 HN
 gJ
 dy
-xy
+zv
 nt
 HJ
 VJ
@@ -52859,7 +52853,7 @@ oe
 rm
 ss
 tq
-Ir
+Nf
 mD
 vA
 oe
@@ -53116,7 +53110,7 @@ oe
 rn
 st
 tr
-um
+qJ
 mD
 vB
 oe
@@ -53373,7 +53367,7 @@ mD
 WY
 su
 ts
-By
+tm
 mD
 vC
 wr
@@ -58512,7 +58506,7 @@ XA
 Sx
 Nn
 yi
-pY
+Yb
 YU
 vb
 oe

_maps/multiz_debug.json

@@ -3,6 +3,9 @@
 	"map_name": "MultiZ Debug",
 	"map_path": "map_files/debug",
 	"map_file": "multiz.dmm",
+	"evacuation_controllers": [
+		"/datum/evacuation_controller/emergency_shuttle"
+	],
 	"traits": [
 		{
 			"Up": 1,

_maps/runtimestation.json

@@ -3,6 +3,9 @@
 	"map_name": "Runtime Station",
 	"map_path": "map_files/debug",
 	"map_file": "runtimestation.dmm",
+	"evacuation_controllers": [
+		"/datum/evacuation_controller/emergency_shuttle"
+	],
 	"space_ruin_levels": 1,
 	"shuttles": {
 		"cargo": "cargo_delta"

_maps/shuttles/emergency_bar.dmm

@@ -555,19 +555,6 @@
 	},
 /turf/open/floor/mineral/titanium,
 /area/shuttle/escape)
-"bV" = (
-/obj/structure/table/wood/shuttle_bar{
-	boot_dir = 8
-	},
-/obj/effect/fun_balloon/sentience/emergency_shuttle{
-	group_name = "bar staff on the Emergency Escape Bar"
-	},
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/iron,
-/area/shuttle/escape)
 "bW" = (
 /obj/machinery/light/small/directional/east,
 /turf/open/floor/iron/grimy,
@@ -810,7 +797,7 @@ bG
 aE
 aO
 aR
-bV
+aR
 aR
 aR
 aR

_maps/shuttles/emergency_cruise.dmm

@@ -1069,9 +1069,6 @@
 /obj/item/reagent_containers/glass/rag{
 	pixel_y = 7
 	},
-/obj/effect/fun_balloon/sentience/emergency_shuttle{
-	group_name = "bar staff on the NTSS Independence"
-	},
 /turf/open/floor/wood,
 /area/shuttle/escape)
 "Vk" = (

_maps/shuttles/emergency_narnar.dmm

@@ -171,10 +171,6 @@
 /area/shuttle/escape)
 "I" = (
 /obj/effect/rune/narsie,
-/obj/effect/fun_balloon/sentience/emergency_shuttle{
-	effect_range = 5;
-	group_name = "horrible monsters on Shuttle 667"
-	},
 /turf/open/floor/cult,
 /area/shuttle/escape)
 "J" = (

_maps/shuttles/emergency_rollerdome.dmm

@@ -70,13 +70,6 @@
 /obj/machinery/vending/games,
 /turf/open/floor/eighties,
 /area/shuttle/escape)
-"ns" = (
-/obj/structure/table/wood/shuttle_bar,
-/obj/effect/fun_balloon/sentience/emergency_shuttle{
-	group_name = "snack bar drone at Uncle Pete's Rollerdome"
-	},
-/turf/open/floor/wood,
-/area/shuttle/escape)
 "nw" = (
 /obj/structure/table,
 /obj/machinery/chem_dispenser/drinks{
@@ -464,7 +457,7 @@ dJ
 Cg
 Cg
 ce
-ns
+Ky
 Qv
 JR
 KJ

_maps/theseus.json

@@ -4,6 +4,9 @@
 	"map_path": "map_files/Theseus",
 	"map_file": "Theseus.dmm",
 	"webmap_id": "Theseus",
+	"evacuation_controllers": [
+		"/datum/evacuation_controller/emergency_shuttle"
+	],
 	"shuttles": {
 		"cargo": "cargo_box",
 		"ferry": "ferry_fancy",

code/__DEFINES/antagonists.dm

@@ -38,14 +38,6 @@
 #define DEATHSQUAD "ds"
 #define DEATHSQUAD_LEADER "ds_leader"
 
-//Shuttle elimination hijacking
-/// Does not stop elimination hijacking but itself won't elimination hijack
-#define ELIMINATION_NEUTRAL 0
-/// Needs to be present for shuttle to be elimination hijacked
-#define ELIMINATION_ENABLED 1
-/// Prevents elimination hijack same way as non-antags
-#define ELIMINATION_PREVENT 2
-
 //Syndicate Contracts
 #define CONTRACT_STATUS_INACTIVE 1
 #define CONTRACT_STATUS_ACTIVE 2
@@ -125,12 +117,6 @@
 /// JSON string file for all of our heretic influence flavors
 #define HERETIC_INFLUENCE_FILE "antagonist_flavor/heretic_influences.json"
 
-///employers who hire agents to do the hijack
-GLOBAL_LIST_INIT(hijack_employers, list(
-	"Legal Trouble",
-	"Gone Postal",
-))
-
 ///employers who hire agents to do a task and escape...
 GLOBAL_LIST_INIT(normal_employers, list(
 	"Legal Trouble",

code/__DEFINES/dcs/signals/signals_evacuation.dm

@@ -0,0 +1,8 @@
+///from emergency shuttle when arriving at station : ()
+#define COMSIG_EMERGENCYSHUTTLE_ARRIVAL "emergencyshuttle_arrival"
+///from emergency shuttle when making departing sound : ()
+#define COMSIG_EMERGENCYSHUTTLE_ANNOUNCE "emergencyshuttle_announce"
+///from emergency shuttle when departing from station : ()
+#define COMSIG_EMERGENCYSHUTTLE_DEPARTING "emergencyshuttle_departing"
+///from emergency shuttle when returning to CentCom : ()
+#define COMSIG_EMERGENCYSHUTTLE_RETURNED "emergencyshuttle_returned"