Merge remote-tracking branch 'upstream/master' into strips-out-media

_maps/map_files/RandomZLevels/spacebattle.dmm

@@ -190,8 +190,8 @@
 "dH" = (/obj/item/stack/rods,/turf/simulated/floor/plasteel,/area/awaymission/spacebattle/cruiser)
 "dI" = (/obj/mecha/medical/odysseus,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "dJ" = (/obj/mecha/working/ripley/firefighter,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"dK" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"dL" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/tool/drill,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
+"dK" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
+"dL" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/drill,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "dM" = (/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "dN" = (/obj/structure/reagent_dispensers/fueltank,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "dO" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
@@ -209,7 +209,7 @@
 "ea" = (/obj/machinery/gateway{dir = 9},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "eb" = (/obj/machinery/gateway{dir = 1},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ec" = (/obj/machinery/gateway{dir = 5},/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
-"ed" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/tool/syringe_gun,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
+"ed" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/syringe_gun,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ee" = (/obj/structure/closet/crate{name = "Gold Crate"},/obj/item/mecha_parts/mecha_equipment/repair_droid,/turf/simulated/floor/plating,/area/awaymission/spacebattle/cruiser)
 "ef" = (/mob/living/simple_animal/hostile/syndicate/melee,/turf/simulated/floor/plasteel{icon_state = "bar"},/area/awaymission/spacebattle/cruiser)
 "eg" = (/obj/structure/closet/l3closet/security,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 4},/area/awaymission/spacebattle/cruiser)

_maps/map_files/cyberiad/cyberiad.dmm

@@ -1363,9 +1363,9 @@
 "aAk" = (/obj/effect/spawner/window,/turf/simulated/floor/plating,/area/maintenance/fsmaint2)
 "aAl" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aAm" = (/obj/machinery/door/airlock/external{frequency = 1379; icon_state = "door_locked"; id_tag = "arrivals_outer"; locked = 1; name = "Engineering External Access"; req_access = null; req_access_txt = "10;13"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
-"aAn" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2)
-"aAo" = (/obj/machinery/atmospherics/unary/portables_connector{layer = 2},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2)
-"aAp" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2)
+"aAn" = (/turf/space,/turf/simulated/shuttle/wall{dir = 8; icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit)
+"aAo" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion (NORTH)"; icon_state = "propulsion"; dir = 1},/turf/space,/area/shuttle/syndicate_sit)
+"aAp" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_r (NORTH)"; icon_state = "propulsion_r"; dir = 1},/turf/space,/area/shuttle/syndicate_sit)
 "aAq" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aAr" = (/obj/machinery/door/airlock/engineering{icon_state = "door_closed"; locked = 0; name = "Fore Port Solar Access"; req_access_txt = "10"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"},/turf/simulated/floor/plating,/area/maintenance/auxsolarport)
 "aAs" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/maintenance/auxsolarport)
@@ -1422,7 +1422,7 @@
 "aBr" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "swall_f10"; dir = 2},/area/shuttle/pod_2)
 "aBs" = (/obj/structure/window/full/shuttle,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/pod_2)
 "aBt" = (/turf/simulated/shuttle/wall{icon_state = "swall3"; dir = 2},/area/shuttle/pod_1)
-"aBu" = (/obj/structure/stool,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/maintenance/fpmaint2)
+"aBu" = (/turf/space,/turf/simulated/shuttle/wall{dir = 1; icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit)
 "aBv" = (/obj/machinery/atmospherics/pipe/simple/visible/purple{dir = 5},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aBw" = (/obj/machinery/atmospherics/binary/valve{dir = 4},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
 "aBx" = (/obj/machinery/atmospherics/pipe/simple/visible/purple{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
@@ -5236,9 +5236,9 @@
 "bWJ" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/plasteel,/area/hallway/primary/aft)
 "bWK" = (/obj/machinery/door/airlock/glass{name = "Central Access"},/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft)
 "bWL" = (/obj/structure/closet/jcloset,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/obj/item/device/radio/intercom{broadcasting = 0; name = "station intercom (General)"; pixel_y = 25},/turf/simulated/floor/plasteel,/area/janitor)
-"bWM" = (/obj/structure/closet/l3closet/janitor,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1; initialize_directions = 11; level = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/turf/simulated/floor/plasteel,/area/janitor)
-"bWN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{level = 1},/obj/machinery/newscaster{pixel_y = 30},/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/turf/simulated/floor/plasteel,/area/janitor)
-"bWO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/vehicle/janicart,/turf/simulated/floor/plasteel,/area/janitor)
+"bWM" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 1; initialize_directions = 11; level = 1},/obj/machinery/alarm{frequency = 1439; pixel_y = 23},/obj/structure/closet/l3closet/janitor,/turf/simulated/floor/plasteel,/area/janitor)
+"bWN" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{level = 1},/obj/machinery/newscaster{pixel_y = 30},/obj/vehicle/janicart,/turf/simulated/floor/plasteel,/area/janitor)
+"bWO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/structure/table,/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/key/janitor,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/turf/simulated/floor/plasteel,/area/janitor)
 "bWP" = (/obj/structure/disposalpipe/segment,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel,/area/janitor)
 "bWQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/structure/reagent_dispensers/spacecleanertank{pixel_y = 30},/turf/simulated/floor/plasteel,/area/janitor)
 "bWR" = (/obj/machinery/door/window/westleft{name = "Janitoral Delivery"; req_access_txt = "26"},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel{icon_state = "delivery"},/area/janitor)
@@ -5325,12 +5325,12 @@
 "bYu" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel,/area/hallway/primary/aft)
 "bYv" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/door/firedoor,/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft)
 "bYw" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall,/area/janitor)
-"bYx" = (/obj/machinery/power/apc{dir = 8; name = "Custodial Closet APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plasteel,/area/janitor)
-"bYy" = (/obj/structure/stool,/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/effect/landmark/start{name = "Janitor"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/janitor)
+"bYx" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/effect/landmark/start{name = "Janitor"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 9},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/janitor)
+"bYy" = (/obj/machinery/power/apc{dir = 8; name = "Custodial Closet APC"; pixel_x = -24},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/janitor)
 "bYz" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel,/area/janitor)
 "bYA" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/hologram/holopad,/turf/simulated/floor/plasteel,/area/janitor)
 "bYB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/janitor)
-"bYC" = (/obj/item/weapon/mop,/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/obj/item/weapon/reagent_containers/glass/bucket,/turf/simulated/floor/plasteel,/area/janitor)
+"bYC" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plasteel,/area/janitor)
 "bYD" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bYE" = (/turf/simulated/floor/plasteel{dir = 4; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/medical/paramedic)
 "bYF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/stool/bed/amb_trolley,/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/paramedic)
@@ -5395,12 +5395,12 @@
 "bZM" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/disposalpipe/segment,/turf/simulated/floor/plasteel{dir = 8; icon_state = "cautioncorner"},/area/hallway/primary/aft)
 "bZN" = (/obj/machinery/atmospherics/unary/vent_pump{on = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft)
 "bZO" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/turf/simulated/floor/plasteel{dir = 2; icon_state = "yellowcorner"},/area/hallway/primary/aft)
-"bZP" = (/obj/structure/table,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/item/weapon/grenade/chem_grenade/cleaner,/obj/machinery/requests_console{department = "Janitorial"; name = "Janitor Requests Console"; departmentType = 1; pixel_y = -29},/obj/item/weapon/reagent_containers/spray/cleaner,/obj/item/key/janitor,/turf/simulated/floor/plasteel,/area/janitor)
-"bZQ" = (/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel,/area/janitor)
-"bZR" = (/obj/machinery/light,/obj/structure/janitorialcart,/turf/simulated/floor/plasteel,/area/janitor)
-"bZS" = (/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/storage/box/mousetraps,/obj/item/weapon/storage/box/mousetraps,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/plasteel,/area/janitor)
+"bZP" = (/obj/structure/rack{dir = 1},/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/storage/box/lights/mixed,/obj/item/weapon/restraints/legcuffs/beartrap,/obj/item/weapon/restraints/legcuffs/beartrap,/turf/simulated/floor/plasteel,/area/janitor)
+"bZQ" = (/obj/machinery/requests_console{department = "Janitorial"; name = "Janitor Requests Console"; departmentType = 1; pixel_y = -29},/obj/machinery/disposal,/obj/structure/disposalpipe/trunk{dir = 1},/turf/simulated/floor/plasteel,/area/janitor)
+"bZR" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/structure/janitorialcart,/turf/simulated/floor/plasteel,/area/janitor)
+"bZS" = (/obj/machinery/light,/obj/structure/rack{dir = 1},/obj/item/weapon/reagent_containers/glass/bucket,/obj/item/weapon/mop,/turf/simulated/floor/plasteel,/area/janitor)
 "bZT" = (/turf/simulated/floor/plasteel,/area/janitor)
-"bZU" = (/obj/structure/reagent_dispensers/watertank,/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light_switch{pixel_y = -23},/turf/simulated/floor/plasteel,/area/janitor)
+"bZU" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/obj/machinery/light_switch{pixel_y = -23},/obj/structure/reagent_dispensers/watertank,/turf/simulated/floor/plasteel,/area/janitor)
 "bZV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/wall,/area/janitor)
 "bZW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "bZX" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint)
@@ -6374,6 +6374,9 @@
 "csE" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 9; pixel_y = 0},/turf/simulated/wall,/area/medical/surgery)
 "csF" = (/obj/machinery/door/firedoor{dir = 1; name = "Firelock North"},/obj/machinery/door/airlock/glass_engineering{name = "Engineering"; req_access_txt = "0"; req_one_access_txt = "11;24"},/obj/machinery/atmospherics/pipe/simple/hidden/yellow{tag = "icon-intact (NORTHWEST)"; icon_state = "intact"; dir = 9},/turf/simulated/floor/plasteel,/area/engine/controlroom)
 "csG" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall,/area/maintenance/asmaint2)
+"csH" = (/obj/structure/shuttle/engine/propulsion{tag = "icon-propulsion_l (NORTH)"; icon_state = "propulsion_l"; dir = 1},/turf/space,/area/shuttle/syndicate_sit)
+"csI" = (/turf/simulated/shuttle/wall{dir = 4; icon_state = "wall3"},/area/shuttle/syndicate_sit)
+"csJ" = (/obj/structure/window/reinforced,/obj/structure/shuttle/engine/heater{tag = "icon-heater (NORTH)"; icon_state = "heater"; dir = 1},/turf/simulated/floor/plating/airless,/area/shuttle/syndicate_sit)
 "csK" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{level = 1},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/atmos/control)
 "csL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/wall/r_wall,/area/atmos/control)
 "csM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/wall/r_wall,/area/atmos/control)
@@ -6430,8 +6433,10 @@
 "ctL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel,/area/hallway/primary/aft)
 "ctM" = (/obj/structure/disposalpipe/segment{dir = 4},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor/plasteel,/area/hallway/primary/aft)
 "ctN" = (/obj/machinery/atmospherics/unary/portables_connector{dir = 4},/obj/machinery/portable_atmospherics/scrubber,/obj/machinery/camera{c_tag = "Aft Primary Hallway 2"; dir = 8; network = list("SS13"); pixel_x = 0; pixel_y = -22},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plasteel{dir = 8; icon_state = "escape"},/area/hallway/primary/aft)
+"ctO" = (/obj/effect/decal/remains/human,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "ctP" = (/obj/structure/disposalpipe/segment{dir = 2; icon_state = "pipe-c"},/turf/simulated/floor/plasteel,/area/engine/break_room)
 "ctQ" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/recharge_station,/turf/simulated/floor/plasteel,/area/engine/break_room)
+"ctR" = (/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "ctS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/newscaster{pixel_y = 32},/obj/machinery/computer/station_alert,/turf/simulated/floor/plasteel,/area/engine/break_room)
 "ctT" = (/obj/machinery/computer/arcade,/turf/simulated/floor/plasteel,/area/engine/break_room)
 "ctV" = (/obj/machinery/light{dir = 4; icon_state = "tube1"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{level = 1},/obj/structure/table,/turf/simulated/floor/plasteel,/area/engine/break_room)
@@ -6623,6 +6628,9 @@
 "cxz" = (/obj/machinery/atmospherics/unary/portables_connector,/turf/simulated/floor/plasteel,/area/atmos/control)
 "cxA" = (/obj/machinery/atmospherics/unary/portables_connector,/obj/machinery/door_control{id = "atmos"; name = "Atmospherics Lockdown"; pixel_x = 24; pixel_y = 8; req_access_txt = "24"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel,/area/atmos/control)
 "cxB" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Biohazard_medi"; name = "Quarantine Lockdown"; opacity = 0},/obj/machinery/door/airlock/maintenance{name = "Surgery Maintenance"; req_access_txt = "45"},/turf/simulated/floor/plating,/area/maintenance/asmaint)
+"cxC" = (/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
+"cxD" = (/obj/structure/stool/bed/chair{dir = 4},/obj/machinery/light/spot{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/structure/window/reinforced,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
+"cxE" = (/obj/machinery/door/window/brigdoor{dir = 2; name = "Cell Door"; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cxF" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "Biohazard_medi"; name = "Quarantine Lockdown"; opacity = 0},/obj/machinery/door/airlock/maintenance{name = "Surgery Maintenance"; req_access_txt = "45"},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "cxG" = (/obj/machinery/access_button{command = "cycle_exterior"; frequency = 1379; master_tag = "xeno_airlock_control"; name = "Xenobiology Access Button"; pixel_x = -24; pixel_y = 0; req_access_txt = "55"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/door/firedoor{dir = 4; name = "Firelock East"},/obj/machinery/door/airlock/research{autoclose = 0; frequency = 1379; icon_state = "door_locked"; id_tag = "xeno_airlock_exterior"; locked = 1; name = "Xenobiology External Airlock"; req_access_txt = "55"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/toxins/xenobiology)
 "cxH" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -6690,6 +6698,7 @@
 "cyR" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/glass_medical{id_tag = null; name = "Monkey Pen"; req_access_txt = "39"},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology)
 "cyS" = (/obj/effect/spawner/window/reinforced,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/plating,/area/medical/virology)
 "cyT" = (/obj/effect/spawner/window/reinforced,/turf/simulated/floor/plating,/area/medical/virology)
+"cyU" = (/obj/structure/table,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cyV" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology)
 "cyW" = (/obj/machinery/camera{c_tag = "Medbay IV Room"; dir = 1; network = list("SS13"); pixel_x = 0},/turf/simulated/floor/plasteel{dir = 3; icon_state = "whitered"},/area/medical/medbay2)
 "cyX" = (/obj/machinery/door/firedoor,/obj/machinery/door/airlock/medical{name = "Break Room"; req_access_txt = "39"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/virology)
@@ -7293,6 +7302,7 @@
 "cKx" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/plating,/area/engine/chiefs_office)
 "cKy" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall/r_wall,/area/engine/chiefs_office)
 "cKz" = (/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/wall,/area/engine/engineering)
+"cKA" = (/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cKB" = (/obj/structure/disposalpipe/segment{dir = 8; icon_state = "pipe-c"},/turf/simulated/wall/r_wall,/area/engine/engineering)
 "cKC" = (/obj/effect/spawner/window/reinforced,/obj/structure/cable,/turf/simulated/floor/plating,/area/engine/engineering)
 "cKD" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; name = "HIGH VOLTAGE"},/turf/simulated/wall/r_wall,/area/engine/engineering)
@@ -7334,6 +7344,7 @@
 "cLn" = (/obj/effect/spawner/window/reinforced,/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/obj/structure/cable,/turf/simulated/floor/plating,/area/toxins/xenobiology)
 "cLo" = (/obj/structure/sign/fire,/turf/simulated/wall/r_wall/coated,/area/maintenance/turbine)
 "cLp" = (/obj/machinery/door/window/southright{name = "Containment Pen"; req_access_txt = "55"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "xenobio6"; name = "Containment Blast Doors"; opacity = 0},/turf/simulated/floor/engine,/area/toxins/xenobiology)
+"cLq" = (/obj/structure/stool/bed/chair{dir = 8},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cLr" = (/obj/structure/cable,/obj/machinery/power/solar{id = "starboardsolar"; name = "Starboard Solar Array"},/turf/simulated/floor/plasteel/airless{icon_state = "solarpanel"},/area/solar/starboard)
 "cLs" = (/turf/simulated/floor/plating,/area/maintenance/engi_shuttle)
 "cLt" = (/obj/effect/decal/cleanable/dirt,/obj/item/device/radio/intercom{dir = 1; name = "station intercom (General)"; pixel_y = -28},/turf/simulated/floor/plating,/area/maintenance/engi_shuttle)
@@ -7513,6 +7524,7 @@
 "cOL" = (/obj/structure/lattice,/obj/machinery/atmospherics/pipe/simple/visible/green{dir = 4; level = 2},/obj/machinery/atmospherics/pipe/simple/heat_exchanging,/turf/space,/area/space)
 "cOM" = (/obj/machinery/atmospherics/unary/outlet_injector{dir = 8; frequency = 1441; icon_state = "on"; id = "tox_in"; on = 1; pixel_y = 1},/turf/simulated/floor/engine{carbon_dioxide = 0; name = "plasma floor"; nitrogen = 0; oxygen = 0; toxins = 70000},/area/atmos)
 "cON" = (/obj/structure/sign/biohazard{pixel_y = 32},/turf/space,/area/space)
+"cOO" = (/obj/machinery/light/spot{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/structure/stool/bed/chair{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cOP" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "cOQ" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance,/obj/effect/decal/cleanable/cobweb,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "cOR" = (/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5; level = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
@@ -7779,6 +7791,7 @@
 "cTS" = (/turf/simulated/floor/plating/airless/catwalk{tag = "icon-catwalk12"; icon_state = "catwalk12"},/area/space)
 "cTT" = (/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{dir = 1; icon_state = "blue"},/area/engine/engineering)
 "cTU" = (/turf/simulated/floor/plasteel{icon_state = "dark"},/obj/machinery/status_display{density = 0; layer = 4; pixel_x = 0; pixel_y = 32},/obj/structure/transit_tube{icon_state = "Block"},/turf/simulated/floor/plasteel{tag = "icon-siding8 (NORTH)"; icon_state = "siding8"; dir = 1},/area/engine/engineering)
+"cTV" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{density = 0; icon_state = "pdoor0"; id_tag = "syndicate_sit_1"; name = "Side Hull Door"; opacity = 0; req_access_txt = "150"},/obj/docking_port/mobile{dir = 8; dwidth = 3; height = 5; id = "sit"; name = "SIT shuttle"; roundstart_move = "sit_away"; width = 11},/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_arrivals"; name = "Cyberiad Arrivals"; width = 11},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "cTW" = (/obj/structure/closet/syndicate/personal,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate)
 "cTX" = (/obj/structure/grille,/obj/structure/cable{d1 = 1; d2 = 4; icon_state = "1-4"; tag = ""},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plating/airless,/area/engine/engineering)
 "cTY" = (/obj/machinery/power/emitter{anchored = 1; dir = 4; state = 2},/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/machinery/camera/emp_proof{c_tag = "Engineering Singularity West"; dir = 4; network = list("Singularity","SS13")},/turf/simulated/floor/plating/airless,/area/engine/engineering)
@@ -8150,6 +8163,7 @@
 "dba" = (/obj/machinery/portable_atmospherics/canister/air,/obj/machinery/atmospherics/unary/portables_connector{dir = 8},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "dbb" = (/obj/machinery/access_button{command = "cycle_interior"; frequency = 1450; master_tag = "sci_maint"; name = "interior access button"; pixel_x = -28; pixel_y = -5; req_access_txt = "13"},/obj/effect/decal/warning_stripes/west,/obj/machinery/atmospherics/pipe/simple/hidden{dir = 6},/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "dbc" = (/obj/structure/disposalpipe/trunk{dir = 1},/obj/structure/disposaloutlet,/turf/simulated/floor/plating/airless,/area/space)
+"dbd" = (/obj/structure/table,/obj/item/stack/sheet/metal,/obj/item/clothing/glasses/welding,/obj/item/weapon/weldingtool,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "dbe" = (/obj/machinery/door/poddoor{id_tag = "turbinevent"; name = "Turbine Vent"},/turf/simulated/floor/engine{name = "vacuum floor"; nitrogen = 0.01; oxygen = 0.01},/area/maintenance/turbine)
 "dbf" = (/obj/machinery/door/airlock/external{frequency = 1450; icon_state = "door_locked"; id_tag = "sci_inner"; locked = 1; name = "External Access"; req_access = null; req_access_txt = "13"},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
 "dbg" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'EXTERNAL AIRLOCK'"; icon_state = "space"; layer = 4; name = "EXTERNAL AIRLOCK"; pixel_x = -32},/obj/machinery/light/small{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden,/turf/simulated/floor/plating,/area/maintenance/asmaint2)
@@ -8186,6 +8200,7 @@
 "dbL" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/machinery/vending/medical,/turf/simulated/floor/plasteel{dir = 4; icon_state = "blue"},/area/medical/patients_rooms)
 "dbM" = (/obj/machinery/atmospherics/unary/vent_scrubber{dir = 4; on = 1},/turf/simulated/floor/plasteel,/area/medical/patients_rooms)
 "dbN" = (/obj/item/weapon/shard,/obj/effect/decal/cleanable/blood,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/turf/simulated/floor/plating,/area/maintenance/asmaint)
+"dbO" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/shuttle/syndicate_sit)
 "dbP" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{dir = 4; initialize_directions = 11; level = 1},/turf/simulated/floor/plating,/area/maintenance/asmaint)
 "dbQ" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/turf/simulated/floor/plasteel{icon_state = "white"},/area/medical/patient_c)
 "dbR" = (/obj/machinery/vending/wallmed1{name = "Emergency NanoMed"; pixel_x = -25; pixel_y = 0; req_access_txt = "0"},/obj/machinery/atmospherics/unary/vent_pump{dir = 4; external_pressure_bound = 101; on = 1; pressure_checks = 1},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitered"},/area/medical/patient_c)
@@ -8819,6 +8834,7 @@
 "dnV" = (/obj/structure/cable,/obj/machinery/power/apc{dir = 4; name = "Alternate Construction Area APC"; pixel_x = 25},/turf/simulated/floor/plating,/area/maintenance/consarea)
 "dnW" = (/obj/structure/sign/securearea{desc = "A warning sign which reads 'KEEP CLEAR OF DOCKING AREA'."; name = "KEEP CLEAR: DOCKING AREA"; pixel_y = 0},/turf/simulated/wall/r_wall,/area/engine/mechanic_workshop)
 "dnX" = (/obj/machinery/door/airlock/maintenance{name = "Mechanic Workshop Maintenance"; req_access = null; req_access_txt = "70"},/turf/simulated/floor/plating,/area/maintenance/aft)
+"dnY" = (/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Blast Doors"; pixel_x = 3; pixel_y = -28; range = 20; req_access_txt = "150"},/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "dnZ" = (/obj/machinery/light{dir = 1; on = 1},/turf/simulated/floor/engine,/area/engine/mechanic_workshop)
 "doa" = (/obj/effect/decal/cleanable/blood/oil,/turf/simulated/floor/plating,/area/maintenance/apmaint)
 "dob" = (/obj/structure/spacepoddoor,/obj/machinery/door/poddoor/multi_tile/three_tile_ver{id_tag = "mechpodbayouter"; layer = 3.1; req_access_txt = "70"},/turf/simulated/floor/engine,/area/engine/mechanic_workshop)
@@ -8856,6 +8872,7 @@
 "doH" = (/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/vending/security,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/seceqstorage)
 "doI" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/sortjunction{dir = 1; icon_state = "pipe-j2s"; sortType = 7},/obj/structure/table,/obj/item/weapon/storage/fancy/donut_box,/turf/simulated/floor/plasteel{icon_state = "red"},/area/security/main)
 "doJ" = (/turf/simulated/wall,/area/crew_quarters/courtroom)
+"doK" = (/obj/machinery/computer/shuttle/sit,/turf/simulated/shuttle/floor{icon_state = "floor4"},/area/shuttle/syndicate_sit)
 "doL" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall,/area/crew_quarters/courtroom)
 "doM" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/structure/disposalpipe/segment{dir = 1; icon_state = "pipe-c"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "doN" = (/obj/machinery/light_switch{pixel_y = -25},/obj/structure/closet/wardrobe/red,/turf/simulated/floor/plasteel{icon_state = "red"; dir = 6},/area/security/main)
@@ -8914,6 +8931,7 @@
 "dpO" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/turf/simulated/wall/r_wall,/area/security/permabrig)
 "dpP" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/machinery/flasher{id = "permaflash1"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/permabrig)
 "dpQ" = (/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{level = 1},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/permabrig)
+"dpR" = (/turf/space,/turf/simulated/shuttle/wall{icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit)
 "dpS" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4; level = 1},/obj/machinery/flasher{id = "permaflash2"; pixel_x = 28; pixel_y = 0},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/permabrig)
 "dpT" = (/obj/machinery/flasher{id = "permaflash3"; pixel_x = 28; pixel_y = 0},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/permabrig)
 "dpU" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/obj/machinery/light{icon_state = "tube1"; dir = 4},/obj/machinery/power/apc{dir = 4; name = "Prison Cell Block A APC"; pixel_x = 26; pixel_y = 0},/obj/structure/cable,/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison/cell_block/A)
@@ -8982,6 +9000,15 @@
 "drf" = (/obj/item/device/radio/intercom{pixel_x = 28},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; tag = ""},/turf/simulated/floor/plasteel{icon_state = "floorgrime"},/area/security/prison/cell_block/A)
 "drg" = (/obj/structure/closet{name = "Evidence Closet"},/obj/structure/cable,/obj/machinery/power/apc{dir = 4; cell_type = 15000; name = "east bump"; pixel_x = 24},/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/evidence)
 "drh" = (/obj/structure/table,/obj/item/weapon/storage/box/evidence,/obj/machinery/camera{c_tag = "Brig Evidence Storage"; dir = 1; network = list("SS13")},/obj/item/weapon/hand_labeler,/obj/machinery/atmospherics/unary/vent_scrubber{dir = 1; on = 1; scrub_N2O = 1; scrub_Toxins = 1},/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_x = 0; pixel_y = -22},/obj/item/weapon/pen,/turf/simulated/floor/plasteel{icon_state = "dark"},/area/security/evidence)
+"dri" = (/obj/machinery/door/airlock/external{id_tag = "s_docking_airlock"; name = "Shuttle Airlock"; req_access_txt = "150"},/obj/machinery/door/poddoor{icon_state = "pdoor1"; id_tag = "syndicate_sit_1"; name = "Front Hull Door"; opacity = 1},/turf/simulated/shuttle/plating,/area/shuttle/syndicate_sit)
+"drj" = (/turf/space,/turf/simulated/shuttle/wall{dir = 4; icon_state = "diagonalWall3"},/area/shuttle/syndicate_sit)
+"drk" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
+"drl" = (/obj/structure/table,/obj/effect/spawner/lootdrop/maintenance{lootcount = 2; name = "2maintenance loot spawner"},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
+"drm" = (/obj/machinery/atmospherics/unary/portables_connector{layer = 2},/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
+"drn" = (/obj/structure/stool,/turf/simulated/floor/plating,/area/maintenance/fpmaint2)
+"dro" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_scimaint"; name = "Cyberiad Science Maint"; width = 11},/turf/space,/area/space)
+"drp" = (/obj/structure/lattice,/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_engshuttle"; name = "Cyberiad Eng Shuttle"; width = 11},/turf/space,/area/space)
+"drq" = (/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/wall/r_wall,/area/maintenance/asmaint2)
 
 (1,1,1) = {"
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -9066,21 +9093,21 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGaabamLamLamLamLamLbikamMbikamLamLamLamLamLaabacGbikbikbikamOamNamQamPamOamRamSamSamTamUamVamWalnakVamZanaanbancajuajuandaneajuajualmajualAalAaufalAauLalDajGajBajCanjajEajFajGdoOatgdoPaiRaiRaiRahUahUannalLdoSalOahUahAalPahAanrantansansanubikbikbikbikbikaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmbikbikbikajkajPajmbikbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGbikbikbikaabbikbikbikanvbikbikbikaabbikbikbikaabbikbikbikaoranwanzanyanBanAanDanCanAanGanGanHanIanJanKanLanManNanOanPanQanRanSanTaoiaokalRaqjaoMaojaPcauwaswamoamxamwamBamAamEamCamGamFaokaojaokaolaomamHamJamIanfaEEaovapmaotaovaEHaouaoyaoxbikbikbikbikbikaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmbikbikbikajkajPajmbikbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGaabalpalpalpalpalpbikamMbikalpalpalpalpalpaabacGbikbikbikamOanEaoAanFamOamRamSamSamSauQasYamrankauSaoLaoLanoanmaoPaoQaoRaoSaoTaoUaoVaoWaoXaoYaoWaoZapaaoTavRapcawqanpaoTapdanUaoTapdapbaqEapearZaoVapfapgaphapianVapkaplapmapnaovaozansansapobikaacapqaacbikaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmbikaabaabajkajPajmaabaabagQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikapsdmMdmLdmOdmNbikbikbikbikbikbikajjbikalSalTalTalTalTalUalValWalXalXalXalXalYbikacGbikbikbikamOaoCaoCaoDamObikbikbikapwanganianhanWawDanianiapBapBapBapBapCapDapEapEapEapFapGapHapFapEapEapEaoeaodaodanXanZanYaopaooahEasaaobaoaasaahEapRapSapTapUapVapWapXapmapnapYapYamKapZapZapZamKaqaamKaabaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmaabaabbikaabaiIaabbikbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmQdmQdmQdmPbikbikbikbikbikbikacGaqbamLamLamLamLamLbikamMbikamLamLamLamLamLaabacGbikbikbikaoraoEaoCaoFamOamRamSamSamSaxyaniasWaohaogaoqaonapBaqnaqoaqpapjaqraqsaqtaquaqvapxapvaqyaqzaqAaqsapzapyapyaosaoHaoBapMapLahEauHaoKaoJavaahEaqMaqNaqOaqhaqQaqiapXapmaqSaqTaqUaqVaqWaqWaqXamKaqYamKaabaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmbikbikbikaabaloaabbikbikaqZbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmRdmRdmRdmPbikbikbikbikbikbikacGbikbikbikaabbikbikbikanvbikbikbikaabbikbikbikacGbikbikbikamOaoGaoCaoCaptanAapuanCanAaxtaniayYapAaoOapJapIapBarkarlarmarnaqCarparqarrarsartaruarvarrarwarxaqDapyapyaosapNapKaqHaqGapPapOaqgapQawFahEaszasAarMarNarMarOapXapmaovaovaovaovarPaovarQarRarSamKakBarTakEbikbikaiIaabaabaabaabaiIaabaabaabaabaiIaabaabaabaabarUarVakEaabbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmTdmSdmUdmPbikbikbikbikbikbikacGaabalpalpalpalpalpbikamMbikalpalpalpalpalpaabacGbikbikbikamOaqcaqcaqcamOamRamSazdazdazfaqlaqkaqqaqmaqxaqwapBascasdasearzasgashasiasjaskarAasmasnasoaspasharBapyapyaosaqBaooarFarEaqFaykaqJaqIaqKahEatnatoatparNarMasBapXasCasDasEasFasEasGasHamKamKapnamKaloasIasJakCakCarTakCakCakCakCarTakCakCakCakCarTakCakCakCasKasLasIaloaabbikagQaabbikbikbikbikbikbikbikbikbikbikaabbikaabbikasMasMasNasNasNasNasNasNasMasMaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmVdmSdmUdmPbikbikbikbikbikbikacGbikalSalTalTalTalTalUalValWalXalXalXalXalYbikacGbikbikbikaqeaqdaqdaqdaqfbikbikaqLaqPaqPaqPaqRaqRaqRaqRarhapBapBatRapBdpfdoYapEapEatSapEasbdpUapEatSapEasZaslasfapyariaroarjaAEasuahEaryarDarCarHarGauiaueaukatqarMatrapXatsattatuatvatwatxatyatzatAatBamKatCarTatDaabaabbikaabbikbikbikbikbikbikbikbikaabaabaabaabaabatEatFatDaabaabaabaabaabbikbikbikbikbikbikbikbikbikaabbikaabasMasMatGatHatIatJatKatLatMatIasMasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmVdmSdmUdmPbikbikbikbikbikbikaabatNamLamLamLamLamLbikamMbikamLamLamLamLamLaabacGbikbikbikbikbikbikbikbikbikbikarIaqPaqPaqParJaqRarKarXarLapBatPatUatTatbatVaqsatQauJauEatdatcavEavBatWaqsatfaATapyapyapyathaSWatiahEarYaryasqasrahEatXatOarMarNarMaulapXatsarPattattattaumaovaunauoaupamKbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabbikaabaabaabaabauqaabaabbikbikaabaabaabbikbikbikbikbikbikbikbikasMasMasMasMauratJausatJausautatJatJatJauuasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmSdmSdmSdmWbikbikbikbikbikbikacGbikbikaabbikaabbikbikauvbikbikaabbikaabbikbikacGbikbikbikbikbikbikaahbikbikbikarIassaqPaqPastaqRaqRasxaxjapBarkavJauzaucauBaudauDdlLauFauGdpVauIdlMauKaujaugauNauNauNauNauNcwXauhahEasyasqaryasTasSasXasVasSauMauXauPapXatsavbavcavcavcavdaveavfavgavhamKbikbikbikbikbikaahbikbikbikbikbikbikbikaabaabbikbikbikaabaabaabaviaabaabbikbikaabbikaabaabbikbikbikbikbikbikbikasMavjavkavlavmavnavoavpatJatJavqavratJavsasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmXdmSdmSdmYbikbikbikbikbikbikacGacGacGaabaabaabaabavtavuavtaabaabaabaabacGacGacGbikbikbikbikbikbikbikbikbikbikaqLatjataatlatkcqIatmatZatYapBdlPdlQavyauZasgashdlRdlSashavvdrfashdlTdlUashavxavwavAavzapyavHapyavCahEauaauxaubasqdoTauCauAaSqavMavOavOavQavPavTavUavUavUavVavWavXavYavYavYbikbikbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikaabaabavZawaavZaabaabbikaabbikbikaabaabbikbikbikbikbikbikasMawbawcawdaweawfawgatJatJatJawhawiatJawjasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmZdmSdnadmPbikaahbikbikbikbikaabbikaabbikbikaabbikavtawkawlbikbikaabbikbikaabbikbikbikbikbikbikbikbikbikbikauOauOazIazIazIavSdoJdoGdoLauRasUasUasUawoawvawuawrawrawsawrawyawwawrawtasZasZaUcawzawAawBawCawBawCawAahEahEahEahEahEasSauUauTauVaxbaxeaxdawEaxfavUawGawHawIavVawJawKawLawMavWbikbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikaabbikavZawNavZbikaabbikaabbikbikbikaabaabbikbikbikbikbikasMawOawPavlawQawRawSawTatJawUawVawWawXasMawYaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdnbdnddncdnddnebikbikbikbikbikbikaabbikaabbikbikaabavtavtawZaxaavtbikaabbikbikaabbikbikbikbikbikbikbikbikbikbikauOauWavDauYavGavFavIaxvdoQaxxdoZaxhaxhaxzaxlaxlaxlaxlaxlaxmaxnaxoaxlaxlaxlaxlaxpdoUaxlaxlaxqdoVaxqaxraxraxAaxraxBaxuadQavLavKavNaxXaxCaxDaxEapmavUaxGaxHaxIavVaxKaxLaxJaAZavWbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikaabavZavZaxMavZavZaabbikaabbikbikbikbikaabaabbikbikbikbikasMaxNaxOavlasMavlavlaxPaxQasMasMasMasMasMasMaabaabbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdnbdnfdnebikbikbikbikbikbikaabaabbikaabbikbikaabaxRaxSaxTaxUaxRaxVaxVbikbikaabbikbikbikbikbikbikbikbikbikbikdoFdoWaxqawnayjawpayjaygayiayhayoayjayjaypayjayjayjayjayjayqayjayjayjayjayjayjayPayuayjayjayjayQayjayRaxqaylaxqaymaynadQdrhdrgadQayraysaytaxEayUavUayvaywayxayyayzayAayBawMavWbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikaabayCayDayEayFayCaabbikaabbikbikaabbikbikaabaabbikbikayGasMavlasMavlayHayIayHayJayHayHayHayKayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaxVaxVaxVaxVaxVaabaabaxRazsayMayNaxRayOaxVbikbikaabbikbikbikbikbikbikbikbikbikbikdoFdplaxgaxcaxkaxiaxsazgdpabOIayXayXayZdlNazbazcayXayXayXdpbayXayXayXayXayXayXazedpcazgazgazgazhaziazjaziazkazlazmaznadQadQadQadQazoazoazoaxEapmavUazpaxHazqavVcscazraxJcvYavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikbikaabayCaFCaztazuayCaabbikaabbikbikaabbikbikayGazvayGazvayGayKayHayHayHayHayHayHayHayHayHazwazxayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikazyazzazybikbikbikaxVaxVaxVaxVazAazBazCaxVbikbikaxRazDazEazFazGazHaxVbikbikaabbikbikbikbikbikbikbikbikbikbikauOauOauOdpdawmdlVayaayaaVMazJazKazKazLazMazNazOazPazPazOazQazOazRazRazRazRazRazRazSazRazRazTazUazVazWazIazXazIazYazIazIaqVazZaovaovaovaovaAaapmavUaAbaxHaAcavVaAdayAayBawMavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikazyaAeazybikaabayCaAfaAgaAhayCaAiaAiaAiaAiaAiazvazvazvayGaAjayHazwazxayJayHayJayJayJayGaAkayGayGayGayGayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikaAlaAmaAlbikbikaabaxVaAnaAoaApazHaAqazHaxVaAlaAlaxRaxRaAraAsazGazHaxVaxVaAlaAlaAlaxVaxVbikaabbikbikbikbikbikbikbikbikdpdaxFaxwaxYaxWaxZazJaAtaAuaAvazMaAwazOaAxaAyaAzaAAaABaACaADbfTaAFaAGaAHaAIaAJaAKaALaxqaxraAMaANaAOaAPaAQaAPaAPaAPaARaAPaAPaAPaAPaASdoMaAUaAVaAWaAXaAYcNsaBaaUadcuavWaabaBbaBcaBcaBcaBcaBcaBdaabaabbikbikbikbikazvaBeazvbikaAiayCayCaBfaBgayCaBhayHayHayHayJaBiayHaBjayGayHayHayHaBkayJayHayGaBlaBmayGayHaBnayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikappaBpaBobikaBqaBsaBraabaabaAlazHaAlbikbikaabaxVaBuaBvaBwaBxaByaBzaxVaBAazHaBBaBCaBDaBEaBEaBEaBEaBEaBEaBEaBEaBFaxVbikaBGbikbikbikbikbikbikbikbikdpdaycaybayfayeaySdoRaBIaBJaBKazMaAwazOaBLafvaBNaAAaABaBOaBPaBPaBPaBPaBPaAIbjlaAKaxlaxqaxrazIaBQaBRaBSaBTaBSaBSaBUaBVaBWaBWaBWaBWaBWaBWaBXaBYaBZaCaaCbaCcaCdaCeavWavWaCfaCgaChaChaChaChaChaCgaCfaabbikbikbikbikazvaCiaCjbikaAiaCkaClaCmaCnayHayHayHayJayHayJaCoayHayHayGayHaCpaCqaCoaAkayHayGaCraCsayGayHaCtayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikapsdmMdmLdmOdmNbikaAnaApaAocsHaBuajjbikalSalTalTalTalTalUalValWalXalXalXalXalYbikacGbikbikbikamOaoCaoCaoDamObikbikbikapwanganianhanWawDanianiapBapBapBapBapCapDapEapEapEapFapGapHapFapEapEapEaoeaodaodanXanZanYaopaooahEasaaobaoaasaahEapRapSapTapUapVapWapXapmapnapYapYamKapZapZapZamKaqaamKaabaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmaabaabbikaabaiIaabbikbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmQdmQdmQdmPbikcsIcsJcsJcsJcsIacGaqbamLamLamLamLamLbikamMbikamLamLamLamLamLaabacGbikbikbikaoraoEaoCaoFamOamRamSamSamSaxyaniasWaohaogaoqaonapBaqnaqoaqpapjaqraqsaqtaquaqvapxapvaqyaqzaqAaqsapzapyapyaosaoHaoBapMapLahEauHaoKaoJavaahEaqMaqNaqOaqhaqQaqiapXapmaqSaqTaqUaqVaqWaqWaqXamKaqYamKaabaloaabbikajkajPajmbikbikajkajPajmbikbikajkajPajmbikbikbikaabaloaabbikbikaqZbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmRdmRdmRdmPbikcsIctRctOctRcsIacGbikbikbikaabbikbikbikanvbikbikbikaabbikbikbikacGbikbikbikamOaoGaoCaoCaptanAapuanCanAaxtaniayYapAaoOapJapIapBarkarlarmarnaqCarparqarrarsartaruarvarrarwarxaqDapyapyaosapNapKaqHaqGapPapOaqgapQawFahEaszasAarMarNarMarOapXapmaovaovaovaovarPaovarQarRarSamKakBarTakEbikbikaiIaabaabaabaabaiIaabaabaabaabaiIaabaabaabaabarUarVakEaabbikagQbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmTdmSdmUdmPbikcsIcxDcxCcxEcsIacGaabalpalpalpalpalpbikamMbikalpalpalpalpalpaabacGbikbikbikamOaqcaqcaqcamOamRamSazdazdazfaqlaqkaqqaqmaqxaqwapBascasdasearzasgashasiasjaskarAasmasnasoaspasharBapyapyaosaqBaooarFarEaqFaykaqJaqIaqKahEatnatoatparNarMasBapXasCasDasEasFasEasGasHamKamKapnamKaloasIasJakCakCarTakCakCakCakCarTakCakCakCakCarTakCakCakCasKasLasIaloaabbikagQaabbikbikbikbikbikbikbikbikbikbikaabbikaabbikasMasMasNasNasNasNasNasNasMasMaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmVdmSdmUdmPbikcsIcyUctRctRcsIacGbikalSalTalTalTalTalUalValWalXalXalXalXalYbikacGbikbikbikaqeaqdaqdaqdaqfbikbikaqLaqPaqPaqPaqRaqRaqRaqRarhapBapBatRapBdpfdoYapEapEatSapEasbdpUapEatSapEasZaslasfapyariaroarjaAEasuahEaryarDarCarHarGauiaueaukatqarMatrapXatsattatuatvatwatxatyatzatAatBamKatCarTatDaabaabbikaabbikbikbikbikbikbikbikbikaabaabaabaabaabatEatFatDaabaabaabaabaabbikbikbikbikbikbikbikbikbikaabbikaabasMasMatGatHatIatJatKatLatMatIasMasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmVdmSdmUdmPbikcsIcKActRcLqcsIaabatNamLamLamLamLamLbikamMbikamLamLamLamLamLaabacGbikbikbikbikbikbikbikbikbikbikarIaqPaqPaqParJaqRarKarXarLapBatPatUatTatbatVaqsatQauJauEatdatcavEavBatWaqsatfaATapyapyapyathaSWatiahEarYaryasqasrahEatXatOarMarNarMaulapXatsarPattattattaumaovaunauoaupamKbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabbikaabaabaabaabauqaabaabbikbikaabaabaabbikbikbikbikbikbikbikbikasMasMasMasMauratJausatJausautatJatJatJauuasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmSdmSdmSdmWbikcsIcKActRcLqcsIacGbikbikaabbikaabbikbikauvbikbikaabbikaabbikbikacGbikbikbikbikbikbikaahbikbikbikarIassaqPaqPastaqRaqRasxaxjapBarkavJauzaucauBaudauDdlLauFauGdpVauIdlMauKaujaugauNauNauNauNauNcwXauhahEasyasqaryasTasSasXasVasSauMauXauPapXatsavbavcavcavcavdaveavfavgavhamKbikbikbikbikbikaahbikbikbikbikbikbikbikaabaabbikbikbikaabaabaabaviaabaabbikbikaabbikaabaabbikbikbikbikbikbikbikasMavjavkavlavmavnavoavpatJatJavqavratJavsasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmXdmSdmSdmYbikcsIcOOctRctRcTVacGacGacGaabaabaabaabavtavuavtaabaabaabaabacGacGacGbikbikbikbikbikbikbikbikbikbikaqLatjataatlatkcqIatmatZatYapBdlPdlQavyauZasgashdlRdlSashavvdrfashdlTdlUashavxavwavAavzapyavHapyavCahEauaauxaubasqdoTauCauAaSqavMavOavOavQavPavTavUavUavUavVavWavXavYavYavYbikbikbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikaabaabavZawaavZaabaabbikaabbikbikaabaabbikbikbikbikbikbikasMawbawcawdaweawfawgatJatJatJawhawiatJawjasMbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdmPdmZdmSdnadmPbikcsIdbdctRctRcsIaabbikaabbikbikaabbikavtawkawlbikbikaabbikbikaabbikbikbikbikbikbikbikbikbikbikauOauOazIazIazIavSdoJdoGdoLauRasUasUasUawoawvawuawrawrawsawrawyawwawrawtasZasZaUcawzawAawBawCawBawCawAahEahEahEahEahEasSauUauTauVaxbaxeaxdawEaxfavUawGawHawIavVawJawKawLawMavWbikbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikaabbikavZawNavZbikaabbikaabbikbikbikaabaabbikbikbikbikbikasMawOawPavlawQawRawSawTatJawUawVawWawXasMawYaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdnbdnddncdnddnebikdbOdnYctRdoKdbOaabbikaabbikbikaabavtavtawZaxaavtbikaabbikbikaabbikbikbikbikbikbikbikbikbikbikauOauWavDauYavGavFavIaxvdoQaxxdoZaxhaxhaxzaxlaxlaxlaxlaxlaxmaxnaxoaxlaxlaxlaxlaxpdoUaxlaxlaxqdoVaxqaxraxraxAaxraxBaxuadQavLavKavNaxXaxCaxDaxEapmavUaxGaxHaxIavVaxKaxLaxJaAZavWbikbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikaabavZavZaxMavZavZaabbikaabbikbikbikbikaabaabbikbikbikbikasMaxNaxOavlasMavlavlaxPaxQasMasMasMasMasMasMaabaabbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikdnbdnfdnebikbikdpRdbOdridbOdrjaabbikaabbikbikaabaxRaxSaxTaxUaxRaxVaxVbikbikaabbikbikbikbikbikbikbikbikbikbikdoFdoWaxqawnayjawpayjaygayiayhayoayjayjaypayjayjayjayjayjayqayjayjayjayjayjayjayPayuayjayjayjayQayjayRaxqaylaxqaymaynadQdrhdrgadQayraysaytaxEayUavUayvaywayxayyayzayAayBawMavWbikbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikaabayCayDayEayFayCaabbikaabbikbikaabbikbikaabaabbikbikayGasMavlasMavlayHayIayHayJayHayHayHayKayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikaxVaxVaxVaxVaxVaxVaxVaxVaabaabaxRazsayMayNaxRayOaxVbikbikaabbikbikbikbikbikbikbikbikbikbikdoFdplaxgaxcaxkaxiaxsazgdpabOIayXayXayZdlNazbazcayXayXayXdpbayXayXayXayXayXayXazedpcazgazgazgazhaziazjaziazkazlazmaznadQadQadQadQazoazoazoaxEapmavUazpaxHazqavVcscazraxJcvYavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikbikbikbikbikaabayCaFCaztazuayCaabbikaabbikbikaabbikbikayGazvayGazvayGayKayHayHayHayHayHayHayHayHayHazwazxayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikazyazzazybikbikbikaxVazHdrkazHazAazBazCaxVbikbikaxRazDazEazFazGazHaxVbikbikaabbikbikbikbikbikbikbikbikbikbikauOauOauOdpdawmdlVayaayaaVMazJazKazKazLazMazNazOazPazPazOazQazOazRazRazRazRazRazRazSazRazRazTazUazVazWazIazXazIazYazIazIaqVazZaovaovaovaovaAaapmavUaAbaxHaAcavVaAdayAayBawMavWbikbikbikbikbikbikbikbikaabaabbikbikbikbikazyaAeazybikaabayCaAfaAgaAhayCaAiaAiaAiaAiaAiazvazvazvayGaAjayHazwazxayJayHayJayJayJayGaAkayGayGayGayGayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikaAlaAmaAlbikbikaabaxVdrldrmazHazHaAqazHaxVaAlaAlaxRaxRaAraAsazGazHaxVaxVaAlaAlaAlaxVaxVbikaabbikbikbikbikbikbikbikbikdpdaxFaxwaxYaxWaxZazJaAtaAuaAvazMaAwazOaAxaAyaAzaAAaABaACaADbfTaAFaAGaAHaAIaAJaAKaALaxqaxraAMaANaAOaAPaAQaAPaAPaAPaARaAPaAPaAPaAPaASdoMaAUaAVaAWaAXaAYcNsaBaaUadcuavWaabaBbaBcaBcaBcaBcaBcaBdaabaabbikbikbikbikazvaBeazvbikaAiayCayCaBfaBgayCaBhayHayHayHayJaBiayHaBjayGayHayHayHaBkayJayHayGaBlaBmayGayHaBnayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikappaBpaBobikaBqaBsaBraabaabaAlazHaAlbikbikaabaxVdrnaBvaBwaBxaByaBzaxVaBAazHaBBaBCaBDaBEaBEaBEaBEaBEaBEaBEaBEaBFaxVbikaBGbikbikbikbikbikbikbikbikdpdaycaybayfayeaySdoRaBIaBJaBKazMaAwazOaBLafvaBNaAAaABaBOaBPaBPaBPaBPaBPaAIbjlaAKaxlaxqaxrazIaBQaBRaBSaBTaBSaBSaBUaBVaBWaBWaBWaBWaBWaBWaBXaBYaBZaCaaCbaCcaCdaCeavWavWaCfaCgaChaChaChaChaChaCgaCfaabbikbikbikbikazvaCiaCjbikaAiaCkaClaCmaCnayHayHayHayJayHayJaCoayHayHayGayHaCpaCqaCoaAkayHayGaCraCsayGayHaCtayGbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaCuaBtaCvaBtaCuaCwaCxaCwaCuaabaAlaCzaCAbikbikaxVaxVaxVaxVaxVaCBaCCaCDaCEaCFaCGaCGaCHaCIaCIaCJaCKaxVazHaxVaxVaxVaCLaxVbikaabbikbikbikbikbikbikaabaabdpdayVayTdpeayWazaaCMaCNaCOaBKazMaAwazOaCPaCQaCRaAAaCSaCTaBPaCUaBPaCVaCVaAIaBPaAKaxlaxqaCWazIaCXaBRaCYaCZaDaaDbaDcaDdaDeaDfaDgaDhaDiaDjaDkaDlaDmaDnaDoaDpaDqaDraDsaDtaCfaCgaChaChaChaChaChaCgaCfaabaabaabaabazvazvaDuaDvazvaAiaDwayHaDxayHayKayHayGayGaDyayGayGaDzayJayJaCoaDAaDBayHayGayHaDCaDCaDCaDCaDCaDCaDCaDCaDCaDDaDDaDDaDDaacaDDaDDaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaDEaBtaCyaBtaDEaCwaDFaCwaDEaxVaAlaDHaDIaAlaAlaxVazHazHazHazHazHazHazHaCBaCLaxVaxVaxVaxVaxVaDJaxVaxVazHaDKaxVaDLaCLaxVaxVaxVbikbikbikbikbikaDMaDMaDMaDMaDMaDMaDMaDMawmaCMaDNaDOaDPaDQaDRaDSaDTaDUaDVaDWaABaDXaBPaDYaDZaEaaEbaEcaEdaAKaxlaxqaxrazIatsaEeaEfaCZaDaaDbaEgaEhaEhaEhaEhaEhaEhaEhaEhaEhaEhaEiaEjaEkaElaEmaEnaEoaEpaCgaChaChaChaChaChaCgaCfaCfaCfbikbikazvayHaEqaEraBhayJaDAaCoaDxayHaEtayIaEuaAkayHayHayHayHaEvayHayHaDAaEwayHaDzayHaDCaExaEyaEzaDCaEAaEBaECaDCaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaDEaDGcUCaEDaDEaEFddzaEGaEJaEKazHaELaEMaENaDKaEOazHaxVaxVaxVaxVaxVaxVaxVaCLaxVaEPaEQaERaxVaESaETaEUazHaEOaxVaENaEVaBEaBFaEWbikbikbikbikbikaEXaEYaEZaFaaFbaFcaFdaDMdoXaCMaFeaFfaFgaCMaFhazOaFiaFjaFkaFlaABaFnaBPaFoaFpaFqaFraFsaFtaFuaFvaydaFwaFxaFyaFzaFAaCZaDaaDbaFBaEhaHTaHTaHTaEhaEhaFDaFEaFEaFFaEiaFGaFHaFIaFIaFJaFKaFLaFMaChaChaChaChaChaFNaFOaFPaFQbikbikazvayHayHaFRayHayJaFSayHaFTaFUaFUaFUaFUaFVaFUaFWayHayHayHayHayHayHayHayHayJayIaDCaFXaFYaFYaDCaFZaGaaGbaDCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -9131,8 +9158,8 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjZdjYdkDdkDdkDdkDdkDdkEdjHdjHdjFdjydjydjydjydjydjydjBbikbikbikbikbikbikbikbikbikbikbikdeRdeSdeSdeSdeTbikbikbikbikbikbikbikbOUbOTbQebOTbQfbikbikbikbOVbOVbOVbTjbTkbRObTlbNybTmbQnbTnbTobNzbDXbTpbTqbTrbTsbTtbTubTvbTwbTxbTybTzbTAbTBbTCbTCbTDbTEbTEbTEbTEbTEbTEbTFbTGbTHbTNbTMbTPbTOdlidjmdlkdljdllbPlbTQbQUbQVbTRbSpbJkbSqbSrbTSbTTbTUbTVbTWbTXbJsbTYbTZbLbbLbbUabUabLbbSDbLdbUbbUcbLgbUdbUebUfbUgbUhbLgbPNbUibUjbUkbUlbUmbUnbUobPPbUpbRAbSTbSTbZkbUqbUrbUsbUtbUubUvbUwbUxbUybVObNabOMbUAbUBbUAbUCbUDbUCbUCbUCbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaabaabbikbikbikbikaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkhdjYdkDdkDdkDdkFdkGdjFdjHdjHdjFdjHdjHdjHdkHdjHdkIdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbTfbTibThbTgbUIbUIbUIbOVbUJdpmbUKbULbUMbUNbUObUPbUQbUQbURbNzbUSbUTbUUbUVbUVbUWbUXbUYbUVbUZbUZbVabVbbONbUZbUZbVdbQMbQMbVebVfbVfbVfbVgbVhbVfbVfbVibVjbVkbVkbVlbVkbVmbVnbVkbVobVpbVqbPlbVrbVsbSqbVtbVubVvbVwbVxbVybVubJkbSybVzbVAbVBbVCbVDbVEbVFbVGbVHbVIbVJbVKbVLbVMbVNbPMbLhbPNbPNbVPbVQbVRbVSbVRbVTbPPbVUbVVbVWbVWbZkbVXbVYbVZbNabNabNabNabNabNabNabNabOMbUAbWabWbbWcbWdbWdbWebUCbikbikbikbikbikbikbikaabbikbikbikbikbikbikbikbikbikbikbikbikaabbWfbWfbWfbWfbWgbWgbWhbWhbWhbWhbWiaabaabbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjyddZdkDdkDdkLdkMdjFdjHdjHdkNdjHdjHdjHdkOdjHdkPdjFbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUEbUFbUEbQebUIbWmbWlbOVbWnbTkbWpbWqbWrbWsbNzbWtbWubWvbWwbNzbUTbUTbWxbUVbWybWzbWAbWBbWCbUZdmbbWEbWFbWGcAzbUZbWIbWJbWKbVfbWLbWMbWObWNbWPbWQbWRceLbWTbWUbWVbWWbWXbWYbWZbXabXbbXcbXdbXebXfbXgbXhbSrbXibXjbXkbXlbXmbXnbJsbXobXpbXqbXrbVDbXsbXsbXtbXubLgbXvbXwbXxbXybXzbXAdoEbLhbXCbXDbXEbXFbXEbXEbXGbXHbXIbXJbXKbXLbXMbZkbXNbXObPXbEXbxXbXPbXQbXRbXRbXQbXRbXSbUAbXTbXUbWcbWdbXWbXVbUCbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbWfbXXbXYbXXbWgbWhbWhbXZbYabXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkQdkDdkDdkRdjFdjHdjHdjFdkSdjHdjHdkUdkTdjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbUGbUEbUEdeycOWbTkbTkdeAbZAbTkbTkbWqbYhbYibNzbNzbNzbNzbNzbNzbYjbUTbYkbYlbYmbYnbYnbYnbYobUZbYpbYqbYqbYqbYrbYsbYtbYubYvbYwbYxbYybYzbYAbYBbYCbVfbVibYDbVkbYEbYFbYGbYHbYIbVkbSmbQVbSnbQVbYJbYKbYLbYMbYNbYObYPbYQbYRbVubYSbYTbYUbYVbYWbYXbYYbYZbZabZbbLgbLgbLgbLgbLgbZcbZdbZebLhbZfbXEbXEbZgbZhbXEbZibZjbZkbZlbRAbZmbZmbZkbPVbZnbPXbEXbUAbZobUAbUAbUAbUAbUAbUAbUAbZpbZqbUCbZrbZtbZsbUCaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacbZubXXbXXbZvbWhbWhbXZbXZbZwbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkWdkVdkXdjFdjHdkYdjFdkZdladjHdjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUFbUFbUFbQebUIbYfbYebZzbZAbTkbTkbZBbZCbZDbZEbZFbZFbZFbZGbUTbUTbUTbWxbUVbZHbYnbZIbYnbZJbUZbYpbYqbZKbYqbZLbUZbZMbZNbZObVfbZPbZQbZRbZSbZTbZUbZVbZWbZXbZYbZZcaacabcaccadbVkbTQbQVbQVcaebYJbYKcafcagcahbXjcaicajcElcalcamcancaocapcaqcarcIfcasbXscatbVAcaucavcawcaxcaycazcaAbZjbZfcaBbXEbXEbXEcaCcaDbZjbZkcaEbRAbZmbZmbZkcaFcaGbPXbEXcaHcaIcaJbUAcaKcaLcaMcaNcaOcaPcaQbUCcaRcaScaTbUCbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikcaUbWhbZubWhbWhbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkQdkDdkDdkRdjFdjHdjHdjFdkSdjHdjHdkUdkTdjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbTgbUGbUEbUEdeycOWbTkbTkdeAbZAbTkbTkbWqbYhbYibNzbNzbNzbNzbNzbNzbYjbUTbYkbYlbYmbYnbYnbYnbYobUZbYpbYqbYqbYqbYrbYsbYtbYubYvbYwbYybYxbYzbYAbYBbYCbVfbVibYDbVkbYEbYFbYGbYHbYIbVkbSmbQVbSnbQVbYJbYKbYLbYMbYNbYObYPbYQbYRbVubYSbYTbYUbYVbYWbYXbYYbYZbZabZbbLgbLgbLgbLgbLgbZcbZdbZebLhbZfbXEbXEbZgbZhbXEbZibZjbZkbZlbRAbZmbZmbZkbPVbZnbPXbEXbUAbZobUAbUAbUAbUAbUAbUAbUAbZpbZqbUCbZrbZtbZsbUCaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacaacbZubXXbXXbZvbWhbWhbXZbXZbZwbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydkWdkVdkXdjFdjHdkYdjFdkZdladjHdjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbQebUFbUFbUFbQebUIbYfbYebZzbZAbTkbTkbZBbZCbZDbZEbZFbZFbZFbZGbUTbUTbUTbWxbUVbZHbYnbZIbYnbZJbUZbYpbYqbZKbYqbZLbUZbZMbZNbZObVfbZQbZPbZSbZRbZTbZUbZVbZWbZXbZYbZZcaacabcaccadbVkbTQbQVbQVcaebYJbYKcafcagcahbXjcaicajcElcalcamcancaocapcaqcarcIfcasbXscatbVAcaucavcawcaxcaycazcaAbZjbZfcaBbXEbXEbXEcaCcaDbZjbZkcaEbRAbZmbZmbZkcaFcaGbPXbEXcaHcaIcaJbUAcaKcaLcaMcaNcaOcaPcaQbUCcaRcaScaTbUCbUAbUAbUAbUAbUAbUAbUAbUAbikbikbikbikbikaabbikbikbikbikbikbikbikcaUbWhbZubWhbWhbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdkkdjydjydjydjydjydjydjydjydjydjydkjbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabaabaacbUTcjMcjMbUTcjMcjMbUTbikbikbTgbWjbYbbWkbTgbUIbUIbUIbOVcaYdpncaZcaZcaZbOVbOVbUTcbbcbaccAcbcbUTcbdcbebUVbZHbYnbYnbYncbfbUZbYpbYqbYqcbgcbhcbicbjcbkcblbVfbVfbVfbVfbVfcbmbVfbVfcbncbobVkbVkcbpbVkbVnbVkbVkbPlcbqcbqbPlccicbrcbscbtcbucbvcbwcbxcbycbzcbAcbBcaocapcbCcbDcbEcbFcbGcbHbVAcbIcbJcbKcbLcbMcbNcbOcbPcbQcbPcbRcbRcbRcbPcbScbPcbPcbTcbUbZmbZmbZkcbVbZnbPXcbWcbXcbYcbZccaccbccccccccdcceccfccgcckccjcdqcclcfeccmccnccoccpccqccrccscctaabaabaabaabaabaabaabaabbikbikbikbikbikbWgbWhccuccvccvbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabbikbikbUTccBcqsbUTccBcqsbUTbikbikbYcbOTbYgbOTbZxbikaabbikbOVbOVbOVbOVbOVbOVbOVclabUTcuRcsuccCccDbZFccEccFbUVccGccHdmcbYnccJccKccLccMccNccOccPbUZccQccRccSccTccUccUccUccUccVccWccXccYccYccZccZcdacdbcdcbVibPlcddcdecdfcdgcdhbYKcdicbtcdjcdkcdlcdmbSwcdncdocdpcffcdrcdrcdscdrcdrcdrcdtbVAcducdvcdwcdxcdycdzcdAcdCcdBcdCcdDcdEcdFcdCcdGcdHcbPcdIcdJbRBbZkbZkcdKcdLcdMcdNcdOcdPcdQcdRcdScdTcdUcdVcdWcdXcdYcdZceacebceaceccebcebcebcedceecefcegcehaabbikbikbikbikaabbikbikbikbikbikbikbikbWhbWhceibXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbXZbWhbWhaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaacbikaacbUTcfQcqsbUTcfQcqsbUTbikbikaabaabaabaabaabaabaabaabaabbUTcqscAjcwNbUTcEvcEwbUTcGJbUTbUTcekbUTbUTcelbUVcemcenceocepceqcercescetceucevcewccKcexceycezceAbNKbNKbNKbNKbPRbPgbPTceFceGceFceHceIceJceKchvceMceNceOcePceQceRceSceTceUceVceWceXceYceZcfacfbcfccfgbMmbMmcfichOcgHceYchVcfjcfjcfkcfjcflcfmcfncfocdCcfpcfqcfrcfscfrcftcfucfvcbPbZkcfwbZkbZkcfxcfybZnbBxbEXbUAcfzbUAbUAcfAcfBcfCcfDcfEcebcfFcfGcfHcdUcfHcdUcfIcdUcdUbUAcfJcfKcfLcfMaabaabaabaabaabaabaabaabbikbikbikbikbikbWhbXZbXZbXZbXZbXZbXZcfNbXZcfObXZbXZbXZbXZbXZbWhbWhaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
@@ -9163,14 +9190,14 @@ bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbi
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGacGafxacGaabczocHOczqbikczocHOczqbikczocHOczqaabbikbikbikbikbikbikbikbikaabaabcDccDdcDdcDdcDdcHPcHQcHRcfRcHScfRcfRcEBcHTcfRcECcHUcHVcGOcHWcFNcHXcHYcIacIacIbcIccIdcIedmabRFcIbcIhcIicIjcIkcIlcImcIncIocIpcIqcGfcIrcIscItcIucIvcIwcIxcIycIzcIAcIBcICcIDcDPcDQcIEcIFcIFcCKcHBcoAcEhclUclUclUclUclUcJhcANcBRcJQcMccBScMecMdcMCcBVclUcuscGqcGrcGrcGrcJTcJTcJTcJTcJTcJUcKTcKbcKUcIUczbcIVczbcIVczbcIXcHMbikbikbikbikaabaabbikbikbikbikbwocvzbwoaabaabaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikczocHOczqaabczocHOczqbikczocHOczqbikbikbikbikaabbikbikbikbikaabaabaabbikbikaabaabcJbcJbcJbcJbcJbcJbcJbcJccJbcJbcECcJdcJecGOcHWcFNcJfcFNcFNcJgcDtcJicJjcFWcJkcFRcDtcJmcDzcDwcJncJocJpcIncJqcJrcJscJtcJucJvcJwcJtcJxcJycJzcJAcDFcJBcJCcJDcJEaabcEVcJFcJGcJHcCKcHBcoDcKWcKVcKVcKVcKXclUcFacyLcCLcFecyScCMcyTcyTcyScCNclUcuscGvbVibGycKYcKZcoAbikbikckPcJVcJWcJXcJYcJVcJWcJZcKacJVcJWcLackPaabaabaabaabaabaabaabaabaabaabbwocvzbwobwobwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjcbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikafxaabczocHOczqbikczocHOczqbikczocHOczqaabbikbikbikbikbikbikbikbikaabaabbikbikaabaabaabcJbcKjcKjcKkcGIcKmcKmcKncKocKocKpcKqcKrcGOcHWcGOcKscGOcGOcGOcDtcKtcKucKvcKwcKxcKycKzbClcKBcKCcKCcKCcKDcKEcKFcKGcKHcKIcHhcCAcKJcKKcKLcKMcKNcDFcJBcKOcKPcKQcKRcDQcKScIFcIFcCKcHBcoDcEhbVibVibVibYDclUcFgcCOcDXcNDcyScPocPMcyTcPVcPQclUcuscGvbVibGycyHbGycoAbikbikckPcLicLjcLkcwAcIWcLmcJScwAcLlcLpcLnckPaabaabbikbikbikbikbikbikbikbikbwocvzbxXbxXbwoaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikafxaabczocHOczqbikczocHOczqaabczocHOczqaabaabaabaabbikaabbikbikaabaabbikbikbikaabbikbikcJbcKjcKjcKkcLscLscLscLtcLucLvcECcLwcLxcLycLzcLAcLBcLCcLDcLDcLEcLFcLGcGOcGOcGOcLHcLIcLJcLKcLLcLMcLNcLOcLPcECcLQcLQcLRcHhcCAcLScLTcLUcLVcLWcDFcLXcLYcLZcMacMbcCKcCKcCKcCKcCKcHBcoDcEhcLbbGybGybYDclUcNEczVczVcOtcDZcQMcRwcyTdbkcYuclUcuscGvczhbGychCcITcoAbikbikckPcMpcxOcxOcwAcMpcxOcxOcwAcMpcxOcxOckPbikaabaabbikbikbikbikbikbikbikbwocLccyJbxXbwobwobwocJNcJNaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikagiaabczocMqczqbikczocMqczqbikczocMqczqaabafxaabaabaabaabaabaabaabbikbikbikbikbikbikaabcJbcMrcMscLscLscLscMtcMucMucMucMucMucMucMucMvcMwcMxcMycMzcMzcMzcMAcMBdcpdcodcvcMzcMBcMDcMEcMFcLMcMGcLOcLPcMHcMIcMJcMKcMLcMMcMNcMOcKNcMPcMQcMRcMScMTcMUcIDcMVcDQcMWcMXcMXcCKcHBcoAcEhbVicozcLdbYDclUcOBczVcQgcPYcySdcydczcyTdcBdcAclUcuscGvbVibGybVibVicoAaabaabckPcNncBZcxOcwAcNncBZcxOcwAcNncBZcxOckPbikbikaabaabbikbikbikbikbikbikbwocvzcyJcLecyJcLfbwoaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikafxbikaabbikbikbikaabaabaabbikbikaabaabbikafxaabaabaabaabaabaabbikbikbikbikbikbikbikaabcJbcNocLscLscLscLscLscMubhGcNpcHscNrcNtcMucNucNvcNwcJecGOcGOcNxdcCcNzcNAcNBdcDcNCdcEcECdcFcMFcLMcNFcLOcNGcECcNHcLQcNIcNJcDFcMNcMOcNKcDFcMQcMRcJBcJCcNLcJEcNMcEVcNNcNOcNPcCKcHBcoAcEhbVicLgcLgbYDclUclUdbldcwclUcEZclUclUclUclUclUclUcuscGvbVibGybGycMfcoAbikbikckPcOacxOcxOcwAcOacxOcxOcwAcOacxOcxOckPbikbikbikaabaabbikbikbikbikbikbwocvzcyJbxXbxXbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikafxaabczocHOczqbikczocHOczqaabczocHOczqaabaabaabaabbikaabbikbikaabaabbikbikbikaabbikbikcJbcKjcKjcKkcLscLscLscLtcLucLvcECcLwcLxcLycLzcLAcLBcLCcLDcLDcLEcLFcLGcGOcGOcGOcLHcLIcLJcLKcLLcLMcLNcLOcLPcECcLQcLQcLRcHhcCAcLScLTcLUcLVcLWcDFcLXcLYcLZcMacMbcCKcCKcCKcCKcCKcHBcoDcEhcLbbGybGybYDclUcNEczVczVcOtcDZcQMcRwcyTdbkcYuclUcuscGvczhbGychCcITcoAbikbikckPcMpcxOcxOcwAcMpcxOcxOcwAcMpcxOcxOckPbikaabaabbikbikbikbikbikcyJcyJbwocLccyJbxXbwobwobwocJNcJNaabaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikagiaabczocMqczqbikczocMqczqbikczocMqczqaabafxaabaabaabaabaabaabaabbikbikbikbikbikbikaabcJbcMrcMscLscLscLscMtcMucMucMucMucMucMucMucMvcMwcMxcMycMzcMzcMzcMAcMBdcpdcodcvcMzcMBcMDcMEcMFcLMcMGcLOcLPcMHcMIcMJcMKcMLcMMcMNcMOcKNcMPcMQcMRcMScMTcMUcIDcMVcDQcMWcMXcMXcCKcHBcoAcEhbVicozcLdbYDclUcOBczVcQgcPYcySdcydczcyTdcBdcAclUcuscGvbVibGybVibVicoAaabaabckPcNncBZcxOcwAcNncBZcxOcwAcNncBZcxOckPbikbikaabaabbikbikbikbikcyJcNRbxXcvzcyJcLecyJcLfbwoaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikafxbikaabbikbikbikaabaabaabbikbikaabaabbikafxaabaabaabaabaabaabbikbikbikbikbikbikbikaabcJbcNocLscLscLscLscLscMubhGcNpcHscNrcNtcMucNucNvcNwcJecGOcGOcNxdcCcNzcNAcNBdcDcNCdcEcECdcFcMFcLMcNFcLOcNGcECcNHcLQcNIcNJcDFcMNcMOcNKcDFcMQcMRcJBcJCcNLcJEcNMcEVcNNcNOcNPcCKcHBcoAcEhbVicLgcLgbYDclUclUdbldcwclUcEZclUclUclUclUclUclUcuscGvbVibGybGycMfcoAbikbikckPcOacxOcxOcwAcOacxOcxOcwAcOacxOcxOckPbikbikbikaabaabbikbikdrocyJbxXbxXcvzcyJbxXbxXbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikacGacGafxacGacGagiafxafxafxafxacGafxafxacGcOcbikaabbikbikbikbikbikbikbikbikbikbikbikbikcJbcOdcLucLscLscLscOecMucNpcNqcOkcOlcOmcOncOocOpcOqcOrcGOcOsdcKcOucOvcOwcOxcOycOzcOAdcLcNwcJecOCcODcLKcOEcECcOFcLQcOGcOHcDFcMNcMOcKNcDFcOIcMRcJBcOJcOKcKQcOLcDQcOMcMXcMXcCKcHBcoDcEhcMgchCbJGbYDdcxclUclUcMhclUdcHdcGcFcbVicMjcMibGycuscGvbVibGycMkcITcoAbikbikckPckPckPckPckPckPckPckPckPckPckPckPckPbikbikbikbikaabaabbikbikbwobwobwocvzcyJcMmcMlbxXcxHbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabcJbcJbcJbdeBcOXcOXcOXcMucOYcOZcPacPacPbcPccMzcPdcPecPfcPgcPhdcMcPicPjcPkcPlcPmcPncPidcNcPpcPqcPrcPscPtcPucPvcNHcLQcPwcPxcDFcMNcDFcPycDFcMQcMRcJBcJCcPzcJEcNMcCKcCKcCKcCKcCKcHBcoDcMncKXchCcITcMYcMocMocMocMZbVidcJdcIcFhbVicNacKVcKVcNbcHrczhbGybGycoAcoAbikbikcONaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikaabaabbikbwocyKcNccNdcyJcNfcNebxXcxHbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabaabcPEcLscLscOXaabaabcMucPHcPIcPacPacPJcMucPKcPLdcOcPNcPOcPPdcPcECcPRcPScPTcGOcPUcECdcQcPWcPXcPNcPNdcRcPZcECcQacLQcQbcQccDFcMNcDFcLScLTcQdcQecMScQfdcScIDcQhcDQcQicQjcQjcCKcHBcoDcNhcNgbVibVicEhbVibVibGycNibVibVicGwbVibVicNkcNjcNmcNlcNQcoAcoAcoAcoAbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbikaabaabbwocNRcunbOMcyJcyJcyJbxXbwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikaabaabcPEcLscLscOXaabbikcMucQscPIcPacPacQtcMucQucQvcECcQwcQxcQxdcTcECcQycQzcQAcQBdcUcECcQxcQxcQxcQwcECcQCcQucECcNHcLQcJlcQEcQFcQGcQHcQIcQJcQKcIAcQLcJCdcVcJEcNMcEVcQNcQOcQPcCKcHBcoAcoAcEhcdbcNScEhcNTbVibGycNVcNUcNXcNWcMocMocNYcGvbVicNZcoAcoAbikbikaabbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbwobwobwobwocyJcsGbOMcyJcOQcOPbxXbwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
-bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaabcPEcOXdeBcPEbikbikcMucQVcQWcPacPacQXcMucQYcQZdcWcRacRbcRccRdcRecRfcRgcRhcRicPucRecRbcRbcRbcRjdcWcRkcRlcECcNHcRmcMNcRncRocQJcRpcRqcRrcRscRtcRucRvdcXcKQcOLcDQcRxcQjcQjcCKcHBcoAbGycORcOTcOScNYcgmbVibGybGybGycGvcOUbGycGqcFicHrbVicEhbwobikbikbikaabbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbwobxXbxXbxXcyKcsGcOVcyJcPAbxXbxXbwoaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdrpcJbcLscLscLscOXaabaabcMucPHcPIcPacPacPJcMucPKcPLdcOcPNcPOcPPdcPcECcPRcPScPTcGOcPUcECdcQcPWcPXcPNcPNdcRcPZcECcQacLQcQbcQccDFcMNcDFcLScLTcQdcQecMScQfdcScIDcQhcDQcQicQjcQjcCKcHBcoDcNhcNgbVibVicEhbVibVibGycNibVibVicGwbVibVicNkcNjcNmcNlcNQcoAcoAcoAcoAbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbikaabaabbwocNRcunbOMcyJcyJcyJbxXbwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikaahbikbikbikbikbikbikbikbikbikbikbikbikaabcJbcLscLscLscOXaabbikcMucQscPIcPacPacQtcMucQucQvcECcQwcQxcQxdcTcECcQycQzcQAcQBdcUcECcQxcQxcQxcQwcECcQCcQucECcNHcLQcJlcQEcQFcQGcQHcQIcQJcQKcIAcQLcJCdcVcJEcNMcEVcQNcQOcQPcCKcHBcoAcoAcEhcdbcNScEhcNTbVibGycNVcNUcNXcNWcMocMocNYcGvbVicNZcoAcoAbikbikaabbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbwobwobwobwobwodrqbOMcyJcOQcOPbxXbwoaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
+bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcJbcJbcOXdeBcPEbikbikcMucQVcQWcPacPacQXcMucQYcQZdcWcRacRbcRccRdcRecRfcRgcRhcRicPucRecRbcRbcRbcRjdcWcRkcRlcECcNHcRmcMNcRncRocQJcRpcRqcRrcRscRtcRucRvdcXcKQcOLcDQcRxcQjcQjcCKcHBcoAbGycORcOTcOScNYcgmbVibGybGybGycGvcOUbGycGqcFicHrbVicEhbwobikbikbikaabbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbikbwobxXbxXbxXcyKcsGcOVcyJcPAbxXbxXbwoaabaabaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikdjdbikbikbikbikbikbikbikbikbikbikbikbikbikbikcOgcOhcOhdeFcOhcOhcPFcMucRzcOZcPacPacRAcMucMHcRBcECcECcRecRecRecRecRCcRRcRDcPNcREcRecRecRecRecECcECcRFcRGcECcNHcLQcRHcRIcRocRJcRKcDFcDFcRLcJxcRJcJCcRMcJEcNMcCKcCKcCKcCKcCKcHBcoAcITbGycPCcPBbGycQkbVibVicQlbVicQmcdccyHcQnbVibVibVicEhbwobikbikbikaabbikbikbikbikaabbikbikbikbikaabbikbikbikbikbikaabbikbikbikbikbwobwocyJcQpcQocyKcsGbOMbxXbxXbxXcYgbwobikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcPGcQrcQqcQTcQqcRycQUcMucRNcROcPacPacRPcMucECcRQcECcRTaaccShcRecRecRecRecSicRecRecRecRecShaaccRTcECcRUcECcECcNHcLQcRVcQFcRWcRXcRYcRZcSacRXcSacRXcSbcQJcSccNMcTbcTScTScTScTScUdcYhcYicYicYkcYjcYicYicYicYlcYncYmcQmcYobVicQmbVicYpbVicEhbwocxHcxHcxHbwocxHcxHcxHcxHbwocxHcxHcxHcxHbwobwobwobwobwobwobwobwobwobwoczMbwocyKcyJcYqbxXcHycsGbOMcyJcyJcLecyJbwoaabczrbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik
 bikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikcPGcQrcQqcQTcQTdlcdlCcMucSdcSecPacPacSfcMucSgcSmcSlaaccTfcTIcTIcTIcTIcTIcTQcTIcTIcTIcTIcTIcTZaacddaddbcSncECcSocMJcFUcSqcSrcSscStcSucSvcSwcDFcSxcSycSzcSAcNMcUkbikaabaabbikcYscYrdbwcKlcYwcYvcYycYxcYicqTbGybGycYzcdccYAcGvbGybGycYBcMncYCcYCcYCcYCcYCcYCcYCcYCcYCcYCcYCcYCcYCcYCcYDcYCcYCcYCcYCcmvcyJbFecnGbxXcYEczMcyJcyJcyJcLecyJcsGbOMcyJcYFbxXbxXbwobikaabbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbikbik

_maps/map_files/cyberiad/z2.dmm

@@ -689,6 +689,44 @@
 "nn" = (/obj/docking_port/stationary/transit{dir = 8; dwidth = 2; height = 11; id = "trade_sol_transit"; name = "trade_sol in transit"; turf_type = /turf/space/transit/horizontal; width = 5},/turf/space/transit/horizontal,/area/space)
 "no" = (/obj/machinery/sleeper{dir = 4},/turf/simulated/shuttle/floor{icon_state = "floor3"},/area/centcom/evac)
 "np" = (/obj/structure/table,/obj/item/weapon/surgicaldrill,/obj/item/stack/medical/bruise_pack/advanced,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/admin)
+"nq" = (/turf/simulated/shuttle/wall{icon_state = "wall3"},/area/syndicate_mothership/infteam)
+"nr" = (/obj/machinery/vending/syndicigs,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"ns" = (/obj/machinery/vending/syndisnack,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nt" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nu" = (/obj/machinery/light/spot{tag = "icon-tube1 (NORTH)"; icon_state = "tube1"; dir = 1},/obj/machinery/vending/coffee,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nv" = (/obj/machinery/washing_machine,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nw" = (/turf/unsimulated/wall{icon = 'icons/obj/library.dmi'; icon_state = "book-5"; name = "bookcase (Silent Killing Methods)"},/area/syndicate_mothership/infteam)
+"nx" = (/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"ny" = (/turf/unsimulated/wall{icon = 'icons/obj/library.dmi'; icon_state = "book-5"; name = "bookcase (Infiltration Tactics)"},/area/syndicate_mothership/infteam)
+"nz" = (/turf/unsimulated/wall{icon = 'icons/obj/library.dmi'; icon_state = "book-5"; name = "bookcase (Mission Reports)"},/area/syndicate_mothership/infteam)
+"nA" = (/obj/effect/landmark{name = "Syndicate-Infiltrator"; tag = "Commando"},/obj/structure/mirror{pixel_x = -28},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nB" = (/obj/structure/mirror{pixel_x = 28},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nC" = (/obj/machinery/light/spot{tag = "icon-tube1 (WEST)"; icon_state = "tube1"; dir = 8},/obj/effect/landmark{name = "Syndicate-Infiltrator"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nD" = (/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 8; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5_end (WEST)"},/area/syndicate_mothership/infteam)
+"nE" = (/obj/machinery/light/spot{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nF" = (/obj/structure/table/woodentable,/obj/item/ashtray/glass{icon_state = "ashtray_half_gl"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nG" = (/obj/structure/stool/bed/chair/comfy/black,/obj/effect/landmark{name = "Syndicate-Infiltrator-Admin"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nH" = (/obj/effect/landmark{name = "Syndicate-Infiltrator"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nI" = (/obj/structure/table/woodentable,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nJ" = (/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5 (EAST)"},/area/syndicate_mothership/infteam)
+"nK" = (/obj/structure/table/woodentable,/obj/machinery/door_control{id = "syndicate_sit_office"; name = "Office Blast Doors"; pixel_x = -5; pixel_y = 3; req_access_txt = "151"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nL" = (/obj/structure/table/woodentable,/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/devilskiss,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nM" = (/obj/structure/table/woodentable,/obj/item/device/syndicatedetonator,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nN" = (/obj/effect/landmark{name = "Syndicate-Infiltrator-Leader"; tag = "Commando"},/obj/machinery/door_control{id = "syndicate_sit_1"; name = "Ship Blast Doors (team leader only)"; pixel_x = -26; pixel_y = -2; req_access_txt = "151"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nO" = (/obj/machinery/door/poddoor{id_tag = "syndicate_sit_office"; name = "Office Blast Door"},/obj/machinery/door/airlock/hatch{desc = "Danger: May contain robustness"; name = "Syndicate Officer's Office"; req_access_txt = "151"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nP" = (/obj/item/weapon/twohanded/required/kirbyplants,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nQ" = (/obj/structure/stool/bed/chair{dir = 1},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nR" = (/obj/structure/mirror{pixel_x = -28},/obj/effect/landmark{name = "Syndicate-Infiltrator"; tag = "Commando"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nS" = (/obj/machinery/pdapainter,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nT" = (/obj/machinery/door/airlock/external{id_tag = "sst_away"; req_access_txt = "150"},/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nU" = (/obj/docking_port/stationary{dir = 8; dwidth = 3; height = 5; id = "sit_away"; name = "Syndicate Base"; width = 11},/turf/space,/area/space)
+"nV" = (/obj/structure/table,/obj/machinery/light/spot{tag = "icon-tube1 (EAST)"; icon_state = "tube1"; dir = 4},/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nW" = (/obj/structure/table,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nX" = (/obj/structure/table,/obj/item/weapon/storage/backpack/satchel,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nY" = (/obj/structure/table,/obj/item/weapon/storage/backpack/medic,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"nZ" = (/obj/structure/table,/obj/item/weapon/storage/backpack/industrial,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"oa" = (/obj/structure/table,/obj/item/weapon/storage/backpack/science,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
+"ob" = (/obj/structure/table,/obj/item/weapon/storage/backpack/industrial,/obj/machinery/light/spot,/turf/unsimulated/floor{icon_state = "dark"},/area/syndicate_mothership/infteam)
 "oB" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows (WEST)"; icon_state = "fakewindows"; dir = 8},/area/syndicate_mothership)
 "oC" = (/turf/unsimulated/wall/fakeglass{tag = "icon-fakewindows (EAST)"; icon_state = "fakewindows"; dir = 4},/area/syndicate_mothership)
 "oH" = (/obj/structure/table,/obj/item/weapon/storage/fancy/crayons,/obj/item/weapon/storage/fancy/crayons,/turf/unsimulated/floor{icon_state = "freezerfloor"; dir = 2},/area/syndicate_mothership)
@@ -1126,7 +1164,7 @@
 "Eb" = (/obj/structure/rack,/obj/item/clothing/shoes/magboots/syndie{pixel_x = -3; pixel_y = 3},/obj/item/clothing/shoes/magboots/advance,/obj/item/clothing/shoes/magboots{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Ec" = (/obj/structure/rack,/obj/item/clothing/shoes/green{pixel_x = -3; pixel_y = 3},/obj/item/clothing/shoes/centcom,/obj/item/clothing/shoes/syndigaloshes{pixel_x = 3; pixel_y = -3},/obj/item/clothing/shoes/rainbow{pixel_x = -3; pixel_y = 3},/obj/item/clothing/shoes/combat/swat,/obj/item/clothing/shoes/combat{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Ed" = (/obj/structure/rack,/obj/item/clothing/suit/pirate_black{pixel_x = -3; pixel_y = 3},/obj/item/clothing/suit/blacktrenchcoat,/obj/item/clothing/suit/jacket{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
-"Ee" = (/obj/item/mecha_parts/mecha_equipment/tool/cable_layer,/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill,/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/tool/rcd,/obj/item/mecha_parts/mecha_equipment/tool/extinguisher,/obj/structure/closet/crate,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
+"Ee" = (/obj/item/mecha_parts/mecha_equipment/cable_layer,/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill,/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp,/obj/item/mecha_parts/mecha_equipment/rcd,/obj/item/mecha_parts/mecha_equipment/extinguisher,/obj/structure/closet/crate,/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Ef" = (/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/turf/unsimulated/wall{desc = "This window appears to be reinforced, it looks nearly impossible to break."; dir = 4; icon = 'icons/turf/shuttle.dmi'; icon_state = "window5_end"; name = "window"; opacity = 0; tag = "icon-window5 (EAST)"},/area/admin)
 "Eg" = (/obj/structure/rack,/obj/item/clothing/under/syndicate{pixel_x = -3; pixel_y = 3},/obj/item/clothing/under/syndicate/combat,/obj/item/clothing/under/acj{pixel_x = 3; pixel_y = -3},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
 "Eh" = (/obj/structure/mirror{pixel_y = -30},/turf/unsimulated/floor{tag = "icon-floor"; icon_state = "floor"},/area/admin)
@@ -1388,19 +1426,19 @@ ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapav
 ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNfffffffffffgfgfhfififjfgfgfgfgfgfgfgfgfgfkfgfgfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeneoepeneobseqeqeqeqeqbserererererbseHeIeIeIeJbsevevevevevbseMeNeNeNeObsePeQeQeQeRbD
 ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNftfufvfwfffgfxfyfzfAfAfBfCfDdJdMfGfHfIfHfHfJfKfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeoepeneoepbseqeqeqfMeqbserfNfOfPerbsfQfRfRfRfSbsevfTevevevbsfUfVfVfVfWbsePeQeQeQeRbD
 ckckckckckckckclckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNfffffffufufufffggbfyfyfyfyfygcgdgdgdgefHfHfHgffHfHfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpepeneoepenbseqgkeqeqeqbserglgmgnerbsgogpgpgpgqbsevevevgrevbsgsgtgtgtgubsgveQeQeQgwbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNgygzgAfufufufffggBfygCgDgEgFgGgdgdgdgdfHfHgHfHgIfIfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeneoepeneobseqeqeqeqeDbserglgmgnerbsgJeIgKeIgLbsevevevevevbsgMeNeNeNgNbsgveQeQeQgwbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckcmckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNgOgPgQfufufufffggRgdgegegegegegdgdgdgdfHfHfHgSfHfHfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeoepeneoepbsgTeqeqeqeqbserglgmgnerbsgJgUgUgUgLbsgVgVgVgVgVbsgMeNeNeNgNbsgveQeQeQgwbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckiAckckckckckckckckckaNaNaNaNaNfffffffffffffffggWgdgdgdgdgdgdgdgdgdgdgXfHfHfHfHfHfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpepeneoepenbseqfMeqgkeqbsergYgZhaerbsgJgJeIgLgLbshbhbhbhbhbbsgMeNeNeNgNbsgveQeQeQgwbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfggWgdgdgdgdgdhcgdgdhcgdhdhehehehfhefgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeneoepeneobseqeqeqeqgTbserererererbshhhhhihjhjbshkhkhkhkhkbshlhmhmhmhnbshohphphphqbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfghrgdgdgdgdgehshtgehsgehuhvhvhvhwhvfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNhyhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhB
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfgfghChDhDhCfgfgfgfgfgfgfgfgfgfgfgfgfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfghEhFhFhFfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbZaPaPaPaPaPbZaPaPaPaPaPbZaPaPaPaPaPbZ
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfghFhFhFhFfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphHhIhJhKhLbshMhNhYhPhQbshRhShThUhVbD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfgfgfgfgfgfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphWhWhXhWhWbshYhZhZhZhYbsiaiaiaiaiabD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphWhWhWhWhWbshYhZhZhZhYbsiaiaiaiaiabD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpibichWicibbshYidhZidhYbsieifiaigiebD
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbZhzhzhzhzhzbZhzhzhzhzhzbZhzhzhzhzhzbZ
-ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNihihihihihihihihihihihihaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNatatatatataNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNgygzgAfufufufffggBfygCgDgEgFgGgdgdgdgdfHfHgHfHgIfIfgaNaNitisisisisisitnqnqnqnqnqnqnqnqnqnqnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeneoepeneobseqeqeqeqeDbserglgmgnerbsgJeIgKeIgLbsevevevevevbsgMeNeNeNgNbsgveQeQeQgwbD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckcmckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNgOgPgQfufufufffggRgdgegegegegegdgdgdgdfHfHfHgSfHfHfgaNaNisaNaNaNaNaNitnsnrnuntnvnqnxnwnznynqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeoepeneoepbsgTeqeqeqeqbserglgmgnerbsgJgUgUgUgLbsgVgVgVgVgVbsgMeNeNeNgNbsgveQeQeQgwbD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckiAckckckckckckckckckaNaNaNaNaNfffffffffffffffggWgdgdgdgdgdgdgdgdgdgdgXfHfHfHfHfHfgaNaNisaNaNaNaNaNitnAnxnxnxnBnqnxnxnxnxnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpepeneoepenbseqfMeqgkeqbsergYgZhaerbsgJgJeIgLgLbshbhbhbhbhbbsgMeNeNeNgNbsgveQeQeQgwbD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfggWgdgdgdgdgdhcgdgdhcgdhdhehehehfhefgaNaNisaNaNaNaNaNitnCnxnxnxnEnDnxnFnGnxnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpeneoepeneobseqeqeqeqgTbserererererbshhhhhihjhjbshkhkhkhkhkbshlhmhmhmhnbshohphphphqbD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfghrgdgdgdgdgehshtgehsgehuhvhvhvhwhvfgaNaNisaNaNaNaNaNitnHnxnInInxnJnxnKnMnLnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNhyhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhAhzhzhzhzhzhB
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNapapapapapapapapapapapapapapapapapapapapapapapapaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNfgfghChDhDhCfgfgfgfgfgfgfgfgfgfgfgfgfgaNaNisaNaNaNaNaNnqnHnxnInNnxnOnxnxnQnPnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfghEhFhFhFfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNaNnqnRnxnxnxnBnqnqnqnqnqnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbZaPaPaPaPaPbZaPaPaPaPaPbZaPaPaPaPaPbZ
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfghFhFhFhFfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNaNnqnHnxnxnxnSnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphHhIhJhKhLbshMhNhYhPhQbshRhShThUhVbD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNfgfgfgfgfgfgaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNnUnTnxnxnxnxnVnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphWhWhXhWhWbshYhZhZhZhYbsiaiaiaiaiabD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNaNnqnWnxnxnxnXnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbphWhWhWhWhWbshYhZhZhZhYbsiaiaiaiaiabD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNaNitnYnxnZnxoanqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbpibichWicibbshYidhZidhYbsieifiaigiebD
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNisaNaNaNaNaNitnYnxobnxoanqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbZhzhzhzhzhzbZhzhzhzhzhzbZhzhzhzhzhzbZ
+ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNihihihihihihihihihihihihaNaNaNaNaNaNaNaNaNaNaNaNitisisisisisitnqnqnqnqnqnqaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNatatatatataNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaN
 ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNihiiijikiliminihioipiqihaNaNirisisisisisitaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNatauauauataNaNaNaNaNaNaNaNaNaNaNbZbZbZbZbZbZbZaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNbZbZbZbZbZbZbZaNaNaNaNaN
 ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNihikikikikikikikixiyizihaNaNisaNaNaNaNaNitaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNatauayauataNaNaNaNaNaNaNaNaNaNaNbZdEdEdEdEdEbZbZbZbZbZbZbZbZbZbZbZbZbZbZbZbZbZdFdFdFdFdFbZaNaNaNaNaN
 ckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckckaNckckckckckckckckckckckckckckckckckckckckckckckaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNihiLiLikikikiMihiNiOiPihaNaNisaNaNaNaNaNititititaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNaNatauauauataNaNaNaNaNaNaNaNaNbZbZbZiZiZiZiZiZjajbjcjcjcjcjcjcjcjcjcjcjcjcjcjbjaiZiZiZiZiZbZbZbZaNaNaN

code/__DEFINES/role_preferences.dm

@@ -28,7 +28,6 @@
 #define ROLE_RAIDER				"vox raider"
 #define ROLE_TRADER				"trader"
 #define ROLE_VAMPIRE			"vampire"
-#define ROLE_MUTINEER			"mutineer"
 // Role tags for EVERYONE!
 #define ROLE_BORER				"cortical borer"
 #define ROLE_DEMON				"slaughter demon"
@@ -62,7 +61,6 @@ var/global/list/special_roles = list(
 //	ROLE_HOG_CULTIST = /datum/game_mode/hand_of_god,
 	ROLE_RAIDER = /datum/game_mode/heist,
 	ROLE_VAMPIRE = /datum/game_mode/vampire,
-	ROLE_MUTINEER = /datum/game_mode/mutiny,
 	ROLE_BORER,
 	ROLE_DEMON,
 	ROLE_SENTIENT,

code/__DEFINES/rolebans.dm

@@ -12,7 +12,6 @@ var/global/list/antag_roles = list(
 	ROLE_SHADOWLING,
 	ROLE_RAIDER,
 	ROLE_VAMPIRE,
-	ROLE_MUTINEER,
 	ROLE_BORER,
 	ROLE_DEMON,
 	ROLE_REVENANT,

code/datums/action.dm

@@ -216,6 +216,9 @@
 /datum/action/item_action/halt
 	name = "HALT!"
 
+/datum/action/item_action/selectphrase
+	name = "Change Phrase"
+
 /datum/action/item_action/hoot
 	name = "Hoot"
 

code/datums/datumvars.dm

@@ -53,7 +53,7 @@
 										location.href=alist\[0\].href;
 									}
 								}
-							}catch(err) {   }
+							}catch(err) {	 }
 						}
 						return
 					}
@@ -74,7 +74,7 @@
 										return
 									}
 								}
-							}catch(err) {  }
+							}catch(err) {	}
 						}
 						return
 					}
@@ -95,7 +95,7 @@
 										return
 									}
 								}
-							}catch(err) {  }
+							}catch(err) {	}
 						}
 						return
 					}
@@ -121,7 +121,7 @@
 									vars_ol.removeChild(li);
 									i--;
 								}
-							}catch(err) {   }
+							}catch(err) {	 }
 						}
 					}
 					var lis_new = vars_ol.getElementsByTagName("li");
@@ -379,14 +379,17 @@ body
 
 		if(L.len > 0 && !(name == "underlays" || name == "overlays" || name == "vars" || L.len > 500))
 			// not sure if this is completely right...
-			if(0)   //(L.vars.len > 0)
+			if(0)	 //(L.vars.len > 0)
 				html += "<ol>"
 				html += "</ol>"
 			else
 				html += "<ul>"
 				var/index = 1
 				for(var/entry in L)
-					html += debug_variable(index, L[index], level + 1)
+					if(istext(entry))
+						html += debug_variable(entry, L[entry], level + 1)
+					else
+						html += debug_variable(index, L[index], level + 1)
 					index++
 				html += "</ul>"
 
@@ -920,7 +923,7 @@ body
 			to_chat(usr, "Mob doesn't know that language.")
 
 	else if(href_list["addverb"])
-		if(!check_rights(R_DEBUG))      return
+		if(!check_rights(R_DEBUG))			return
 
 		var/mob/living/H = locate(href_list["addverb"])
 
@@ -952,7 +955,7 @@ body
 			log_admin("[key_name(usr)] has given [key_name(H)] the verb [verb]")
 
 	else if(href_list["remverb"])
-		if(!check_rights(R_DEBUG))      return
+		if(!check_rights(R_DEBUG))			return
 
 		var/mob/H = locate(href_list["remverb"])
 
@@ -1050,7 +1053,7 @@ body
 
 		var/Text = href_list["adjustDamage"]
 
-		var/amount =  input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
+		var/amount =	input("Deal how much damage to mob? (Negative values here heal)","Adjust [Text]loss",0) as num
 
 		if(!L)
 			to_chat(usr, "Mob doesn't exist anymore")

code/datums/helper_datums/events.dm

@@ -6,62 +6,63 @@
 /datum/events
 	var/list/events
 
-	New()
-		..()
-		events = new
+/datum/events/New()
+	..()
+	events = new
 
-	proc/addEventType(event_type as text)
-		if(!(event_type in events) || !islist(events[event_type]))
-			events[event_type] = list()
-			return 1
-		return
-
-
-	//	Arguments: event_type as text, proc_holder as datum, proc_name as text
-	//	Returns: New event, null on error.
-	proc/addEvent(event_type as text, proc_holder, proc_name as text)
-		if(!event_type || !proc_holder || !proc_name)
-			return
-		addEventType(event_type)
-		var/list/event = events[event_type]
-		var/datum/events_event/E = new /datum/events_event(proc_holder,proc_name)
-		event += E
-		return E
-
-	//  Arguments: event_type as text, any number of additional arguments to pass to event handler
-	//  Returns: null
-	proc/fireEvent()
-//		to_chat(world, "Events in [args[1]] called")
-		var/list/event = listgetindex(events,args[1])
-		if(istype(event))
-			spawn(-1)
-				for(var/datum/events_event/E in event)
-					if(!E.Fire(arglist(args.Copy(2))))
-						clearEvent(args[1],E)
-		return
-
-	// Arguments: event_type as text, E as /datum/events_event
-	// Returns: 1 if event cleared, null on error
-	proc/clearEvent(event_type as text, datum/events_event/E)
-		if(!event_type || !E)
-			return
-		var/list/event = listgetindex(events,event_type)
-		event -= E
+/datum/events/proc/addEventType(event_type as text)
+	if(!(event_type in events) || !islist(events[event_type]))
+		events[event_type] = list()
 		return 1
+	return
 
 
-/datum/events_event
+//	Arguments: event_type as text, proc_holder as datum, proc_name as text
+//	Returns: New event, null on error.
+/datum/events/proc/addEvent(event_type as text, proc_holder, proc_name as text)
+	if(!event_type || !proc_holder || !proc_name)
+		return
+	addEventType(event_type)
+	var/list/event = events[event_type]
+	var/datum/event/E = new /datum/event(proc_holder,proc_name)
+	event += E
+	return E
+
+//  Arguments: event_type as text, any number of additional arguments to pass to event handler
+//  Returns: null
+/datum/events/proc/fireEvent()
+	//world << "Events in [args[1]] called"
+	var/list/event = listgetindex(events,args[1])
+	if(istype(event))
+		spawn(0)
+			for(var/datum/event/E in event)
+				if(!E.Fire(arglist(args.Copy(2))))
+					clearEvent(args[1],E)
+	return
+
+// Arguments: event_type as text, E as /datum/event
+// Returns: 1 if event cleared, null on error
+
+/datum/events/proc/clearEvent(event_type as text, datum/event/E)
+	if(!event_type || !E)
+		return
+	var/list/event = listgetindex(events,event_type)
+	event -= E
+	return 1
+
+
+/datum/event
 	var/listener
 	var/proc_name
 
-	New(tlistener,tprocname)
-		listener = tlistener
-		proc_name = tprocname
-		return ..()
+/datum/event/New(tlistener,tprocname)
+	listener = tlistener
+	proc_name = tprocname
+	return ..()
 
-	proc/Fire()
-//		to_chat(world, "Event fired")
-		if(listener)
-			call(listener,proc_name)(arglist(args))
-			return 1
-		return
+/datum/event/proc/Fire()
+	//world << "Event fired"
+	if(listener)
+		call(listener,proc_name)(arglist(args))
+		return 1
+	return

code/datums/mind.dm

@@ -75,6 +75,9 @@
 	//put this here for easier tracking ingame
 	var/datum/money_account/initial_account
 
+	//zealot_master is a reference to the mob that converted them into a zealot (for ease of investigation and such)
+	var/mob/living/carbon/human/zealot_master = null
+
 /datum/mind/proc/transfer_to(mob/living/new_character)
 	if(!istype(new_character))
 		log_to_dd("## DEBUG: transfer_to(): Some idiot has tried to transfer_to() a non mob/living mob. Please inform Carn")
@@ -1476,6 +1479,72 @@
 	if(G)
 		G.reenter_corpse()
 
+/datum/mind/proc/make_zealot(mob/living/carbon/human/missionary, convert_duration = 6000, team_color = "red")
+	if(!missionary || !istype(missionary))		//better provide a proper missionary or the rest of this is gonna break
+		return 0
+
+	zealot_master = missionary
+
+	var/list/implanters
+	var/ref = "\ref[missionary.mind]"
+	if(!(missionary.mind in ticker.mode.implanter))
+		ticker.mode.implanter[ref] = list()
+	implanters = ticker.mode.implanter[ref]
+	implanters.Add(src)
+	ticker.mode.implanted.Add(src)
+	ticker.mode.implanted[src] = missionary.mind
+	//ticker.mode.implanter[missionary.mind] += src
+	ticker.mode.implanter[ref] = implanters
+	ticker.mode.traitors += src
+	special_role = "traitor"
+	to_chat(current, "<span class='warning'><B>You're now a loyal zealot of [missionary.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost.</span>")
+	var/datum/objective/protect/mindslave/MS = new
+	MS.owner = src
+	MS.target = missionary.mind
+	MS.explanation_text = "Obey every order from and protect [missionary.real_name], the [missionary.mind.assigned_role=="MODE" ? (missionary.mind.special_role) : (missionary.mind.assigned_role)]."
+	objectives += MS
+	for(var/datum/objective/objective in objectives)
+		to_chat(current, "<B>Objective #1</B>: [objective.explanation_text]")
+
+	ticker.mode.update_traitor_icons_added(missionary.mind)
+	ticker.mode.update_traitor_icons_added(src)//handles datahuds/observerhuds
+
+	if(missionary.mind.som)//do not add if not a traitor..and you just picked up a robe and staff in the hall...
+		var/datum/mindslaves/slaved = missionary.mind.som
+		som = slaved
+		slaved.serv += current
+		slaved.add_serv_hud(missionary.mind, "master") //handles master servent icons
+		slaved.add_serv_hud(src, "mindslave")
+
+	var/obj/item/clothing/under/jumpsuit = null
+	if(ishuman(current))		//only bother with the jumpsuit stuff if we are a human type, since we won't have the slot otherwise
+		var/mob/living/carbon/human/H = current
+		if(H.w_uniform)
+			jumpsuit = H.w_uniform
+			jumpsuit.color = team_color
+			H.update_inv_w_uniform(0,0)
+
+	log_admin("[ckey(missionary.key)] has converted [ckey(current.key)] as a zealot.")
+	addtimer(src, "remove_zealot", convert_duration, FALSE, jumpsuit)	//deconverts after the timer expires
+
+	return 1
+
+/datum/mind/proc/remove_zealot(obj/item/clothing/under/jumpsuit = null)
+	if(!zealot_master)	//if they aren't a zealot, we can't remove their zealot status, obviously. don't bother with the rest so we don't confuse them with the messages
+		return
+	ticker.mode.remove_traitor_mind(src)
+	log_admin("[ckey(current.key)] has deconverted and is no longer a zealot of [ckey(zealot_master.key)].")
+	zealot_master = null
+
+	if(jumpsuit)
+		jumpsuit.color = initial(jumpsuit.color)		//reset the jumpsuit no matter where our mind is
+		if(ishuman(current))							//but only try updating us if we are still a human type since it is a human proc
+			var/mob/living/carbon/human/H = current
+			H.update_inv_w_uniform(0,0)
+
+	to_chat(current, "<span class='warning'>You seem to have forgotten the events of the past 10 minutes or so, and your head aches a bit as if someone beat it savagely with a stick.</span>")
+	to_chat(current, "<span class='warning'>This means you don't remember who you were working for or what you were doing.</span>")
+
 //Initialisation procs
 /mob/proc/mind_initialize()
 	if(mind)

code/datums/supplypacks.dm

@@ -1198,10 +1198,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
 					/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater,
 					/obj/item/weapon/storage/bible/booze,
 					/obj/item/weapon/storage/bible/booze,
-					/obj/item/clothing/suit/chaplain_hoodie,
-					/obj/item/clothing/head/chaplain_hood,
-					/obj/item/clothing/suit/chaplain_hoodie,
-					/obj/item/clothing/head/chaplain_hood)
+					/obj/item/clothing/suit/hooded/chaplain_hoodie,
+					/obj/item/clothing/suit/hooded/chaplain_hoodie)
 	cost = 40
 	containername = "religious supplies crate"
 

code/datums/uplink_item.dm

@@ -180,6 +180,14 @@ var/list/uplink_items = list()
 	cost = 13
 	job = list("Chaplain")
 
+/datum/uplink_item/jobspecific/missionary_kit
+	name = "Missionary Starter Kit"
+	desc = "A box containing a missionary staff, missionary robes, and bible. The robes and staff can be linked to allow you to convert victims at range for a short time to do your bidding. The bible is for bible stuff."
+	reference = "MK"
+	item = /obj/item/weapon/storage/box/syndie_kit/missionary_set
+	cost = 15
+	job = list("Chaplain")
+
 /datum/uplink_item/jobspecific/artistic_toolbox
 	name = "Artistic Toolbox"
 	desc = "An accursed toolbox that grants its followers extreme power at the cost of requiring repeated sacrifices to it. If sacrifices are not provided, it will turn on its follower."
@@ -309,7 +317,7 @@ var/list/uplink_items = list()
 	item = /obj/item/clothing/under/contortionist
 	cost = 6
 	job = list("Life Support Specialist")
-	
+
 /datum/uplink_item/dangerous/energizedfireaxe
 	name = "Energized Fire Axe"
 	desc = "A fire axe with a massive electrical charge built into it. It can release this charge on its first victim and will be rather plain after that."

code/game/area/Space Station 13 areas.dm

@@ -308,6 +308,10 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Syndicate Elite Shuttle"
 	icon_state = "shuttlered2"
 
+/area/shuttle/syndicate_sit
+	name = "\improper Syndicate SIT Shuttle"
+	icon_state = "shuttlered"
+
 /area/shuttle/assault_pod
 	name = "Steel Rain"
 	icon_state = "shuttle"
@@ -440,7 +444,7 @@ var/list/ghostteleportlocs = list()
 	icon_state = "shuttle"
 
 /area/shuttle/syndicate
-	name = "Syndicate Infiltrator"
+	name = "Syndicate Nuclear Team Shuttle"
 	icon_state = "shuttle"
 
 /area/shuttle/trade
@@ -526,6 +530,10 @@ var/list/ghostteleportlocs = list()
 	name = "\improper Syndicate Elite Squad"
 	icon_state = "syndie-elite"
 
+/area/syndicate_mothership/infteam
+	name = "\improper Syndicate Infiltrators"
+	icon_state = "syndie-elite"
+
 /area/syndicate_depot
 	name = "\improper Suspicious Supply Depot"
 	icon_state = "red"

code/game/atoms_movable.dm

@@ -345,3 +345,22 @@
 	if(buckled_mob == mover)
 		return 1
 	return ..()
+
+/atom/movable/proc/get_spacemove_backup()
+	var/atom/movable/dense_object_backup
+	for(var/A in orange(1, get_turf(src)))
+		if(isarea(A))
+			continue
+		else if(isturf(A))
+			var/turf/turf = A
+			if(!turf.density)
+				continue
+			return turf
+		else
+			var/atom/movable/AM = A
+			if(!AM.CanPass(src) || AM.density)
+				if(AM.anchored)
+					return AM
+				dense_object_backup = AM
+				break
+	. = dense_object_backup

code/game/gamemodes/mutiny/auth_key.dm

@@ -1,39 +0,0 @@
-/obj/item/weapon/mutiny/auth_key
-	name = "authentication key"
-	desc = "Better keep this safe."
-	icon = 'icons/obj/items.dmi'
-	icon_state = "nucleardisk"
-	item_state = "card-id"
-	w_class = 1
-
-	var/time_entered_space
-	var/obj/item/device/radio/radio
-
-	New()
-		radio = new(src)
-		spawn(20 SECONDS)
-			keep_alive()
-		..()
-
-	proc/keep_alive()
-		var/in_space = istype(loc, /turf/space)
-		if(!in_space && time_entered_space)
-			// Recovered before the key was lost
-			time_entered_space = null
-		else if(in_space && !time_entered_space)
-			// The key has left the station
-			time_entered_space = world.time
-		else if(in_space && time_entered_space + (10 SECONDS) < world.time)
-			// Time is up
-			radio.autosay("This device has left the station's perimeter. Triggering emergency activation failsafe.", name)
-			qdel(src)
-			return
-
-		spawn(10 SECONDS)
-			keep_alive()
-
-/obj/item/weapon/mutiny/auth_key/captain
-	name = "Captain's Authentication Key"
-
-/obj/item/weapon/mutiny/auth_key/secondary
-	name = "Emergency Secondary Authentication Key"

code/game/gamemodes/mutiny/directive.dm

@@ -1,32 +0,0 @@
-datum/directive
-	var/datum/game_mode/mutiny/mode
-	var/list/special_orders
-
-	New(var/datum/game_mode/mutiny/M)
-		mode = M
-
-	proc/get_description()
-		return {"
-			<p>
-				Nanotrasen's reasons for the following directives are classified.
-			</p>
-		"}
-
-	proc/meets_prerequisites()
-		return 0
-
-	proc/directives_complete()
-		return 1
-
-	proc/initialize()
-		return 1
-
-	proc/get_remaining_orders()
-		return ""
-
-/proc/get_directive(type)
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode || !mode.current_directive || !istype(mode.current_directive, text2path("/datum/directive/[type]")))
-		return null
-
-	return mode.current_directive

code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm

@@ -1,41 +0,0 @@
-datum/directive/terminations/alien_fraud
-	special_orders = list(
-		"Suspend financial accounts of all Tajaran and Unathi personnel.",
-		"Transfer their payrolls to the station account.",
-		"Terminate their employment.")
-
-	proc/is_alien(mob/M)
-		var/species = M.get_species()
-		return species == "Tajaran" || species == "Unathi"
-
-datum/directive/terminations/alien_fraud/get_crew_to_terminate()
-	var/list/aliens[0]
-	for(var/mob/M in player_list)
-		if(M.is_ready() && is_alien(M) && M != mode.head_loyalist.current)
-			aliens.Add(M)
-	return aliens
-
-datum/directive/terminations/alien_fraud/get_description()
-	return {"
-		<p>
-			An extensive conspiracy network aimed at defrauding Nanotrasen of large amounts of funds has been uncovered
-			operating within [system_name()]. Human personnel are not suspected to be involved. Further information is classified.
-		</p>
-	"}
-
-datum/directive/terminations/alien_fraud/meets_prerequisites()
-	// There must be at least one Tajaran and at least one Unathi, but the total
-	// of the Tajarans and Unathi combined can't be more than 1/3rd of the crew.
-	var/tajarans = 0
-	var/unathi = 0
-	for(var/mob/M in player_list)
-		var/species = M.get_species()
-		if(species == "Tajaran")
-			tajarans++
-		if(species == "Unathi")
-			unathi++
-
-	if(!tajarans || !unathi)
-		return 0
-
-	return (tajarans + unathi) <= (player_list.len / 3)

code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm

@@ -1,58 +0,0 @@
-#define INFECTION_COUNT 5
-
-datum/directive/bluespace_contagion
-	var/list/infected = list()
-
-	proc/get_infection_candidates()
-		var/list/candidates[0]
-		for(var/mob/M in player_list)
-			if(M.is_ready() && !M.is_mechanical() && M != mode.head_loyalist.current)
-				candidates.Add(M)
-		return candidates
-
-datum/directive/bluespace_contagion/get_description()
-	return {"
-		<p>
-			A manufactured and near-undetectable virus is spreading on Nanotrasen stations.
-			The pathogen travels by bluespace after maturing for one day and meets the Sol Health Organisation standards for a class X biological threat, warranting use of lethal force to contain an outbreak.
-			No treatment has yet been discovered. Personnel onboard [station_name()] have been infected. Further information is classified.
-		</p>
-	"}
-
-datum/directive/bluespace_contagion/initialize()
-	var/list/candidates = get_infection_candidates()
-	var/list/infected_names = list()
-	for(var/i=0, i < INFECTION_COUNT, i++)
-		if(!candidates.len)
-			break
-
-		var/mob/candidate = pick(candidates)
-		candidates-=candidate
-		infected+=candidate
-		infected_names+="[candidate.mind.assigned_role] [candidate.mind.name]"
-
-	special_orders = list(
-		"Quarantine these personnel: [jointext(infected_names, ", ")].",
-		"Allow one hour for a cure to be manufactured.",
-		"If no cure arrives after that time, execute and burn the infected.")
-
-datum/directive/bluespace_contagion/meets_prerequisites()
-	var/list/candidates = get_infection_candidates()
-	return candidates.len >= 7
-
-datum/directive/bluespace_contagion/directives_complete()
-	return infected.len == 0
-
-datum/directive/bluespace_contagion/get_remaining_orders()
-	var/text = ""
-	for(var/victim in infected)
-		text += "<li>Kill [victim]</li>"
-	return text
-
-/hook/death/proc/infected_killed(mob/living/carbon/human/deceased, gibbed)
-	var/datum/directive/bluespace_contagion/D = get_directive("bluespace_contagion")
-	if(!D) return 1
-
-	if(deceased in D.infected)
-		D.infected-=deceased
-	return 1

code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm

@@ -1,26 +0,0 @@
-datum/directive/terminations/financial_crisis
-	special_orders = list(
-		"Suspend financial accounts of all support personnel, excluding the Head of Personnel.",
-		"Transfer their payrolls to the station account.",
-		"Terminate their employment.")
-
-datum/directive/terminations/financial_crisis/get_crew_to_terminate()
-	var/list/support[0]
-	var/list/candidates = support_positions - "Head of Personnel"
-	for(var/mob/M in player_list)
-		if(M.is_ready() && candidates.Find(M.mind.assigned_role))
-			support+=(M)
-	return support
-
-datum/directive/terminations/financial_crisis/get_description()
-	return {"
-		<p>
-			[system_name()] system banks in financial crisis. Local emergency situation ongoing.
-			NT Funds redistributed in accordance with financial regulations covered by employee contracts, impact upon civilian department expected.
-			Further information is classified.
-		</p>
-	"}
-
-datum/directive/terminations/financial_crisis/meets_prerequisites()
-	var/list/support = get_crew_to_terminate()
-	return support.len >= 5

code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm

@@ -1,96 +0,0 @@
-datum/directive/ipc_virus
-	special_orders = list(
-		"Terminate employment of all IPC personnel.",
-		"Extract the Positronic Brains from IPC units.",
-		"Mount the Positronic Brains into Cyborgs.")
-
-	var/list/roboticist_roles = list(
-		"Research Director",
-		"Roboticist"
-	)
-
-	var/list/brains_to_enslave = list()
-	var/list/cyborgs_to_make = list()
-	var/list/ids_to_terminate = list()
-
-	proc/get_ipcs()
-		var/list/machines[0]
-		for(var/mob/M in player_list)
-			if(M.is_ready() && M.get_species() == "Machine")
-				machines+=(M)
-		return machines
-
-	proc/get_roboticists()
-		var/list/roboticists[0]
-		for(var/mob/M in player_list)
-			if(M.is_ready() && roboticist_roles.Find(M.mind.assigned_role))
-				roboticists+=(M)
-		return roboticists
-
-datum/directive/ipc_virus/initialize()
-	for(var/mob/living/carbon/human/H in get_ipcs())
-		brains_to_enslave+=H.mind
-		cyborgs_to_make+=H.mind
-		ids_to_terminate+=H.wear_id
-
-datum/directive/ipc_virus/get_description()
-	return {"
-		<p>
-			IPC units have been found to be infected with a violent and undesired virus in Virgus Ferrorus system.
-			Risk to [station_name()] IPC units has not been assessed. Further information is classified.
-		</p>
-	"}
-
-datum/directive/ipc_virus/meets_prerequisites()
-	var/list/ipcs = get_ipcs()
-	var/list/roboticists = get_roboticists()
-	return ipcs.len > 2 && roboticists.len > 1
-
-datum/directive/ipc_virus/directives_complete()
-	return brains_to_enslave.len == 0 && cyborgs_to_make.len == 0 && ids_to_terminate.len == 0
-
-datum/directive/ipc_virus/get_remaining_orders()
-	var/text = ""
-	for(var/brain in brains_to_enslave)
-		text += "<li>Debrain [brain]</li>"
-
-	for(var/brain in cyborgs_to_make)
-		text += "<li>Enslave [brain] as a Cyborg</li>"
-
-	for(var/id in ids_to_terminate)
-		text += "<li>Terminate [id]</li>"
-
-	return text
-
-/hook/debrain/proc/debrain_directive(var/obj/item/organ/internal/brain/B)
-	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if(!D) return 1
-
-	if(D.brains_to_enslave.Find(B.brainmob.mind))
-		D.brains_to_enslave-=B.brainmob.mind
-
-	return 1
-
-/hook/borgify/proc/borgify_directive(mob/living/silicon/robot/cyborg)
-	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if(!D) return 1
-
-	if(D.cyborgs_to_make.Find(cyborg.mind))
-		D.cyborgs_to_make-=cyborg.mind
-
-	// In case something glitchy happened and the victim got
-	// borged without us tracking the brain removal, go ahead
-	// and update that list too.
-	if(D.brains_to_enslave.Find(cyborg.mind))
-		D.brains_to_enslave-=cyborg.mind
-
-	return 1
-
-/hook/terminate_employee/proc/ipc_termination(obj/item/weapon/card/id)
-	var/datum/directive/ipc_virus/D = get_directive("ipc_virus")
-	if(!D) return 1
-
-	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
-		D.ids_to_terminate-=id
-
-	return 1

code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm

@@ -1,79 +0,0 @@
-#define MATERIALS_REQUIRED 200
-
-datum/directive/research_to_ripleys
-	var/list/ids_to_reassign = list()
-	var/materials_shipped = 0
-
-	proc/is_researcher(mob/M)
-		return M.mind.assigned_role in science_positions - "Research Director"
-
-	proc/get_researchers()
-		var/list/researchers[0]
-		for(var/mob/M in player_list)
-			if(M.is_ready() && is_researcher(M))
-				researchers+=(M)
-		return researchers
-
-	proc/count_researchers_reassigned()
-		var/researchers_reassigned = 0
-		for(var/obj/item/weapon/card/id in ids_to_reassign)
-			if(ids_to_reassign[id])
-				researchers_reassigned++
-
-		return researchers_reassigned
-
-datum/directive/research_to_ripleys/get_description()
-	return {"
-		<p>
-			The Nanotrasen [system_name()] Manufactory faces an ore deficit. Financial crisis imminent. [station_name()] has been reassigned as a mining platform.
-			The Research Director is to assist the Head of Personnel in coordinating assets.
-			Weapons department reports solid sales. Further information is classified.
-		</p>
-	"}
-
-datum/directive/research_to_ripleys/meets_prerequisites()
-	var/list/researchers = get_researchers()
-	return researchers.len > 3
-
-datum/directive/research_to_ripleys/initialize()
-	for(var/mob/living/carbon/human/R in get_researchers())
-		ids_to_reassign[R.wear_id] = 0
-
-	special_orders = list(
-		"Reassign all research personnel, excluding the Research Director, to Shaft Miner.",
-		"Deliver [MATERIALS_REQUIRED] sheets of metal or minerals via the supply shuttle to CentComm.")
-
-datum/directive/research_to_ripleys/directives_complete()
-	if(materials_shipped < MATERIALS_REQUIRED) return 0
-	return count_researchers_reassigned() == ids_to_reassign.len
-
-datum/directive/research_to_ripleys/get_remaining_orders()
-	var/text = ""
-	if(MATERIALS_REQUIRED > materials_shipped)
-		text += "<li>Ship [MATERIALS_REQUIRED - materials_shipped] sheets of metal or minerals.</li>"
-
-	for(var/id in ids_to_reassign)
-		if(!ids_to_reassign[id])
-			text += "<li>Reassign [id] to Shaft Miner</li>"
-
-	return text
-
-/hook/reassign_employee/proc/research_reassignments(obj/item/weapon/card/id/id_card)
-	var/datum/directive/research_to_ripleys/D = get_directive("research_to_ripleys")
-	if(!D) return 1
-
-	if(D.ids_to_reassign && D.ids_to_reassign.Find(id_card))
-		D.ids_to_reassign[id_card] = id_card.assignment == "Shaft Miner" ? 1 : 0
-
-	return 1
-
-/hook/sell_crate/proc/deliver_materials(obj/structure/closet/crate/sold, area/shuttle)
-	var/datum/directive/research_to_ripleys/D = get_directive("research_to_ripleys")
-	if(!D) return 1
-
-	for(var/atom/A in sold)
-		if(istype(A, /obj/item/stack/sheet/mineral) || istype(A, /obj/item/stack/sheet/metal))
-			var/obj/item/stack/S = A
-			D.materials_shipped += S.amount
-
-	return 1

code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm

@@ -1,108 +0,0 @@
-datum/directive/tau_ceti_needs_women
-	var/list/command_targets = list()
-	var/list/alien_targets = list()
-
-	proc/get_target_gender()
-		if(!mode.head_loyalist) return FEMALE
-		return mode.head_loyalist.current.get_gender() == FEMALE ? MALE : FEMALE
-
-	proc/is_target_gender(mob/M)
-		var/species = M.get_species()
-		return species != "Diona" && M.get_gender() == get_target_gender()
-
-	proc/get_crew_of_target_gender()
-		var/list/targets[0]
-		for(var/mob/M in player_list)
-			if(M.is_ready() && is_target_gender(M) && !M.is_mechanical())
-				targets+=(M)
-		return targets
-
-	proc/get_target_heads()
-		var/list/heads[0]
-		for(var/mob/M in get_crew_of_target_gender())
-			if(command_positions.Find(M.mind.assigned_role))
-				heads+=(M)
-		return heads
-
-	proc/get_target_aliens()
-		var/list/aliens[0]
-		for(var/mob/M in get_crew_of_target_gender())
-			var/species = M.get_species()
-			if(species == "Tajaran" || species == "Unathi" || species == "Skrell")
-				aliens+=(M)
-		return aliens
-
-	proc/count_heads_reassigned()
-		var/heads_reassigned = 0
-		for(var/obj/item/weapon/card/id in command_targets)
-			if(command_targets[id])
-				heads_reassigned++
-
-		return heads_reassigned
-
-datum/directive/tau_ceti_needs_women/get_description()
-	return {"
-		<p>
-			Recent evidence suggests [get_target_gender()] aptitudes may be effected by radiation from [system_name()].
-			Effects were measured under laboratory and station conditions. Humans remain more trusted than Xeno. Further information is classified.
-		</p>
-	"}
-
-datum/directive/tau_ceti_needs_women/initialize()
-	for(var/mob/living/carbon/human/H in get_target_heads())
-		command_targets[H.wear_id] = 0
-
-	for(var/mob/living/carbon/human/H in get_target_aliens())
-		alien_targets+=H.wear_id
-
-	special_orders = list(
-		"Remove [get_target_gender()] personnel from Command positions.",
-		"Terminate employment of all [get_target_gender()] Skrell, Tajara, and Unathi.")
-
-datum/directive/tau_ceti_needs_women/meets_prerequisites()
-	var/females = 0
-	var/males = 0
-	for(var/mob/M in player_list)
-		if(M.is_ready() && !M.is_mechanical() && M.get_species() != "Diona")
-			var/gender = M.get_gender()
-			if(gender == MALE)
-				males++
-			else if(gender == FEMALE)
-				females++
-
-	return males >= 2 && females >= 2
-
-datum/directive/tau_ceti_needs_women/directives_complete()
-	return command_targets.len == count_heads_reassigned() && alien_targets.len == 0
-
-datum/directive/tau_ceti_needs_women/get_remaining_orders()
-	var/text = ""
-	for(var/head in command_targets)
-		if(!command_targets[head])
-			text += "<li>Remove [head] from a Head Role</li>"
-
-	for(var/id in alien_targets)
-		text += "<li>Terminate [id]</li>"
-
-	return text
-
-/hook/reassign_employee/proc/command_reassignments(obj/item/weapon/card/id/id_card)
-	var/datum/directive/tau_ceti_needs_women/D = get_directive("tau_ceti_needs_women")
-	if(!D) return 1
-
-	if(D.command_targets && D.command_targets.Find(id_card))
-		D.command_targets[id_card] = command_positions.Find(id_card.assignment) ? 0 : 1
-
-	return 1
-
-/hook/terminate_employee/proc/gender_target_termination_directive(obj/item/weapon/card/id)
-	var/datum/directive/tau_ceti_needs_women/D = get_directive("tau_ceti_needs_women")
-	if(!D) return 1
-
-	if(D.alien_targets && D.alien_targets.Find(id))
-		D.alien_targets-=id
-
-	if(D.command_targets && D.command_targets.Find(id))
-		D.command_targets[id] = 1
-
-	return 1

code/game/gamemodes/mutiny/directives/terminations_directive.dm

@@ -1,71 +0,0 @@
-// This is a parent directive meant to be derived by directives that fit
-// the "fire X type of employee" pattern of directives. Simply apply your
-// flavor text and override get_crew_to_terminate in your child datum.
-// See alien_fraud_directive.dm for an example.
-datum/directive/terminations
-	var/list/accounts_to_revoke = list()
-	var/list/accounts_to_suspend = list()
-	var/list/ids_to_terminate = list()
-
-	proc/get_crew_to_terminate()
-		return list()
-
-datum/directive/terminations/directives_complete()
-	for(var/account_number in accounts_to_suspend)
-		if(!accounts_to_suspend[account_number])
-			return 0
-
-	for(var/account_number in accounts_to_revoke)
-		if(!accounts_to_revoke[account_number])
-			return 0
-
-	return ids_to_terminate.len == 0
-
-datum/directive/terminations/initialize()
-	for(var/mob/living/carbon/human/H in get_crew_to_terminate())
-		var/datum/money_account/account = H.mind.initial_account
-		accounts_to_revoke["[account.account_number]"] = 0
-		accounts_to_suspend["[account.account_number]"] = account.suspended
-		ids_to_terminate+=(H.wear_id)
-
-datum/directive/terminations/get_remaining_orders()
-	var/text = ""
-	for(var/account_number in accounts_to_suspend)
-		if(!accounts_to_suspend[account_number])
-			text += "<li>Suspend Account #[account_number]</li>"
-
-	for(var/account_number in accounts_to_revoke)
-		if(!accounts_to_revoke[account_number])
-			text += "<li>Revoke Account #[account_number]</li>"
-
-	for(var/id in ids_to_terminate)
-		text += "<li>Terminate [id]</li>"
-
-	return text
-
-/hook/revoke_payroll/proc/payroll_directive(datum/money_account/account)
-	var/datum/directive/terminations/D = get_directive("terminations")
-	if(!D) return 1
-
-	if(D.accounts_to_revoke && D.accounts_to_revoke.Find("[account.account_number]"))
-		D.accounts_to_revoke["[account.account_number]"] = 1
-
-	return 1
-
-/hook/change_account_status/proc/suspension_directive(datum/money_account/account)
-	var/datum/directive/terminations/D = get_directive("terminations")
-	if(!D) return 1
-
-	if(D.accounts_to_suspend && D.accounts_to_suspend.Find("[account.account_number]"))
-		D.accounts_to_suspend["[account.account_number]"] = account.suspended
-
-	return 1
-
-/hook/terminate_employee/proc/termination_directive(obj/item/weapon/card/id)
-	var/datum/directive/terminations/D = get_directive("terminations")
-	if(!D) return 1
-
-	if(D.ids_to_terminate && D.ids_to_terminate.Find(id))
-		D.ids_to_terminate-=id
-
-	return 1

code/game/gamemodes/mutiny/directives/test_directive.dm

@@ -1,23 +0,0 @@
-// For testing
-datum/directive/terminations/test
-	special_orders = list(
-		"Suspend financial accounts of all ugly personnel.",
-		"Transfer their payrolls to the station account.",
-		"Terminate their employment.")
-
-datum/directive/terminations/test/get_crew_to_terminate()
-	var/list/uglies[0]
-	for(var/mob/M in player_list)
-		uglies+=(M)
-	return uglies
-
-datum/directive/terminations/test/get_description()
-	return {"
-		<p>
-			Wow. Much ugly. So painful.
-			Many terminations. Very classified.
-		</p>
-	"}
-
-datum/directive/terminations/test/meets_prerequisites()
-	return 1

code/game/gamemodes/mutiny/directives/vox_heist.dm

@@ -1,111 +0,0 @@
-datum/directive/vox_heist
-  var/list/vox = list()
-  var/list/sympathizers = list()
-
-  proc/get_vox_candidates()
-    var/list/candidates[0]
-    for(var/mob/M in player_list)
-      if(M.is_ready() && is_vox(M))
-        candidates.Add(M)
-    return candidates
-
-  proc/get_sympathizer_candidates()
-    var/list/candidates[0]
-    for(var/mob/M in player_list)
-      if(M.is_ready() && !is_vox(M) && !M.is_mechanical() && M.mind.assigned_role != "Captain")
-        candidates[M] = get_weight(M)
-    return candidates
-
-  proc/is_vox(mob/M)
-    return M.get_species() == "Vox"
-
-  proc/get_weight(mob/M)
-    // You will have a high chance of being regarded as a vox sympathizer if your
-    // relationship with Nanotrasen is negative. Otherwise, command and security
-    // staff are pretty well trusted and maltreated alien races are easy suspects.
-    var/relation = M.client.prefs.nanotrasen_relation
-    if(relation == "Opposed")
-      return 8
-    if(relation == "Skeptical")
-      return 5
-    if(command_positions.Find(M.mind.assigned_role))
-      return 1
-    var/species = M.get_species()
-    if(species == "Tajaran" || species == "Unathi")
-      return 5
-    if(security_positions.Find(M.mind.assigned_role))
-      return 2
-    return 3
-
-datum/directive/vox_heist/get_description()
-  return {"
-    <p>
-      A vox warship has commandeered a Nanotrasen transport carrying 2,500 cubic meters of liquid plasma.
-      The raiders are willing to return the stolen cargo in exchange for the capture or execution of so-called "vox pariah" that are stationed aboard [station_name()].
-      If the transport is not recovered, the estimated loss of profits is a threat to the solvency of the company.
-      Predictive analysis has identified certain members of the crew as sympathetic to the vox pariah. Detain the sympathizers to guarantee a successful exchange.
-      Lethal force is authorized by the High Command Department of Security. Further information is classified.
-    </p>
-  "}
-
-datum/directive/vox_heist/initialize()
-  var/list/vox_candidates = get_vox_candidates()
-  for(var/mob/pariah in vox_candidates)
-    vox.Add(pariah.mind)
-
-  special_orders = list(
-    "Brig or kill all Vox Pariah.")
-
-  var/list/sympathizer_candidates = get_sympathizer_candidates()
-  var/list/sympathizer_names = list()
-  var/sympathizer_count = min(rand(2,4), sympathizer_candidates.len)
-  for(var/i=0, i < sympathizer_count, i++)
-    if(!sympathizer_candidates.len)
-      break
-
-    var/mob/candidate = pickweight(sympathizer_candidates)
-    sympathizer_candidates.Remove(candidate)
-    sympathizers.Add(candidate.mind)
-    sympathizer_names.Add("[candidate.mind.assigned_role] [candidate.mind.name]")
-
-  if(sympathizers.len)
-    special_orders.Add("Brig the following sympathizers: [jointext(sympathizer_names, ", ")]")
-
-datum/directive/vox_heist/meets_prerequisites()
-  var/list/candidates = get_vox_candidates()
-  return candidates.len >= 2
-
-datum/directive/vox_heist/directives_complete()
-  if(!vox.len && !sympathizers.len)
-    return 1
-
-  for(var/datum/mind/pariah in vox)
-    if(!pariah.current.is_in_brig())
-      return 0
-
-  for(var/datum/mind/sympathizer in sympathizers)
-    if(!sympathizer.current.is_in_brig())
-      return 0
-
-  return 1
-
-datum/directive/vox_heist/get_remaining_orders()
-  var/text = ""
-  for(var/datum/mind/pariah in vox)
-    if(!pariah.current.is_in_brig())
-      text += "<li>Brig or Kill [pariah]</li>"
-  for(var/datum/mind/sympathizer in sympathizers)
-    if(!sympathizer.current.is_in_brig())
-      text += "<li>Brig [sympathizer]</li>"
-  return text
-
-/hook/death/proc/vox_or_sympathizer_killed(mob/living/carbon/human/deceased, gibbed)
-  var/datum/directive/vox_heist/D = get_directive("vox_heist")
-  if(!D) return 1
-
-  var/datum/mind/M = deceased.mind
-  if(M in D.vox)
-    D.vox.Remove(M)
-  if(M in D.sympathizers)
-    D.sympathizers.Remove(M)
-  return 1

code/game/gamemodes/mutiny/emergency_authentication_device.dm

@@ -1,112 +0,0 @@
-/obj/machinery/emergency_authentication_device
-	var/datum/game_mode/mutiny/mode
-
-	name = "\improper Emergency Authentication Device"
-	icon = 'icons/obj/stationobjs.dmi'
-	icon_state = "blackbox"
-	density = 1
-	anchored = 1
-
-	var/captains_key
-	var/secondary_key
-	var/activated = 0
-
-	use_power = 0
-
-	New(loc, mode)
-		src.mode = mode
-		..(loc)
-
-	proc/check_key_existence()
-		if(!mode.captains_key)
-			captains_key = 1
-
-		if(!mode.secondary_key)
-			secondary_key = 1
-
-	proc/get_status()
-		if(activated)
-			return "Activated"
-		if(captains_key && secondary_key)
-			return "Both Keys Authenticated"
-		if(captains_key)
-			return "Captain's Key Authenticated"
-		if(secondary_key)
-			return "Secondary Key Authenticated"
-		else
-			return "Inactive"
-
-	proc/launch_shuttle()
-		spawn(rand(5 SECONDS, 45 SECONDS))
-			if(shuttle_master.requestEvac(usr, "Directive X"))
-				spawn(20 SECONDS)
-					var/text = "[station_name()], we have confirmed your completion of Directive X. An evacuation shuttle is en route to receive your crew for debriefing."
-					command_announcement.Announce(text, "Emergency Transmission")
-
-/obj/machinery/emergency_authentication_device/attack_hand(mob/user)
-	if(activated)
-		to_chat(user, "\blue \The [src] is already active!")
-		return
-
-	if(!mode.current_directive.directives_complete())
-		atom_say("Command aborted. Communication with CentComm is prohibited until Directive X has been completed.")
-		return
-
-	check_key_existence()
-	if(captains_key && secondary_key)
-		activated = 1
-		to_chat(user, "\blue You activate \the [src]!")
-		atom_say("Command acknowledged. Initiating quantum entanglement relay to Nanotrasen High Command.")
-		launch_shuttle()
-		return
-
-	if(!captains_key && !secondary_key)
-		atom_say("Command aborted. Please present the authentication keys before proceeding.")
-		return
-
-	if(!captains_key)
-		atom_say("Command aborted. Please present the Captain's Authentication Key.")
-		return
-
-	if(!secondary_key)
-		atom_say("Command aborted. Please present the Emergency Secondary Authentication Key.")
-		return
-
-	// Impossible!
-	atom_say("Command aborted. This unit is defective.")
-
-/obj/machinery/emergency_authentication_device/attackby(obj/item/weapon/O, mob/user, params)
-	if(activated)
-		to_chat(user, "\blue \The [src] is already active!")
-		return
-
-	if(!mode.current_directive.directives_complete())
-		atom_say("Command aborted. Communication with CentComm is prohibited until Directive X has been completed.")
-		return
-
-	check_key_existence()
-	if(istype(O, /obj/item/weapon/mutiny/auth_key/captain) && !captains_key)
-		captains_key = O
-		user.drop_item()
-		O.loc = src
-
-		atom_say("Key received. Thank you, Captain [mode.head_loyalist].")
-		spawn(5)
-			atom_say(secondary_key ? "Your keys have been authenticated. Communication with CentComm is now authorized." : "Please insert the Emergency Secondary Authentication Key now.")
-		return
-
-	if(istype(O, /obj/item/weapon/mutiny/auth_key/secondary) && !secondary_key)
-		secondary_key = O
-		user.drop_item()
-		O.loc = src
-
-		atom_say("Key received. Thank you, Secondary Authenticator [mode.head_mutineer].")
-		spawn(5)
-			atom_say(captains_key ? "Your keys have been authenticated. Communication with CentComm is now authorized." : "Please insert the Captain's Authentication Key now.")
-		return
-	..()
-
-/obj/machinery/emergency_authentication_device/examine(mob/user)
-	to_chat(user, {"This is a specialized communications device that is able to instantly send a message to <b>Nanotrasen High Command</b> via quantum entanglement
-	                with a sister device at CentComm.<br>
-			        The EAD's status is [get_status()]."})

code/game/gamemodes/mutiny/key_pinpointer.dm

@@ -1,35 +0,0 @@
-/obj/item/weapon/pinpointer/advpinpointer/auth_key
-	name = "\improper Authentication Key Pinpointer"
-	desc = "Tracks the positions of the emergency authentication keys."
-	var/datum/game_mode/mutiny/mutiny
-
-	New()
-		mutiny = ticker.mode
-		..()
-
-/obj/item/weapon/pinpointer/advpinpointer/auth_key/attack_self()
-	switch(mode)
-		if(0)
-			mode = 1
-			active = 1
-			target = mutiny.captains_key
-			point_at(target)
-			to_chat(usr, "\blue You calibrate \the [src] to locate the Captain's Authentication Key.")
-		if(1)
-			mode = 2
-			target = mutiny.secondary_key
-			to_chat(usr, "\blue You calibrate \the [src] to locate the Emergency Secondary Authentication Key.")
-		else
-			mode = 0
-			active = 0
-			icon_state = "pinoff"
-			to_chat(usr, "\blue You switch \the [src] off.")
-
-/obj/item/weapon/pinpointer/advpinpointer/auth_key/examine(mob/user)
-	switch(mode)
-		if(1)
-			to_chat(user, "Is is calibrated for the Captain's Authentication Key.")
-		if(2)
-			to_chat(user, "It is calibrated for the Emergency Secondary Authentication Key.")
-		else
-			to_chat(user, "It is switched off.")

code/game/gamemodes/mutiny/mutiny.dm

@@ -1,380 +0,0 @@
-#define MUTINY_RECRUITMENT_COOLDOWN 5
-
-datum/game_mode/mutiny
-	var/datum/mutiny_fluff/fluff
-	var/datum/directive/current_directive
-	var/obj/item/weapon/mutiny/auth_key/captain/captains_key
-	var/obj/item/weapon/mutiny/auth_key/secondary/secondary_key
-	var/obj/machinery/emergency_authentication_device/ead
-	var/datum/mind/head_loyalist
-	var/datum/mind/head_mutineer
-	var/recruit_loyalist_cooldown = 0
-	var/recruit_mutineer_cooldown = 0
-	var/list/loyalists = list()
-	var/list/mutineers = list()
-	var/list/body_count = list()
-
-	name = "mutiny"
-	config_tag = "mutiny"
-	required_players = 20
-	ert_disabled = 1
-
-	New()
-		fluff = new(src)
-
-	proc/reveal_directives()
-		spawn(rand(1 MINUTES, 3 MINUTES))
-			command_announcement.Announce("Incoming emergency directive: Captain's office fax machine, [station_name()].","Emergency Transmission")
-			spawn(rand(3 MINUTES, 5 MINUTES))
-				send_pda_message()
-			spawn(rand(3 MINUTES, 5 MINUTES))
-				fluff.announce_directives()
-				spawn(rand(2 MINUTES, 3 MINUTES))
-
-					var/list/reasons = list(
-						"political instability",
-						"quantum fluctuations",
-						"hostile raiders",
-						"derelict station debris",
-						"REDACTED",
-						"ancient alien artillery",
-						"solar magnetic storms",
-						"sentient time-travelling killbots",
-						"gravitational anomalies",
-						"wormholes to another dimension",
-						"a telescience mishap",
-						"radiation flares",
-						"supermatter dust",
-						"leaks into a negative reality",
-						"antiparticle clouds",
-						"residual bluespace energy",
-						"suspected syndicate operatives",
-						"malfunctioning von Neumann probe swarms",
-						"shadowy interlopers",
-						"a stranded Vox arkship",
-						"haywire IPC constructs",
-						"rogue Unathi exiles",
-						"artifacts of eldritch horror",
-						"a brain slug infestation",
-						"killer bugs that lay eggs in the husks of the living",
-						"a deserted transport carrying xenomorph specimens",
-						"an emissary for the gestalt requesting a security detail",
-						"a Tajaran slave rebellion",
-						"radical Skrellian transevolutionaries",
-						"classified security operations",
-						"science-defying raw elemental chaos"
-						)
-					command_announcement.Announce("The presence of [pick(reasons)] in the region is tying up all available local emergency resources; emergency response teams cannot be called at this time.","Emergency Transmission")
-
-	// Returns an array in case we want to expand on this later.
-	proc/get_head_loyalist_candidates()
-		var/list/candidates[0]
-		for(var/mob/loyalist in player_list)
-			if(loyalist.mind && loyalist.mind.assigned_role == "Captain")
-				candidates+=loyalist.mind
-		return candidates
-
-	proc/get_head_mutineer_candidates()
-		var/list/candidates[0]
-		for(var/mob/mutineer in player_list)
-			if(ROLE_MUTINEER in mutineer.client.prefs.be_special)
-				if(!jobban_isbanned(mutineer, "mutineer") && !jobban_isbanned(mutineer,"Syndicate"))
-					for(var/job in command_positions - "Captain")
-						if(mutineer.mind && mutineer.mind.assigned_role == job)
-							candidates+=mutineer.mind
-		return candidates
-
-	proc/get_directive_candidates()
-		var/list/candidates[0]
-		for(var/T in subtypesof(/datum/directive))
-			var/datum/directive/D = new T(src)
-//			to_chat(world, D.name)
-			if(D.meets_prerequisites())
-				candidates+=D
-		return candidates
-
-	proc/send_pda_message()
-		var/obj/item/device/pda/pda = null
-		for(var/obj/item/device/pda/P in head_mutineer.current)
-			pda = P
-			break
-
-		if(!pda)
-			return 0
-
-		var/datum/data/pda/app/messenger/pdam = pda.find_program(/datum/data/pda/app/messenger)
-		if(pdam)
-			pdam.notify(fluff.get_pda_body(), 0)
-		return 1
-
-	proc/get_equipment_slots()
-		return list(
-			"left pocket" = slot_l_store,
-			"right pocket" = slot_r_store,
-			"backpack" = slot_in_backpack,
-			"left hand" = slot_l_hand,
-			"right hand" = slot_r_hand)
-
-	proc/equip_head_loyalist()
-		equip_head(head_loyalist, "loyalist", /mob/living/carbon/human/proc/recruit_loyalist)
-
-	proc/equip_head_mutineer()
-		equip_head(head_mutineer, "mutineer", /mob/living/carbon/human/proc/recruit_mutineer)
-
-	proc/equip_head(datum/mind/head, faction, proc/recruitment_verb)
-		var/mob/living/carbon/human/H = head.current
-		to_chat(H, "You are the Head [capitalize(faction)]!")
-		head.special_role = "head_[faction]"
-
-		var/slots = get_equipment_slots()
-		switch(faction)
-			if("loyalist")
-				if(captains_key) qdel(captains_key)
-				captains_key = new(H)
-				H.equip_in_one_of_slots(captains_key, slots)
-			if("mutineer")
-				if(secondary_key) qdel(secondary_key)
-				secondary_key = new(H)
-				H.equip_in_one_of_slots(secondary_key, slots)
-
-		H.update_icons()
-		H.verbs += recruitment_verb
-
-	proc/add_loyalist(datum/mind/M)
-		add_faction(M, "loyalist", loyalists)
-
-	proc/add_mutineer(datum/mind/M)
-		add_faction(M, "mutineer", mutineers)
-
-	proc/add_faction(datum/mind/M, faction, list/faction_list)
-		if(!can_be_recruited(M, faction))
-			to_chat(M.current, "\red Recruitment canceled; your role has already changed.")
-			to_chat(head_mutineer.current, "\red Could not recruit [M]. Their role has changed.")
-			return
-
-		if(M in loyalists)
-			loyalists-=M
-
-		if(M in mutineers)
-			mutineers-=M
-
-		M.special_role = faction
-		faction_list+=M
-
-		if(faction == "mutineer")
-			to_chat(M.current, fluff.mutineer_tag("You have joined the mutineers!"))
-			to_chat(head_mutineer.current, fluff.mutineer_tag("[M] has joined the mutineers!"))
-		else
-			to_chat(M.current, fluff.loyalist_tag("You have joined the loyalists!"))
-			to_chat(head_loyalist.current, fluff.loyalist_tag("[M] has joined the loyalists!"))
-
-		update_icon(M)
-
-	proc/was_bloodbath()
-		var/list/remaining_loyalists = loyalists - body_count
-		if(!remaining_loyalists.len)
-			return 1
-
-		var/list/remaining_mutineers = mutineers - body_count
-		if(!remaining_mutineers.len)
-			return 1
-
-		return 0
-
-	proc/replace_nuke_with_ead()
-		for(var/obj/machinery/nuclearbomb/N in world)
-			ead = new(N.loc, src)
-			qdel(N)
-
-	proc/unbolt_vault_door()
-		var/obj/machinery/door/airlock/vault = locate(/obj/machinery/door/airlock/vault)
-		vault.unlock(1)
-
-	proc/make_secret_transcript()
-		var/obj/machinery/computer/telecomms/server/S = locate(/obj/machinery/computer/telecomms/server)
-		if(!S) return
-
-		var/obj/item/weapon/paper/crumpled/bloody/transcript = new(S.loc)
-		transcript.name = "secret transcript"
-		transcript.info = fluff.secret_transcript()
-
-	proc/can_be_recruited(datum/mind/M, role)
-		if(!M) return 0
-		if(!M.special_role) return 1
-		switch(role)
-			if("loyalist")
-				return M.special_role == "mutineer"
-			if("mutineer")
-				return M.special_role == "loyalist"
-
-	proc/round_outcome()
-		to_chat(world, "<center><h4>Breaking News</h4></center><br><hr>")
-		if(was_bloodbath())
-			to_chat(world, fluff.no_victory())
-			return
-
-		var/directives_completed = current_directive.directives_complete()
-		var/ead_activated = ead.activated
-		if(directives_completed && ead_activated)
-			to_chat(world, fluff.loyalist_major_victory())
-		else if(directives_completed && !ead_activated)
-			to_chat(world, fluff.loyalist_minor_victory())
-		else if(!directives_completed && ead_activated)
-			to_chat(world, fluff.mutineer_minor_victory())
-		else if(!directives_completed && !ead_activated)
-			to_chat(world, fluff.mutineer_major_victory())
-
-		world << sound('sound/machines/twobeep.ogg')
-
-	proc/update_all_icons()
-		spawn(0)
-			for(var/datum/mind/M in mutineers)
-				update_icon(M)
-
-			for(var/datum/mind/M in loyalists)
-				update_icon(M)
-		return 1
-
-	proc/update_icon(datum/mind/M)
-		if(!M.current || !M.current.client)
-			return 0
-
-		for(var/image/I in head_loyalist.current.client.images)
-			if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
-				qdel(I)
-
-		for(var/image/I in head_mutineer.current.client.images)
-			if(I.loc == M.current && (I.icon_state == "loyalist" || I.icon_state == "mutineer"))
-				qdel(I)
-
-		if(M in loyalists)
-			var/I = image('icons/mob/mob.dmi', loc=M.current, icon_state = "loyalist")
-			head_loyalist.current.client.images += I
-
-		if(M in mutineers)
-			var/I = image('icons/mob/mob.dmi', loc=M.current, icon_state = "mutineer")
-			head_mutineer.current.client.images += I
-
-		return 1
-
-/datum/game_mode/mutiny/announce()
-	fluff.announce()
-
-/datum/game_mode/mutiny/pre_setup()
-	var/list/loyalist_candidates = get_head_loyalist_candidates()
-	if(!loyalist_candidates || loyalist_candidates.len == 0)
-		to_chat(world, "\red Mutiny mode aborted: no valid candidates for head loyalist.")
-		return 0
-
-	var/list/mutineer_candidates = get_head_mutineer_candidates()
-	if(!mutineer_candidates || mutineer_candidates.len == 0)
-		to_chat(world, "\red Mutiny mode aborted: no valid candidates for head mutineer.")
-		return 0
-
-	var/list/directive_candidates = get_directive_candidates()
-	if(!directive_candidates || directive_candidates.len == 0)
-		to_chat(world, "\red Mutiny mode aborted: no valid candidates for Directive X.")
-		return 0
-
-	head_loyalist = pick(loyalist_candidates)
-	head_mutineer = pick(mutineer_candidates)
-	current_directive = pick(directive_candidates)
-
-	return 1
-
-/datum/game_mode/mutiny/post_setup()
-	equip_head_loyalist()
-	equip_head_mutineer()
-
-	loyalists+=head_loyalist
-	mutineers+=head_mutineer
-
-	replace_nuke_with_ead()
-	current_directive.initialize()
-	unbolt_vault_door()
-	make_secret_transcript()
-
-	update_all_icons()
-	spawn(0)
-		reveal_directives()
-	..()
-
-/mob/living/carbon/human/proc/recruit_loyalist()
-	set name = "Recruit Loyalist"
-	set category = "Mutiny"
-
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode || src != mode.head_loyalist.current)
-		return
-
-	var/list/candidates = list()
-	for(var/mob/living/carbon/human/P in oview(src))
-		if(!stat && P.client && mode.can_be_recruited(P.mind, "loyalist"))
-			candidates += P
-
-	if(!candidates.len)
-		to_chat(src, "\red You aren't close enough to anybody that can be recruited.")
-		return
-
-	if(world.time < mode.recruit_loyalist_cooldown)
-		to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.")
-		return
-
-	mode.recruit_loyalist_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS)
-
-	var/mob/living/carbon/human/M = input("Select a person to recruit", "Loyalist recruitment", null) as mob in candidates
-
-	if(M)
-		to_chat(src, "Attempting to recruit [M]...")
-		log_admin("[key_name(src)] attempted to recruit [M] as a loyalist.")
-		message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a loyalist.")
-
-		var/choice = alert(M, "Asked by [src]: Will you help me complete Directive X?", "Loyalist recruitment", "Yes", "No")
-		if(choice == "Yes")
-			mode.add_loyalist(M.mind)
-		else if(choice == "No")
-			to_chat(M, "\red You declined to join the loyalists.")
-			to_chat(mode.head_loyalist.current, "<span class='danger'>[M] declined to support the loyalists.</span>")
-
-/mob/living/carbon/human/proc/recruit_mutineer()
-	set name = "Recruit Mutineer"
-	set category = "Mutiny"
-
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode || src != mode.head_mutineer.current)
-		return
-
-	var/list/candidates = list()
-	for(var/mob/living/carbon/human/P in oview(src))
-		if(!stat && P.client && mode.can_be_recruited(P.mind, "mutineer"))
-			candidates += P
-
-	if(!candidates.len)
-		to_chat(src, "\red You aren't close enough to anybody that can be recruited.")
-		return
-
-	if(world.time < mode.recruit_mutineer_cooldown)
-		to_chat(src, "\red Wait [MUTINY_RECRUITMENT_COOLDOWN] seconds before recruiting again.")
-		return
-
-	mode.recruit_mutineer_cooldown = world.time + (MUTINY_RECRUITMENT_COOLDOWN SECONDS)
-
-	var/mob/living/carbon/human/M = input("Select a person to recruit", "Mutineer recruitment", null) as mob in candidates
-
-	if(M)
-		to_chat(src, "Attempting to recruit [M]...")
-		log_admin("[key_name(src)] attempted to recruit [M] as a mutineer.")
-		message_admins("\red [key_name_admin(src)] attempted to recruit [M] as a mutineer.")
-
-		var/choice = alert(M, "Asked by [src]: Will you help me stop Directive X?", "Mutineer recruitment", "Yes", "No")
-		if(choice == "Yes")
-			mode.add_mutineer(M.mind)
-		else if(choice == "No")
-			to_chat(M, "\red You declined to join the mutineers.")
-			to_chat(mode.head_mutineer.current, "<span class='danger'>[M] declined to support the mutineers.</span>")
-
-/proc/get_mutiny_mode()
-	if(!ticker || !istype(ticker.mode, /datum/game_mode/mutiny))
-		return null
-
-	return ticker.mode

code/game/gamemodes/mutiny/mutiny_admin.dm

@@ -1,83 +0,0 @@
-/datum/game_mode/mutiny/proc/check_antagonists_ui(datum/admins/admins)
-  var/turf/captains_key_loc = captains_key ? captains_key.get_loc_turf() : "Lost or Destroyed"
-  var/turf/secondary_key_loc = secondary_key ? secondary_key.get_loc_turf() : "Lost or Destroyed"
-  var/remaining_objectives = current_directive.get_remaining_orders()
-  var/txt = {"
-    <h5>Context:</h5>
-    <p>
-      [current_directive.get_description()]
-    </p>
-    <h5>Orders:</h5>
-    <ol>
-      [fluff.get_orders()]
-    </ol>
-    <br>
-    <h5>Remaining Objectives</h5>
-    <ol>
-      [remaining_objectives ? remaining_objectives : "<li>None</li>"]
-    </ol>
-    <br>
-    <h5>Authentication:</h5>
-    <b>Captain's Key:</b> [captains_key_loc]
-    <a href='?src=\ref[admins];choice=activate_captains_key'>Activate</a><br>
-    <b>Secondary Key:</b> [secondary_key_loc]
-    <a href='?src=\ref[admins];choice=activate_secondary_key'>Activate</a><br>
-    <b>EAD: [ead ? ead.get_status() : "Lost or Destroyed"]</b>
-    <a href='?src=\ref[admins];choice=activate_ead'>Activate</a><br>
-    <hr>
-  "}
-
-  txt += "<a href='?src=\ref[admins];choice=reassign_head_loyalist'>Reassign Head Loyalist</a><br>"
-  if(head_loyalist)
-    txt += admins.check_role_table("Head Loyalist", list(head_loyalist), 0)
-
-  var/list/loyal_crew = loyalists - head_loyalist
-  if(loyal_crew.len)
-    txt += admins.check_role_table("Loyalists", loyal_crew, 0)
-
-  txt += "<a href='?src=\ref[admins];choice=reassign_head_mutineer'>Reassign Head Mutineer</a><br>"
-  if(head_mutineer)
-    txt += admins.check_role_table("Head Mutineer", list(head_mutineer), 0)
-
-  var/list/mutiny_crew = mutineers - head_mutineer
-  if(mutiny_crew.len)
-    txt += admins.check_role_table("Mutineers", mutiny_crew, 0)
-
-  if(body_count.len)
-    txt += admins.check_role_table("Casualties", body_count, 0)
-
-  return txt
-
-/datum/game_mode/mutiny/check_antagonists_topic(href, href_list[])
-  switch(href_list["choice"])
-    if("activate_captains_key")
-      ead.captains_key = 1
-      return 1
-    if("activate_secondary_key")
-      ead.secondary_key = 1
-      return 1
-    if("activate_ead")
-      ead.activated = 1
-      return 1
-    if("reassign_head_loyalist")
-      var/mob/M = get_reassignment_candidate("Loyalist")
-      if(M)
-        head_loyalist = M.mind
-        equip_head_loyalist()
-      return 1
-    if("reassign_head_mutineer")
-      var/mob/M = get_reassignment_candidate("Mutineer")
-      if(M)
-        head_mutineer = M.mind
-        equip_head_mutineer()
-      return 1
-    else
-      return 0
-
-/datum/game_mode/mutiny/proc/get_reassignment_candidate(faction)
-  var/list/targets[0]
-  for(var/mob/living/carbon/human/H in player_list)
-    if(H.is_ready() && !H.is_dead())
-      targets.Add(H)
-
-  return input("Select a player to lead the [faction] faction.", "Head [faction] reassignment", null) as mob in targets

code/game/gamemodes/mutiny/mutiny_fluff.dm

@@ -1,197 +0,0 @@
-/datum/mutiny_fluff
-	var/datum/game_mode/mutiny/mode
-
-	New(datum/game_mode/mutiny/M)
-		mode = M
-
-	proc/announce_directives()
-		for(var/obj/machinery/photocopier/faxmachine/fax in world)
-			if(fax.department == "Captain's Office")
-				var/obj/item/weapon/paper/directive_x = new(fax.loc)
-				directive_x.name = "emergency action message"
-				directive_x.info = get_fax_body()
-
-	proc/get_fax_body()
-		return {"
-			<center><h5>NOT A DRILL . . . EMERGENCY DIRECTIVE . . . NOT A DRILL</h5></center>
-			<p>
-				<b>TO:</b> Captain [mode.head_loyalist], Commanding Officer, [station_name()]<br>
-				<b>FROM:</b> Nanotrasen Emergency Messaging Relay<br>
-				<b>DATE:</b> [time2text(world.realtime, "MM/DD")]/[game_year]<br>
-				<b>SUBJECT:</b> Directive X<br>
-			</p>
-
-			[mode.current_directive.get_description()]
-
-			<hr>
-			<h5><b>Emergency Authentication Protocol</b></h5>
-			<p>
-				A member of your Command Staff is this shift's designated Emergency Secondary Authenticator.<br>
-				This Emergency Secondary Authenticator is uniquely aware of their role and possesses the Emergency Secondary Authentication Key.<br>
-				As Captain, you possess the Captain's Authentication Key.<br>
-				The Emergency Authentication Device is located in the vault of your station, and requires simultaneous activation of the Authentication Keys.<br>
-				An <b>Authentication Key Pinpointer</b> can be delivered via Cargo Bay to assist recovery of the Authentication Keys should they be lost aboard the station.<br>
-				A key's destruction or removal from the station's perimeter will automatically and irreversibly activate the Emergency Authentication Device.
-			</p>
-			<br>
-
-			<h5><b>Orders</b></h5>
-			<p>
-				Captain [mode.head_loyalist], you are to immediately initiate the following procedure; codenamed Directive X:
-			</p>
-			<ol>
-				[get_orders()]
-			</ol>
-			<br>
-
-			<h5><b>Authentication</b></h5>
-
-			<b>Encoded Authentication String:</b> <small>T0JCJUwoIVFDQA==</small><br>
-			<b>Emergency Action Code:</b> O B B _ L _ _ Q C _<br>
-			<font color='red'><u>ERROR: DECODING INCOMPLETE (40% LOSS)</u></font>
-			<br>
-			<br>
-			<br>
-
-			<center><h5>NOT A DRILL . . . EMERGENCY DIRECTIVE . . . NOT A DRILL</h5></center>
-		"}
-
-	proc/get_orders()
-		var/text = "<li>Immediate external transmission and signals silence. Evacuation and Cargo services will remain available. All ERT teams are engaged elsewhere. Do not communicate with Central Command under any circumstances.</li>"
-		for(var/order in mode.current_directive.special_orders)
-			text += "<li>[order]</li>"
-
-		text += "<li>Upon completion of this Directive, Captain [mode.head_loyalist] and the Emergency Secondary Authenticator must utilise the Captain's Authentication Key and the Emergency Secondary Authentication Key to activate the Emergency Authentication Device.</li>"
-		return text
-
-	proc/get_pda_body()
-		return {"<b>&larr; From Anonymous Channel:</b> <p>\"You must read this! Nanotrasen Chain of Command COMPROMISED. Command Encryptions BROKEN. [station_name()] Captain [mode.head_loyalist] will receive orders that must NOT BE BROUGHT TO FRUITION!
-
-They don't care about us they only care about WEALTH and POWER... Share this message with people you trust.
-
-Be safe, friend.\" (Unable to Reply)</p>"}
-
-	proc/announce()
-		to_chat(world, "<B>The current game mode is - Mutiny!</B>")
-		to_chat(world, {"
-<p>The crew will be divided by their sense of ethics when a morally turbulent emergency directive arrives with an incomplete command validation code.<br><br>
-The [loyalist_tag("Head Loyalist")] is the Captain, who carries the [loyalist_tag("Captain's Authentication Key")] at all times.<br>
-The [mutineer_tag("Head Mutineer")] is a random Head of Staff who carries the [mutineer_tag("Emergency Secondary Authentication Key")].</p>
-Both keys are required to activate the <b>Emergency Authentication Device (EAD)</b> in the vault, signalling to Nanotrasen that the directive is complete.
-<hr>
-<p>
-<b>Loyalists</b> - Follow the Head Loyalist in carrying out [loyalist_tag("Nanotrasen's directives")] then activate the <b>EAD</b>.<br>
-<b>Mutineers</b> - Prevent the completion of the [mutineer_tag("improperly validated directives")] and the activation of the <b>EAD</b>.
-</p>"})
-
-	proc/loyalist_tag(text)
-		return "<font color='blue'><b>[text]</b></font>"
-
-	proc/mutineer_tag(text)
-		return "<font color='#FFA500'><b>[text]</b></font>"
-
-	proc/their(datum/mind/head)
-		if(head.current.gender == MALE)
-			return "his"
-		else if(head.current.gender == FEMALE)
-			return "her"
-
-		return "their"
-
-	proc/loyalist_major_victory()
-		return {"
-Nanotrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
-The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-Despite the mutiny, the crew was successful in implementing the directive and activating their on-board emergency authentication device.
-[mode.mutineers.len] members of the station's personnel were charged with terrorist action against the Company and, if found guilty by a Sol magistrate, will be sentenced to life incarceration.
-Nanotrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their successful efforts, at a ceremony this coming Thursday.
-[mode.body_count.len] are believed to have died during the coup.
-<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
-		"}
-
-	proc/loyalist_minor_victory()
-		return {"
-Nanotrasen has praised the efforts of Captain [mode.head_loyalist] and loyal members of [their(mode.head_loyalist)] crew, who recently managed to put down a mutiny--amid a local interstellar crisis--aboard the <b>[station_name()]</b>, a research station in [system_name()].
-The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-Despite the mutiny, the crew was successful in implementing the directive. Unfortunately, they failed to notify Central Command of their successes due to a breach in the chain of command.
-[mode.mutineers.len] members of the station's personnel were charged with terrorist action against the Company and, if found guilty by a Sol magistrate, will be sentenced to life incarceration.
-Nanotrasen will be awarding [mode.loyalists.len] members of the crew with the [loyalist_tag("Star of Loyalty")], following their mostly successful efforts, at a ceremony this coming Thursday.
-[mode.body_count.len] are believed to have died during the coup.
-<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
-		"}
-
-	proc/no_victory()
-		return {"
-Nanotrasen has been thrust into turmoil following an apparent mutiny by key personnel aboard the <b>[station_name()]</b>, a research station in [system_name()].
-The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-No further information has yet emerged from the station or its crew, who are presumed to be in holding with Nanotrasen investigators.
-Nanotrasen officials refuse to comment.
-Sources indicate that [mode.mutineers.len] members of the station's personnel are currently under investigation for terrorist activity, and [mode.loyalists.len] crew are currently providing evidence to investigators, believed to be the 'loyal' station personnel.
-[mode.body_count.len] are believed to have died during the coup.
-<p>Nanotrasen's image will forever be haunted by the fact that a mutiny took place on one of its own stations.</p>
-		"}
-
-	proc/mutineer_minor_victory()
-		return {"
-Reports have emerged that an impromptu mutiny has taken place, amid a local interstellar crisis, aboard the <b>[station_name()]</b>, a research station in [system_name()].
-The mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-Information at present indicates that the top-secret directive--which has since been retracted--was invalid due to a broken authentication code. Members of the crew, including an unidentified Head of Staff, prevented the directive from being accomplished.
-[mode.mutineers.len] members of the station's personnel were released from interrogations today, following a mutiny investigation.
-Nanotrasen has reprimanded [mode.loyalists.len] members of the crew for failing to follow command validation procedures.
-[mode.body_count.len] are believed to have died during the coup.
-<p>Even though the directive was not successfully implemented, Nanotrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
-		"}
-
-	proc/mutineer_major_victory()
-		return {"
-Nanotrasen has praised the efforts of [mode.head_mutineer.assigned_role] [mode.head_mutineer] and several other members of the crew, who recently seized control of a company station in [system_name()]--<b>[station_name()]</b>--amid a local interstellar crisis.
-What appears to have been a "legitimate" mutiny was spurred by a top secret directive sent to the station, presumably in response to the crisis within the system.
-It has been revealed that the directive was invalid and fraudulent. Company officials have not released a statement about the source of the directive.
-Thanks to the efforts of the resistant members of the crew, the directive was not carried out.
-[mode.mutineers.len] members of the station's personnel were congratulated and awarded with the [mutineer_tag("Star of Bravery")], for their efforts in preventing the illegal directive's completion.
-Nanotrasen has [mode.loyalists.len] members of the crew in holding, while it investigates the circumstances that led to the acceptance and initiation of an invalid directive.
-[mode.body_count.len] are believed to have died during the coup.
-<p>Even though the directive was not successfully implemented, Nanotrasen's image will forever be haunted by the fact that its authentication protocol was breached with such magnitude and that a mutiny was the result.</p>
-		"}
-
-	proc/secret_transcript()
-		return {"
-<center><h3>Corporate Rival Threat Assessment</h3></center>
-<center><b>Gilthari Exports Incident Transcript</b></center>
-<center><font color='red'>CONFIDENTIAL: PROPERTY OF NANOTRASEN</font></center>
-<i>Location:</i> Operator's Desk, D Deck, Polumetis Installation<br>
-<i>Time:</i> 16:11, May 24, 2558 (Sol Reckoning)<br>
-<br>
-<br>
-
-<center>\[Start of transcript\]</center>
-<center>\[Sound of an internal airlock door opening\]</center>
-TM: Thank you for coming to see me, Director. I'm afraid this is urgent.<br>
-D: Mr. Mitchell, first you send cryptic messages to my office and then you request to have me come personally to this barely lit closet you call a workstation; all of this to talk about a computer glitch?<br>
-<center>\[Sound of the internal airlock door shutting\]</center>
-TM: Do you remember <b>Mallory</b>?<br>
-D: Who?<br>
-TM: It's not who, it's what. The computer program we planted in the [system_name()] communications satellite.<br>
-D: What is so important about this computer program?<br>
-TM: We call her an eavesdropper. Captures network traffic, records it, and forwards the stream to the receiver autonomously.<br>
-D: Speak English <i>goddamnit</i>.<br>
-TM: Standard intelligence acquisition package, sir; we bug their satellite and listen. It's like we have their playbook and we know what their moves are going to be on the market before they make them.<br>
-D: So Mallory doesn't work?<br>
-TM: She worked, sir. We've had an ear on Nanotrasen's regional communications for weeks.<br>
-D: Any news about their <b>Plasma refinement process</b>?<br>
-TM: No sir. Our analysts believe they are using a separate channel for their most sensitive data.<br>
-D: So what's the problem?<br>
-TM: The intelligence hasn't been doing us any good. Anything that appears actionable, I send it to the analysts and they make a plan. Thing is, Nanotrasen always sees us coming.<br>
-D: Tim...<br>
-TM: I think they discovered the hack, sir. Case in point, <b>Energine Consolidated Solutions</b>. That subsidiary of ours that was awarded a lease on Nanotrasen's mining platform in Nyx? Nanotrasen acquired them a week before we made the announcement.<br>
-D: They know about they have a bug. <i>They left her on and fed her the information for us to hear</i>, those sneaks. How did they find it?<br>
-TM: Top secret communique came through. I'm not sure what happened. Either Mallory couldn't replicate the encryption scheme and garbled it going out or the transmission was already corrupted to begin with.<br>
-D: Either way the transmission caused Nanotrasen to look at the satellite. They found out about Mallory.<br>
-TM: Precisely sir. There's only so much I can do to cover our tracks from here.<br>
-D: I'm pulling the plug. We have assets in the sector that are capable of a job like this. Thank you for bringing this to my attention.<br>
-<center>\[Computer device chirps\]</center>
-D: One last thing, did you happen to read anything from those secure transmissions?<br>
-TM: Just the subject, 'Directive X'.<br>
-D: Directive X... Now what do you suppose that means?<br>
-<center>\[End of transcript\]</center>
-		"}

code/game/gamemodes/mutiny/mutiny_hooks.dm

@@ -1,27 +0,0 @@
-/hook/death/proc/track_kills(mob/living/carbon/human/deceased, gibbed)
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode) return 1
-
-	mode.body_count+=deceased.mind
-	return 1
-
-/hook/clone/proc/update_icon(mob/living/carbon/human/H)
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode) return 1
-
-	mode.update_icon(H.mind)
-	return 1
-
-/hook/harvest_podman/proc/update_icon(mob/living/simple_animal/diona/D)
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode) return 1
-
-	mode.update_icon(D.mind)
-	return 1
-
-/hook/roundend/proc/report_mutiny_news()
-	var/datum/game_mode/mutiny/mode = get_mutiny_mode()
-	if(!mode) return 1
-
-	mode.round_outcome()
-	return 1

code/game/gamemodes/objective.dm

@@ -91,38 +91,6 @@ var/list/potential_theft_objectives = subtypesof(/datum/theft_objective) \
 		return 0
 	return 1
 
-/datum/objective/mutiny/rp
-/datum/objective/mutiny/rp/find_target()
-	..()
-	if(target && target.current)
-		explanation_text = "Assassinate, capture or convert [target.current.real_name], the [target.assigned_role]."
-	else
-		explanation_text = "Free Objective"
-
-//less violent rev objectives
-/datum/objective/mutiny/rp/check_completion()
-	if(target && target.current)
-		if(target.current.stat == DEAD)
-			return 1
-		if(!ishuman(target.current))
-			return 1
-		if(iscarbon(target.current))
-			var/mob/living/carbon/C = target.current
-			if(C.handcuffed)
-				return 1
-
-		if(GAMEMODE_IS_REVOLUTION)
-			if(target in ticker.mode.head_revolutionaries)
-				return 1
-
-		var/turf/T = get_turf(target.current)
-		if(T && !is_station_level(T.z))
-			return 1
-
-		return 0
-	return 1
-
-
 /datum/objective/maroon
 	martyr_compatible = 1
 

code/game/jobs/job/engineering.dm

@@ -50,8 +50,8 @@
 	supervisors = "the chief engineer"
 	selection_color = "#fff5cc"
 	idtype = /obj/item/weapon/card/id/engineering
-	access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
-	minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction)
+	access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_mineral_storeroom)
+	minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_mineral_storeroom)
 	alt_titles = list("Maintenance Technician","Engine Technician","Electrician")
 	minimal_player_age = 7
 
@@ -85,8 +85,8 @@
 	supervisors = "the chief engineer"
 	selection_color = "#fff5cc"
 	idtype = /obj/item/weapon/card/id/engineering
-	access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics)
-	minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction)
+	access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_mineral_storeroom)
+	minimal_access = list(access_eva, access_atmospherics, access_maint_tunnels, access_external_airlocks, access_emergency_storage, access_construction, access_mineral_storeroom)
 	alt_titles = list("Atmospheric Technician")
 	minimal_player_age = 7
 

code/game/machinery/doors/airlock.dm

@@ -1001,7 +1001,7 @@ About the new airlock wires panel:
 		to_chat(user, "The hatch is coated with a product that prevents the shaped charge from sticking!")
 		return
 
-	if(istype(C, /obj/item/mecha_parts/mecha_equipment/tool/rcd) || istype(C, /obj/item/weapon/rcd))
+	if(istype(C, /obj/item/mecha_parts/mecha_equipment/rcd) || istype(C, /obj/item/weapon/rcd))
 		to_chat(user, "The hatch is made of an advanced compound that cannot be deconstructed using an RCD.")
 		return
 

code/game/mecha/combat/combat.dm

@@ -3,8 +3,6 @@
 	var/maxsize = 2
 	internal_damage_threshold = 50
 	maint_access = 0
-	//add_req_access = 0
-	//operation_req_access = list(access_hos)
 	damage_absorption = list("brute"=0.7,"fire"=1,"bullet"=0.7,"laser"=0.85,"energy"=1,"bomb"=0.8)
 	var/am = "d3c2fbcadca903a41161ccc9df9cf948"
 
@@ -26,21 +24,13 @@
 
 
 /obj/mecha/combat/go_out()
-	if(src.occupant && src.occupant.client)
-		src.occupant.client.mouse_pointer_icon = initial(src.occupant.client.mouse_pointer_icon)
+	if(occupant && occupant.client)
+		occupant.client.mouse_pointer_icon = initial(occupant.client.mouse_pointer_icon)
 	..()
-	return
 
 /obj/mecha/combat/Topic(href,href_list)
 	..()
-	var/datum/topic_input/filter = new (href,href_list)
+	var/datum/topic_input/filter = new(href, href_list)
 	if(filter.get("close"))
 		am = null
-		return
-	/*
-	if(filter.get("saminput"))
-		if(md5(filter.get("saminput")) == am)
-			occupant_message("From the lies of the Antipath, Circuit preserve us.")
-		am = null
-	return
-	*/
+		return

code/game/mecha/combat/durand.dm

@@ -22,17 +22,15 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
 	ME.attach(src)
-	return
 
 
 /obj/mecha/combat/durand/relaymove(mob/user,direction)
 	if(defence)
 		if(world.time - last_message > 20)
-			src.occupant_message("<font color='red'>Unable to move while in defence mode</font>")
+			occupant_message("<font color='red'>Unable to move while in defence mode</font>")
 			last_message = world.time
 		return 0
 	. = ..()
-	return
 
 
 /obj/mecha/combat/durand/verb/defence_mode()
@@ -40,17 +38,16 @@
 	set name = "Toggle defence mode"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
 	defence = !defence
 	if(defence)
 		deflect_chance = defence_deflect
-		src.occupant_message("<font color='blue'>You enable [src] defence mode.</font>")
+		occupant_message("<font color='blue'>You enable [src] defence mode.</font>")
 	else
 		deflect_chance = initial(deflect_chance)
-		src.occupant_message("<font color='red'>You disable [src] defence mode.</font>")
-	src.log_message("Toggled defence mode.")
-	return
+		occupant_message("<font color='red'>You disable [src] defence mode.</font>")
+	log_message("Toggled defence mode.")
 
 
 /obj/mecha/combat/durand/get_stats_part()
@@ -72,8 +69,7 @@
 /obj/mecha/combat/durand/Topic(href, href_list)
 	..()
 	if(href_list["toggle_defence_mode"])
-		src.defence_mode()
-	return
+		defence_mode()
 
 /obj/mecha/combat/durand/old
 	desc = "A retired, third-generation combat exosuit utilized by the Nanotrasen corporation. Originally developed to combat hostile alien lifeforms."

code/game/mecha/combat/gygax.dm

@@ -24,7 +24,6 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/flashbang
 	ME.attach(src)
-	return
 
 /obj/mecha/combat/gygax/dark
 	desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
@@ -51,7 +50,6 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
 	ME.attach(src)
-	return
 
 /obj/mecha/combat/gygax/dark/add_cell(var/obj/item/weapon/stock_parts/cell/C=null)
 	if(C)
@@ -68,31 +66,30 @@
 	set name = "Toggle leg actuators overload"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
 	if(overload)
 		overload = 0
 		step_in = initial(step_in)
 		step_energy_drain = initial(step_energy_drain)
-		src.occupant_message("<font color='blue'>You disable leg actuators overload.</font>")
+		occupant_message("<font color='blue'>You disable leg actuators overload.</font>")
 	else
 		overload = 1
 		step_in = min(1, round(step_in/2))
 		step_energy_drain = step_energy_drain*overload_coeff
-		src.occupant_message("<font color='red'>You enable leg actuators overload.</font>")
-	src.log_message("Toggled leg actuators overload.")
-	return
+		occupant_message("<font color='red'>You enable leg actuators overload.</font>")
+	log_message("Toggled leg actuators overload.")
 
-/obj/mecha/combat/gygax/dyndomove(direction)
-	if(!..()) return
+/obj/mecha/combat/gygax/domove(direction)
+	if(!..())
+		return
 	if(overload)
 		health--
-		if(health < initial(health) - initial(health)/3)
+		if(health < initial(health) - initial(health) / 3)
 			overload = 0
 			step_in = initial(step_in)
 			step_energy_drain = initial(step_energy_drain)
-			src.occupant_message("<font color='red'>Leg actuators damage threshold exceded. Disabling overload.</font>")
-	return
+			occupant_message("<font color='red'>Leg actuators damage threshold exceded. Disabling overload.</font>")
 
 
 /obj/mecha/combat/gygax/get_stats_part()
@@ -114,5 +111,4 @@
 /obj/mecha/combat/gygax/Topic(href, href_list)
 	..()
 	if(href_list["toggle_leg_overload"])
-		src.overload()
-	return
+		overload()

code/game/mecha/combat/honker.dm

@@ -24,7 +24,6 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack/mousetrap_mortar
 	ME.attach(src)
-	return
 
 /obj/mecha/combat/honker/get_stats_part()
 	var/integrity = health/initial(health)*100
@@ -45,13 +44,13 @@
 						<b>HONK pressure: </b>[cabin_pressure>WARNING_HIGH_PRESSURE ? "<font color='red'>[cabin_pressure]</font>": cabin_pressure]kPa<br>
 						<b>HONK temperature: </b> [return_temperature()]&deg;K|[return_temperature() - T0C]&deg;C<br>
 						<b>Lights: </b>[lights?"on":"off"]<br>
-						[src.dna?"<b>DNA-locked:</b><br> <span style='font-size:10px;letter-spacing:-1px;'>[src.dna]</span> \[<a href='?src=\ref[src];reset_dna=1'>Reset</a>\]<br>":null]
+						[dna?"<b>DNA-locked:</b><br> <span style='font-size:10px;letter-spacing:-1px;'>[dna]</span> \[<a href='?src=\ref[src];reset_dna=1'>Reset</a>\]<br>":null]
 					"}
 	return output
 
 /obj/mecha/combat/honker/get_stats_html()
 	var/output = {"<html>
-						<head><title>[src.name] data</title>
+						<head><title>[name] data</title>
 						<style>
 						body {color: #00ff00; background: #32CD32; font-family:"Courier",monospace; font-size: 12px;}
 						hr {border: 1px solid #0f0; color: #fff; background-color: #000;}
@@ -90,14 +89,14 @@
 						</head>
 						<body>
 						<div id='content'>
-						[src.get_stats_part()]
+						[get_stats_part()]
 						</div>
 						<div id='eq_list'>
-						[src.get_equipment_list()]
+						[get_equipment_list()]
 						</div>
 						<hr>
 						<div id='commands'>
-						[src.get_commands()]
+						[get_commands()]
 						</div>
 						</body>
 						</html>

code/game/mecha/combat/marauder.dm

@@ -23,6 +23,20 @@
 	force = 45
 	max_equip = 4
 
+
+/obj/mecha/combat/marauder/loaded/New()
+	..()
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
+	ME.attach(src)
+	smoke_system.set_up(3, 0, src)
+	smoke_system.attach(src)
+
 /obj/mecha/combat/marauder/seraph
 	desc = "Heavy-duty, command-type exosuit. This is a custom model, utilized only by high-ranking military personnel."
 	name = "Seraph"
@@ -36,6 +50,24 @@
 	force = 55
 	max_equip = 5
 
+/obj/mecha/combat/marauder/seraph/loaded/New()
+	..()//Let it equip whatever is needed.
+	var/obj/item/mecha_parts/mecha_equipment/ME
+	if(equipment.len)//Now to remove it and equip anew.
+		for(ME in equipment)
+			equipment -= ME
+			qdel(ME)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src)
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src)
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src)
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
+	ME.attach(src)
+	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
+	ME.attach(src)
+
 /obj/mecha/combat/marauder/mauler
 	desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model."
 	name = "Mauler"
@@ -56,47 +88,14 @@
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
 	ME.attach(src)
-	src.smoke_system.set_up(3, 0, src)
-	src.smoke_system.attach(src)
-	return
+	smoke_system.set_up(3, 0, src)
+	smoke_system.attach(src)
 
-/obj/mecha/combat/marauder/loaded/New()
-	..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/energy/pulse
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
-	ME.attach(src)
-	src.smoke_system.set_up(3, 0, src)
-	src.smoke_system.attach(src)
-	return
-
-/obj/mecha/combat/marauder/seraph/loaded/New()
-	..()//Let it equip whatever is needed.
-	var/obj/item/mecha_parts/mecha_equipment/ME
-	if(equipment.len)//Now to remove it and equip anew.
-		for(ME in equipment)
-			equipment -= ME
-			qdel(ME)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/scattershot(src)
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/missile_rack(src)
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/teleporter(src)
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/tesla_energy_relay(src)
-	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster(src)
-	ME.attach(src)
-	return
 
 /obj/mecha/combat/marauder/relaymove(mob/user,direction)
 	if(zoom)
 		if(world.time - last_message > 20)
-			src.occupant_message("Unable to move while in zoom mode.")
+			occupant_message("Unable to move while in zoom mode.")
 			last_message = world.time
 		return 0
 	return ..()
@@ -113,14 +112,13 @@
 	set name = "Toggle thrusters"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
-	if(src.occupant)
+	if(occupant)
 		if(get_charge() > 0)
 			thrusters = !thrusters
-			src.log_message("Toggled thrusters.")
-			src.occupant_message("<font color='[src.thrusters?"blue":"red"]'>Thrusters [thrusters?"en":"dis"]abled.")
-	return
+			log_message("Toggled thrusters.")
+			occupant_message("<font color='[thrusters?"blue":"red"]'>Thrusters [thrusters?"en":"dis"]abled.")
 
 
 /obj/mecha/combat/marauder/verb/smoke()
@@ -128,42 +126,33 @@
 	set name = "Smoke"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
 	if(smoke_ready && smoke>0)
-		src.smoke_system.start()
+		smoke_system.start()
 		smoke--
 		smoke_ready = 0
 		spawn(smoke_cooldown)
 			smoke_ready = 1
-	return
 
 /obj/mecha/combat/marauder/verb/zoom()
 	set category = "Exosuit Interface"
 	set name = "Zoom"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
-	if(src.occupant.client)
-		src.zoom = !src.zoom
-		src.log_message("Toggled zoom mode.")
-		src.occupant_message("<font color='[src.zoom?"blue":"red"]'>Zoom mode [zoom?"en":"dis"]abled.</font>")
+	if(occupant.client)
+		zoom = !zoom
+		log_message("Toggled zoom mode.")
+		occupant_message("<font color='[zoom?"blue":"red"]'>Zoom mode [zoom?"en":"dis"]abled.</font>")
 		if(zoom)
-			src.occupant.client.view = 12
-			to_chat(src.occupant, sound('sound/mecha/imag_enh.ogg',volume=50))
+			occupant.client.view = 12
+			to_chat(occupant, sound('sound/mecha/imag_enh.ogg',volume=50))
 		else
-			src.occupant.client.view = world.view//world.view - default mob view size
-	return
+			occupant.client.view = initial(occupant.client.view)
 
 
-/obj/mecha/combat/marauder/go_out()
-	if(src.occupant && src.occupant.client)
-		src.occupant.client.view = world.view
-		src.zoom = 0
-	..()
-	return
-
 
 /obj/mecha/combat/marauder/get_stats_part()
 	var/output = ..()
@@ -190,9 +179,8 @@
 /obj/mecha/combat/marauder/Topic(href, href_list)
 	..()
 	if(href_list["toggle_thrusters"])
-		src.toggle_thrusters()
+		toggle_thrusters()
 	if(href_list["smoke"])
-		src.smoke()
+		smoke()
 	if(href_list["toggle_zoom"])
-		src.zoom()
-	return
+		zoom()

code/game/mecha/combat/phazon.dm

@@ -23,53 +23,49 @@
 
 /obj/mecha/combat/phazon/New()
 	..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/rcd
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/rcd
 	ME.attach(src)
 	ME = new /obj/item/mecha_parts/mecha_equipment/gravcatapult
 	ME.attach(src)
-	return
 
 /obj/mecha/combat/phazon/Bump(var/atom/obstacle)
-	if(phasing && get_charge()>=phasing_energy_drain)
+	if(phasing && get_charge() >= phasing_energy_drain)
 		spawn()
 			if(can_move)
 				can_move = 0
 				flick("phazon-phase", src)
-				src.loc = get_step(src,src.dir)
-				src.use_power(phasing_energy_drain)
-				sleep(step_in*3)
+				forceMove(get_step(src, dir))
+				use_power(phasing_energy_drain)
+				sleep(step_in * 3)
 				can_move = 1
 	else
 		. = ..()
-	return
 
 /obj/mecha/combat/phazon/click_action(atom/target,mob/user)
 	if(phasing)
-		src.occupant_message("Unable to interact with objects while phasing")
+		occupant_message("Unable to interact with objects while phasing")
 		return
-	else
-		return ..()
+	return ..()
 
 /obj/mecha/combat/phazon/verb/switch_damtype()
 	set category = "Exosuit Interface"
 	set name = "Reconfigure arm microtool arrays"
 	set src = usr.loc
 	set popup_menu = 0
-	if(usr!=src.occupant)
+	if(usr != occupant)
 		return
-	var/new_damtype = alert(src.occupant,"Arm Tool Selection",null,"Fists","Torch","Toxic Injector")
+	var/new_damtype = alert(occupant, "Arm Tool Selection", null, "Fists", "Torch", "Toxic Injector")
 	switch(new_damtype)
 		if("Fists")
 			damtype = "brute"
-			src.occupant_message("Your exosuit's hands form into fists.")
+			occupant_message("Your exosuit's hands form into fists.")
 		if("Torch")
 			damtype = "fire"
-			src.occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
+			occupant_message("A torch tip extends from your exosuit's hand, glowing red.")
 		if("Toxic injector")
 			damtype = "tox"
-			src.occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
+			occupant_message("A bone-chillingly thick plasteel needle protracts from the exosuit's palm.")
 	playsound(src, 'sound/mecha/mechmove01.ogg', 50, 1)
-	return
 
 /obj/mecha/combat/phazon/get_commands()
 	var/output = {"<div class='wr'>
@@ -86,9 +82,8 @@
 /obj/mecha/combat/phazon/Topic(href, href_list)
 	..()
 	if(href_list["switch_damtype"])
-		src.switch_damtype()
+		switch_damtype()
 	if(href_list["phasing"])
 		phasing = !phasing
-		send_byjax(src.occupant,"exosuit.browser","phasing_command","[phasing?"Dis":"En"]able phasing")
-		src.occupant_message("<font color=\"[phasing?"#00f\">En":"#f00\">Dis"]abled phasing.</font>")
-	return
+		send_byjax(occupant,"exosuit.browser","phasing_command","[phasing?"Dis":"En"]able phasing")
+		occupant_message("<font color=\"[phasing?"#00f\">En":"#f00\">Dis"]abled phasing.</font>")

code/game/mecha/combat/recitence.dm

@@ -21,5 +21,5 @@
 	..()
 	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/carbine/silenced
 	ME.attach(src)
-	ME = new /obj/item/mecha_parts/mecha_equipment/tool/mimercd //HAHA IT MAKES WALLS GET IT
+	ME = new /obj/item/mecha_parts/mecha_equipment/mimercd //HAHA IT MAKES WALLS GET IT
 	ME.attach(src)

code/game/mecha/equipment/mecha_equipment.dm

@@ -15,20 +15,9 @@
 	var/range = MELEE //bitflags
 	reliability = 1000
 	var/salvageable = 1
+	var/selectable = 1	// Set to 0 for passive equipment such as mining scanner or armor plates
 
 
-/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(target=1)
-	sleep(equip_cooldown)
-	set_ready_state(1)
-	if(target && chassis)
-		return 1
-	return 0
-
-
-/obj/item/mecha_parts/mecha_equipment/New()
-	..()
-	return
-
 /obj/item/mecha_parts/mecha_equipment/proc/update_chassis_page()
 	if(chassis)
 		send_byjax(chassis.occupant,"exosuit.browser","eq_list",chassis.get_equipment_list())
@@ -49,23 +38,32 @@
 		if(chassis.selected == src)
 			chassis.selected = null
 		src.update_chassis_page()
-		chassis.occupant_message("<font color='red'>The [src] is destroyed!</font>")
+		chassis.occupant_message("<span class='danger'>The [src] is destroyed!</span>")
 		chassis.log_append_to_last("[src] is destroyed.",1)
 		if(istype(src, /obj/item/mecha_parts/mecha_equipment/weapon))
-			to_chat(chassis.occupant, sound('sound/mecha/weapdestr.ogg',volume=50))
+			chassis.occupant << sound('sound/mecha/weapdestr.ogg', volume = 50)
 		else
-			to_chat(chassis.occupant, sound('sound/mecha/critdestr.ogg',volume=50))
+			chassis.occupant << sound('sound/mecha/critdestr.ogg', volume = 50)
 		chassis = null
 	return ..()
 
 /obj/item/mecha_parts/mecha_equipment/proc/critfail()
 	if(chassis)
-		log_message("Critical failure",1)
+		log_message("Critical failure", 1)
 	return
 
 /obj/item/mecha_parts/mecha_equipment/proc/get_equip_info()
-	if(!chassis) return
-	return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;[chassis.selected==src?"<b>":"<a href='?src=\ref[chassis];select_equip=\ref[src]'>"][src.name][chassis.selected==src?"</b>":"</a>"]"
+	if(!chassis)
+		return
+	var/txt = "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp;"
+	if(chassis.selected == src)
+		txt += "<b>[name]</b>"
+	else if(selectable)
+		txt += "<a href='?src=\ref[chassis];select_equip=\ref[src]'>[name]</a>"
+	else
+		txt += "[name]"
+
+	return txt
 
 /obj/item/mecha_parts/mecha_equipment/proc/is_ranged()//add a distance restricted equipment. Why not?
 	return range&RANGED
@@ -73,7 +71,6 @@
 /obj/item/mecha_parts/mecha_equipment/proc/is_melee()
 	return range&MELEE
 
-
 /obj/item/mecha_parts/mecha_equipment/proc/action_checks(atom/target)
 	if(!target)
 		return 0
@@ -88,27 +85,42 @@
 	return 1
 
 /obj/item/mecha_parts/mecha_equipment/proc/action(atom/target)
-	return
+	return 0
 
-/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M as obj)
+/obj/item/mecha_parts/mecha_equipment/proc/start_cooldown()
+	set_ready_state(0)
+	chassis.use_power(energy_drain)
+	addtimer(src, "set_ready_state", equip_cooldown, FALSE, 1)
+
+/obj/item/mecha_parts/mecha_equipment/proc/do_after_cooldown(atom/target)
+	if(!chassis)
+		return
+	var/C = chassis.loc
+	set_ready_state(0)
+	chassis.use_power(energy_drain)
+	. = do_after(chassis.occupant, equip_cooldown, target=target)
+	set_ready_state(1)
+	if(!chassis || 	chassis.loc != C || src != chassis.selected)
+		return 0
+
+/obj/item/mecha_parts/mecha_equipment/proc/can_attach(obj/mecha/M)
 	if(istype(M))
 		if(M.equipment.len<M.max_equip)
 			return 1
 	return 0
 
-/obj/item/mecha_parts/mecha_equipment/proc/attach(obj/mecha/M as obj)
+/obj/item/mecha_parts/mecha_equipment/proc/attach(obj/mecha/M)
 	M.equipment += src
 	chassis = M
-	src.loc = M
+	loc = M
 	M.log_message("[src] initialized.")
 	if(!M.selected)
 		M.selected = src
-	src.update_chassis_page()
-	return
+	update_chassis_page()
 
-/obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto=null)
+/obj/item/mecha_parts/mecha_equipment/proc/detach(atom/moveto = null)
 	moveto = moveto || get_turf(chassis)
-	if(src.Move(moveto))
+	if(Move(moveto))
 		chassis.equipment -= src
 		if(chassis.selected == src)
 			chassis.selected = null
@@ -116,27 +128,22 @@
 		chassis.log_message("[src] removed from equipment.")
 		chassis = null
 		set_ready_state(1)
-	return
 
 
 /obj/item/mecha_parts/mecha_equipment/Topic(href,href_list)
 	if(href_list["detach"])
-		src.detach()
-	return
+		detach()
 
 
 /obj/item/mecha_parts/mecha_equipment/proc/set_ready_state(state)
 	equip_ready = state
 	if(chassis)
 		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
-	return
 
 /obj/item/mecha_parts/mecha_equipment/proc/occupant_message(message)
 	if(chassis)
 		chassis.occupant_message("[bicon(src)] [message]")
-	return
 
 /obj/item/mecha_parts/mecha_equipment/proc/log_message(message)
 	if(chassis)
 		chassis.log_message("<i>[src]:</i> [message]")
-	return

code/game/mecha/equipment/tools/mining_tools.dm

@@ -0,0 +1,136 @@
+// Drill, Diamond drill, Mining scanner
+
+/obj/item/mecha_parts/mecha_equipment/drill
+	name = "exosuit drill"
+	desc = "Equipment for engineering and combat exosuits. This is the drill that'll pierce the heavens!"
+	icon_state = "mecha_drill"
+	equip_cooldown = 30
+	energy_drain = 10
+	force = 15
+
+/obj/item/mecha_parts/mecha_equipment/drill/action(atom/target)
+	if(!action_checks(target))
+		return
+	if(istype(target, /turf/space))
+		return
+	if(isobj(target))
+		var/obj/target_obj = target
+		if(target_obj.unacidable)
+			return
+	target.visible_message("<span class='warning'>[chassis] starts to drill [target].</span>",
+					"<span class='userdanger'>[chassis] starts to drill [target]...</span>",
+					blind_message = "<span class='italics'>You hear drilling.</span>")
+	if(do_after_cooldown(target))
+		if(isturf(target))
+			var/turf/T = target
+			T.drill_act(src)
+		else
+			log_message("Drilled through [target]")
+			if(isliving(target))
+				if(istype(src , /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill))
+					drill_mob(target, chassis.occupant, 120)
+				else
+					drill_mob(target, chassis.occupant)
+			else
+				target.ex_act(2)
+
+/turf/proc/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	return
+
+/turf/simulated/floor/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	ex_act(1)
+
+/turf/simulated/wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	ex_act(2)
+
+/turf/simulated/wall/r_wall/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	if(istype(drill, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill))
+		if(drill.do_after_cooldown(src))//To slow down how fast mechs can drill through the station
+			drill.log_message("Drilled through [src]")
+			ex_act(3)
+	else
+		drill.occupant_message("<span class='danger'>[src] is too durable to drill through.</span>")
+
+/turf/simulated/mineral/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	for(var/turf/simulated/mineral/M in range(drill.chassis, 1))
+		if(get_dir(drill.chassis, M) & drill.chassis.dir)
+			M.gets_drilled()
+	drill.log_message("Drilled through [src]")
+	drill.move_ores()
+
+/turf/simulated/floor/plating/airless/asteroid/drill_act(obj/item/mecha_parts/mecha_equipment/drill/drill)
+	if(istype(drill, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill))
+		for(var/turf/simulated/floor/plating/airless/asteroid/M in range(1, src))
+			M.gets_drilled()
+	else
+		for(var/turf/simulated/floor/plating/airless/asteroid/M in range(1, drill.chassis))
+			if(get_dir(drill.chassis, M) & drill.chassis.dir)
+				M.gets_drilled()
+	drill.log_message("Drilled through [src]")
+	drill.move_ores()
+
+/obj/item/mecha_parts/mecha_equipment/drill/proc/move_ores()
+	if(locate(/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp) in chassis.equipment)
+		var/obj/structure/ore_box/ore_box = locate(/obj/structure/ore_box) in chassis:cargo
+		if(ore_box)
+			for(var/obj/item/weapon/ore/ore in range(1, chassis))
+				if(get_dir(chassis, ore) & chassis.dir)
+					ore.Move(ore_box)
+
+/obj/item/mecha_parts/mecha_equipment/drill/can_attach(obj/mecha/M)
+	if(..())
+		if(istype(M, /obj/mecha/working) || istype(M, /obj/mecha/combat))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/drill/proc/drill_mob(mob/living/target, mob/user, var/drill_damage=80)
+	target.visible_message("<span class='danger'>[chassis] drills [target] with [src].</span>", \
+						"<span class='userdanger'>[chassis] drills [target] with [src].</span>")
+	add_logs(user, target, "attacked", "[name]", "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
+	if(target.stat == DEAD && target.butcher_results)
+		target.harvest(chassis) // Butcher the mob with our drill.
+	else
+		target.take_organ_damage(drill_damage)
+
+	if(target)
+		target.Paralyse(10)
+		target.updatehealth()
+
+
+/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
+	name = "diamond-tipped exosuit drill"
+	desc = "Equipment for engineering and combat exosuits. This is an upgraded version of the drill that'll pierce the heavens!"
+	icon_state = "mecha_diamond_drill"
+	origin_tech = "materials=4;engineering=4"
+	equip_cooldown = 20
+	force = 15
+
+
+/obj/item/mecha_parts/mecha_equipment/mining_scanner
+	name = "exosuit mining scanner"
+	desc = "Equipment for engineering and combat exosuits. It will automatically check surrounding rock for useful minerals."
+	icon_state = "mecha_analyzer"
+	origin_tech = "materials=3;engineering=2"
+	selectable = 0
+	equip_cooldown = 30
+	var/scanning = 0
+
+/obj/item/mecha_parts/mecha_equipment/mining_scanner/New()
+	processing_objects.Add(src)
+
+/obj/item/mecha_parts/mecha_equipment/mining_scanner/process()
+	if(!loc)
+		processing_objects.Remove(src)
+		qdel(src)
+	if(scanning)
+		return
+	if(istype(loc,/obj/mecha/working))
+		var/obj/mecha/working/mecha = loc
+		if(!mecha.occupant)
+			return
+		var/list/occupant = list()
+		occupant |= mecha.occupant
+		scanning = 1
+		mineral_scan_pulse(occupant,get_turf(loc))
+		spawn(equip_cooldown)
+			scanning = 0

code/game/mecha/equipment/tools/other_tools.dm

@@ -0,0 +1,485 @@
+// Teleporter, Wormhole generator, Gravitational catapult, Armor booster modules,
+// Repair droid, Tesla Energy relay, Generators
+
+////////////////////////////////////////////// TELEPORTER ///////////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/teleporter
+	name = "mounted teleporter"
+	desc = "An exosuit module that allows exosuits to teleport to any position in view."
+	icon_state = "mecha_teleport"
+	origin_tech = "bluespace=10"
+	equip_cooldown = 150
+	energy_drain = 1000
+	range = RANGED
+
+/obj/item/mecha_parts/mecha_equipment/teleporter/action(atom/target)
+	if(!action_checks(target) || !is_teleport_allowed(loc.z))
+		return
+	var/turf/T = get_turf(target)
+	if(T)
+		do_teleport(chassis, T, 4)
+		return 1
+
+
+
+////////////////////////////////////////////// WORMHOLE GENERATOR //////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/wormhole_generator
+	name = "mounted wormhole generator"
+	desc = "An exosuit module that allows generating of small quasi-stable wormholes."
+	icon_state = "mecha_wholegen"
+	origin_tech = "bluespace=3"
+	equip_cooldown = 50
+	energy_drain = 300
+	range = RANGED
+
+/obj/item/mecha_parts/mecha_equipment/wormhole_generator/action(atom/target)
+	if(!action_checks(target) || !is_teleport_allowed(loc.z))
+		return
+	var/list/theareas = get_areas_in_range(100, chassis)
+	if(!theareas.len)
+		return
+	var/area/thearea = pick(theareas)
+	var/list/L = list()
+	var/turf/pos = get_turf(src)
+	for(var/turf/T in get_area_turfs(thearea.type))
+		if(!T.density && pos.z == T.z)
+			var/clear = 1
+			for(var/obj/O in T)
+				if(O.density)
+					clear = 0
+					break
+			if(clear)
+				L+=T
+	if(!L.len)
+		return
+	var/turf/target_turf = pick(L)
+	if(!target_turf)
+		return
+	var/obj/effect/portal/P = new /obj/effect/portal(get_turf(target), target_turf)
+	P.icon = 'icons/obj/objects.dmi'
+	P.failchance = 0
+	P.icon_state = "anom"
+	P.name = "wormhole"
+	message_admins("[key_name_admin(chassis.occupant, chassis.occupant.client)](<A HREF='?_src_=holder;adminmoreinfo=\ref[chassis.occupant]'>?</A>) (<A HREF='?_src_=holder;adminplayerobservefollow=\ref[chassis.occupant]'>FLW</A>) used a Wormhole Generator in ([loc.x],[loc.y],[loc.z] - <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[loc.x];Y=[loc.y];Z=[loc.z]'>JMP</a>)",0,1)
+	log_game("[key_name(chassis.occupant)] used a Wormhole Generator in ([loc.x],[loc.y],[loc.z])")
+	src = null
+	spawn(rand(150,300))
+		qdel(P)
+	return 1
+
+/////////////////////////////////////// GRAVITATIONAL CATAPULT ///////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/gravcatapult
+	name = "mounted gravitational catapult"
+	desc = "An exosuit mounted Gravitational Catapult."
+	icon_state = "mecha_teleport"
+	origin_tech = "bluespace=2;magnets=3"
+	equip_cooldown = 10
+	energy_drain = 100
+	range = MELEE|RANGED
+	var/atom/movable/locked
+	var/mode = 1 //1 - gravsling 2 - gravpush
+
+/obj/item/mecha_parts/mecha_equipment/gravcatapult/action(atom/movable/target)
+	if(!action_checks(target))
+		return
+	switch(mode)
+		if(1)
+			if(!locked)
+				if(!istype(target) || target.anchored)
+					occupant_message("Unable to lock on [target]")
+					return
+				locked = target
+				occupant_message("Locked on [target]")
+				send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+			else if(target!=locked)
+				if(locked in view(chassis))
+					locked.throw_at(target, 14, 1.5)
+					locked = null
+					send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+					return 1
+				else
+					locked = null
+					occupant_message("Lock on [locked] disengaged.")
+					send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+		if(2)
+			var/list/atoms = list()
+			if(isturf(target))
+				atoms = range(3, target)
+			else
+				atoms = orange(3, target)
+			for(var/atom/movable/A in atoms)
+				if(A.anchored) continue
+				spawn(0)
+					var/iter = 5-get_dist(A,target)
+					for(var/i=0 to iter)
+						step_away(A,target)
+						sleep(2)
+			var/turf/T = get_turf(target)
+			log_game("[chassis.occupant.ckey]([chassis.occupant]) used a Gravitational Catapult in ([T.x],[T.y],[T.z])")
+			return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/gravcatapult/get_equip_info()
+	return "[..()] [mode==1?"([locked||"Nothing"])":null] \[<a href='?src=\ref[src];mode=1'>S</a>|<a href='?src=\ref[src];mode=2'>P</a>\]"
+
+/obj/item/mecha_parts/mecha_equipment/gravcatapult/Topic(href, href_list)
+	..()
+	if(href_list["mode"])
+		mode = text2num(href_list["mode"])
+		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+	return
+
+//////////////////////////// ARMOR BOOSTER MODULES //////////////////////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster //what is that noise? A BAWWW from TK mutants.
+	name = "Armor Booster Module (Close Combat Weaponry)"
+	desc = "Boosts exosuit armor against armed melee attacks. Requires energy to operate."
+	icon_state = "mecha_abooster_ccw"
+	origin_tech = "materials=3"
+	equip_cooldown = 10
+	energy_drain = 50
+	range = 0
+	var/deflect_coeff = 1.15
+	var/damage_coeff = 0.8
+	selectable = 0
+
+/obj/item/mecha_parts/mecha_equipment/anticcw_armor_booster/proc/attack_react(mob/user as mob)
+	if(action_checks(user))
+		start_cooldown()
+	return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster
+	name = "Armor Booster Module (Ranged Weaponry)"
+	desc = "Boosts exosuit armor against ranged attacks. Completely blocks taser shots. Requires energy to operate."
+	icon_state = "mecha_abooster_proj"
+	origin_tech = "materials=4"
+	equip_cooldown = 10
+	energy_drain = 50
+	range = 0
+	var/deflect_coeff = 1.15
+	var/damage_coeff = 0.8
+	selectable = 0
+
+/obj/item/mecha_parts/mecha_equipment/antiproj_armor_booster/proc/projectile_react()
+	if(action_checks(src))
+		start_cooldown()
+		return 1
+
+
+////////////////////////////////// REPAIR DROID //////////////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid
+	name = "Repair Droid"
+	desc = "Automated repair droid. Scans exosuit for damage and repairs it. Can fix almost all types of external or internal damage."
+	icon_state = "repair_droid"
+	origin_tech = "magnets=3;programming=3"
+	equip_cooldown = 20
+	energy_drain = 100
+	range = 0
+	var/health_boost = 1
+	var/icon/droid_overlay
+	var/list/repairable_damage = list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH)
+	selectable = 0
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/Destroy()
+	processing_objects.Remove(src)
+	if(chassis)
+		chassis.overlays -= droid_overlay
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/attach(obj/mecha/M)
+	..()
+	droid_overlay = new(icon, icon_state = "repair_droid")
+	M.overlays += droid_overlay
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/detach()
+	chassis.overlays -= droid_overlay
+	processing_objects.Remove(src)
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/get_equip_info()
+	if(!chassis) return
+	return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp; [name] - <a href='?src=\ref[src];toggle_repairs=1'>[equip_ready?"A":"Dea"]ctivate</a>"
+
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/Topic(href, href_list)
+	..()
+	if(href_list["toggle_repairs"])
+		chassis.overlays -= droid_overlay
+		if(equip_ready)
+			processing_objects.Add(src)
+			droid_overlay = new(icon, icon_state = "repair_droid_a")
+			log_message("Activated.")
+			set_ready_state(0)
+		else
+			processing_objects.Remove(src)
+			droid_overlay = new(icon, icon_state = "repair_droid")
+			log_message("Deactivated.")
+			set_ready_state(1)
+		chassis.overlays += droid_overlay
+		send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+
+
+/obj/item/mecha_parts/mecha_equipment/repair_droid/process()
+	if(!chassis)
+		processing_objects.Remove(src)
+		set_ready_state(1)
+		return
+	var/h_boost = health_boost
+	var/repaired = 0
+	if(chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
+		h_boost *= -2
+	else if(chassis.internal_damage && prob(15))
+		for(var/int_dam_flag in repairable_damage)
+			if(chassis.internal_damage & int_dam_flag)
+				chassis.clearInternalDamage(int_dam_flag)
+				repaired = 1
+				break
+	if(health_boost<0 || chassis.health < initial(chassis.health))
+		chassis.health += min(health_boost, initial(chassis.health)-chassis.health)
+		repaired = 1
+	if(repaired)
+		if(!chassis.use_power(energy_drain))
+			processing_objects.Remove(src)
+			set_ready_state(1)
+	else //no repair needed, we turn off
+		processing_objects.Remove(src)
+		set_ready_state(1)
+		chassis.overlays -= droid_overlay
+		droid_overlay = new(icon, icon_state = "repair_droid")
+		chassis.overlays += droid_overlay
+
+/////////////////////////////////// TESLA ENERGY RELAY ////////////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay
+	name = "exosuit energy relay"
+	desc = "An exosuit module that wirelessly drains energy from any available power channel in area. The performance index is quite low."
+	icon_state = "tesla"
+	origin_tech = "magnets=4;powerstorage=4;engineering=4"
+	energy_drain = 0
+	range = 0
+	var/coeff = 100
+	var/list/use_channels = list(EQUIP,ENVIRON,LIGHT)
+	selectable = 0
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/detach()
+	processing_objects.Remove(src)
+	..()
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_charge()
+	if(equip_ready) //disabled
+		return
+	var/area/A = get_area(chassis)
+	var/pow_chan = get_power_channel(A)
+	if(pow_chan)
+		return 1000 //making magic
+
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/proc/get_power_channel(var/area/A)
+	var/pow_chan
+	if(A)
+		for(var/c in use_channels)
+			if(A.powered(c))
+				pow_chan = c
+				break
+	return pow_chan
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/Topic(href, href_list)
+	..()
+	if(href_list["toggle_relay"])
+		if(equip_ready) //inactive
+			processing_objects.Add(src)
+			set_ready_state(0)
+			log_message("Activated.")
+		else
+			processing_objects.Remove(src)
+			set_ready_state(1)
+			log_message("Deactivated.")
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/get_equip_info()
+	if(!chassis) return
+	return "<span style=\"color:[equip_ready?"#0f0":"#f00"];\">*</span>&nbsp; [name] - <a href='?src=\ref[src];toggle_relay=1'>[equip_ready?"A":"Dea"]ctivate</a>"
+
+
+/obj/item/mecha_parts/mecha_equipment/tesla_energy_relay/process()
+	if(!chassis || chassis.internal_damage & MECHA_INT_SHORT_CIRCUIT)
+		processing_objects.Remove(src)
+		set_ready_state(1)
+		return
+	var/cur_charge = chassis.get_charge()
+	if(isnull(cur_charge) || !chassis.cell)
+		processing_objects.Remove(src)
+		set_ready_state(1)
+		occupant_message("No powercell detected.")
+		return
+	if(cur_charge < chassis.cell.maxcharge)
+		var/area/A = get_area(chassis)
+		if(A)
+			var/pow_chan
+			for(var/c in list(EQUIP,ENVIRON,LIGHT))
+				if(A.powered(c))
+					pow_chan = c
+					break
+			if(pow_chan)
+				var/delta = min(20, chassis.cell.maxcharge-cur_charge)
+				chassis.give_power(delta)
+				A.use_power(delta*coeff, pow_chan)
+
+/////////////////////////////////////////// GENERATOR /////////////////////////////////////////////
+
+/obj/item/mecha_parts/mecha_equipment/generator
+	name = "exosuit plasma converter"
+	desc = "An exosuit module that generates power using solid plasma as fuel. Pollutes the environment."
+	icon_state = "tesla"
+	origin_tech = "plasmatech=2;powerstorage=2;engineering=2"
+	range = MELEE
+	var/coeff = 100
+	var/fuel_type = MAT_PLASMA
+	var/max_fuel = 150000
+	var/fuel_name = "plasma" // Our fuel name as a string
+	var/fuel_amount = 0
+	var/fuel_per_cycle_idle = 10
+	var/fuel_per_cycle_active = 100
+	var/power_per_cycle = 30
+
+
+/obj/item/mecha_parts/mecha_equipment/generator/Destroy()
+	processing_objects.Remove(src)
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/generator/detach()
+	processing_objects.Remove(src)
+	..()
+
+/obj/item/mecha_parts/mecha_equipment/generator/Topic(href, href_list)
+	..()
+	if(href_list["toggle"])
+		if(equip_ready) //inactive
+			set_ready_state(0)
+			processing_objects.Add(src)
+			log_message("Activated.")
+		else
+			set_ready_state(1)
+			processing_objects.Remove(src)
+			log_message("Deactivated.")
+
+/obj/item/mecha_parts/mecha_equipment/generator/get_equip_info()
+	var/output = ..()
+	if(output)
+		return "[output] \[[fuel_name]: [round(fuel_amount,0.1)] cm<sup>3</sup>\] - <a href='?src=\ref[src];toggle=1'>[equip_ready?"A":"Dea"]ctivate</a>"
+
+/obj/item/mecha_parts/mecha_equipment/generator/action(target)
+	if(chassis)
+		var/result = load_fuel(target)
+		if(result)
+			send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",get_equip_info())
+
+/obj/item/mecha_parts/mecha_equipment/generator/proc/load_fuel(var/obj/item/I)
+	if(istype(I) && (fuel_type in I.materials))
+		if(istype(I, /obj/item/stack/sheet))
+			var/obj/item/stack/sheet/P = I
+			var/to_load = max(max_fuel - P.amount*P.perunit,0)
+			if(to_load)
+				var/units = min(max(round(to_load / P.perunit),1),P.amount)
+				if(units)
+					var/added_fuel = units * P.perunit
+					fuel_amount += added_fuel
+					P.use(units)
+					occupant_message("[units] unit\s of [fuel_name] successfully loaded.")
+					return added_fuel
+			else
+				occupant_message("Unit is full.")
+				return 0
+		else // Some other object containing our fuel's type, so we just eat it (ores mainly)
+			var/to_load = max(min(I.materials[fuel_type], max_fuel - fuel_amount),0)
+			if(to_load == 0)
+				return 0
+			fuel_amount += to_load
+			qdel(I)
+			return to_load
+
+	else if(istype(I, /obj/structure/ore_box))
+		var/fuel_added = 0
+		for(var/baz in I.contents)
+			var/obj/item/O = baz
+			if(fuel_type in O.materials)
+				fuel_added = load_fuel(O)
+				break
+		return fuel_added
+
+	else
+		occupant_message("<span class='warning'>[fuel_name] traces in target minimal! [I] cannot be used as fuel.</span>")
+		return
+
+/obj/item/mecha_parts/mecha_equipment/generator/attackby(weapon,mob/user, params)
+	load_fuel(weapon)
+
+/obj/item/mecha_parts/mecha_equipment/generator/critfail()
+	..()
+	var/turf/simulated/T = get_turf(src)
+	if(!istype(T))
+		return
+	var/datum/gas_mixture/GM = new
+	if(prob(10))
+		GM.toxins += 100
+		GM.temperature = 1500+T0C //should be enough to start a fire
+		T.visible_message("[src] suddenly disgorges a cloud of heated plasma.")
+		qdel(src)
+	else
+		GM.toxins += 5
+		GM.temperature = istype(T) ? T.air.return_temperature() : T20C
+		T.visible_message("[src] suddenly disgorges a cloud of plasma.")
+	T.assume_air(GM)
+
+/obj/item/mecha_parts/mecha_equipment/generator/process()
+	if(!chassis)
+		processing_objects.Remove(src)
+		set_ready_state(1)
+		return
+	if(fuel_amount<=0)
+		processing_objects.Remove(src)
+		log_message("Deactivated - no fuel.")
+		set_ready_state(1)
+		return
+	var/cur_charge = chassis.get_charge()
+	if(isnull(cur_charge))
+		set_ready_state(1)
+		occupant_message("No powercell detected.")
+		log_message("Deactivated.")
+		processing_objects.Remove(src)
+		return
+	var/use_fuel = fuel_per_cycle_idle
+	if(cur_charge < chassis.cell.maxcharge)
+		use_fuel = fuel_per_cycle_active
+		chassis.give_power(power_per_cycle)
+	fuel_amount -= min(use_fuel, fuel_amount)
+	update_equip_info()
+	return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/generator/nuclear
+	name = "exonuclear reactor"
+	desc = "An exosuit module that generates power using uranium as fuel. Pollutes the environment."
+	icon_state = "tesla"
+	origin_tech = "powerstorage=4;engineering=4"
+	fuel_name = "uranium" // Our fuel name as a string
+	fuel_type = MAT_URANIUM
+	max_fuel = 50000
+	fuel_per_cycle_idle = 10
+	fuel_per_cycle_active = 30
+	power_per_cycle = 50
+	var/rad_per_cycle = 0.3
+
+/obj/item/mecha_parts/mecha_equipment/generator/nuclear/critfail()
+	return
+
+/obj/item/mecha_parts/mecha_equipment/generator/nuclear/process()
+	if(..())
+		for(var/mob/living/carbon/M in view(chassis))
+			M.apply_effect((rad_per_cycle * 3),IRRADIATE,0)

code/game/mecha/equipment/tools/work_tools.dm

@@ -0,0 +1,452 @@
+//Hydraulic clamp, Kill clamp, Extinguisher, RCD, Mime RCD, Cable layer.
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
+	name = "hydraulic clamp"
+	desc = "Equipment for engineering exosuits. Lifts objects and loads them into cargo."
+	icon_state = "mecha_clamp"
+	equip_cooldown = 15
+	energy_drain = 10
+	var/dam_force = 20
+	var/obj/mecha/working/ripley/cargo_holder
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/can_attach(obj/mecha/working/ripley/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/attach(obj/mecha/M)
+	..()
+	cargo_holder = M
+	return
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/detach(atom/moveto = null)
+	..()
+	cargo_holder = null
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/action(atom/target)
+	if(!action_checks(target))
+		return
+	if(!cargo_holder)
+		return
+	if(istype(target,/obj))
+		var/obj/O = target
+		if(!O.anchored)
+			if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
+				chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
+				O.anchored = 1
+				if(do_after_cooldown(target))
+					cargo_holder.cargo += O
+					O.loc = chassis
+					O.anchored = 0
+					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
+					log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
+				else
+					O.anchored = initial(O.anchored)
+			else
+				occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
+		else
+			occupant_message("<span class='warning'>[target] is firmly secured!</span>")
+
+	else if(istype(target,/mob/living))
+		var/mob/living/M = target
+		if(M.stat == DEAD) return
+		if(chassis.occupant.a_intent == I_HARM)
+			M.take_overall_damage(dam_force)
+			if(!M)
+				return
+			M.adjustOxyLoss(round(dam_force/2))
+			M.updatehealth()
+			target.visible_message("<span class='danger'>[chassis] squeezes [target].</span>", \
+								"<span class='userdanger'>[chassis] squeezes [target].</span>",\
+								"<span class='italics'>You hear something crack.</span>")
+			add_logs(chassis.occupant, M, "attacked", "[name]", "(INTENT: [uppertext(chassis.occupant.a_intent)]) (DAMTYE: [uppertext(damtype)])")
+			start_cooldown()
+		else
+			step_away(M,chassis)
+			occupant_message("You push [target] out of the way.")
+			chassis.visible_message("[chassis] pushes [target] out of the way.")
+		return 1
+
+
+
+//This is pretty much just for the death-ripley
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
+	name = "\improper KILL CLAMP"
+	desc = "They won't know what clamped them!"
+	energy_drain = 0
+
+/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill/action(atom/target)
+	if(!action_checks(target)) return
+	if(!cargo_holder) return
+	if(istype(target,/obj))
+		var/obj/O = target
+		if(!O.anchored)
+			if(cargo_holder.cargo.len < cargo_holder.cargo_capacity)
+				chassis.visible_message("[chassis] lifts [target] and starts to load it into cargo compartment.")
+				O.anchored = 1
+				if(do_after_cooldown(target))
+					cargo_holder.cargo += O
+					O.loc = chassis
+					O.anchored = 0
+					occupant_message("<span class='notice'>[target] successfully loaded.</span>")
+					log_message("Loaded [O]. Cargo compartment capacity: [cargo_holder.cargo_capacity - cargo_holder.cargo.len]")
+				else
+					O.anchored = initial(O.anchored)
+			else
+				occupant_message("<span class='warning'>Not enough room in cargo compartment!</span>")
+		else
+			occupant_message("<span class='warning'>[target] is firmly secured!</span>")
+
+	else if(istype(target,/mob/living))
+		var/mob/living/M = target
+		if(M.stat == DEAD) return
+		if(chassis.occupant.a_intent == I_HARM)
+			target.visible_message("<span class='danger'>[chassis] destroys [target] in an unholy fury.</span>",
+								"<span class='userdanger'>[chassis] destroys [target] in an unholy fury.</span>")
+			M.gib()
+		/*if(chassis.occupant.a_intent == I_DISARM)
+			target.visible_message("<span class='danger'>[chassis] rips [target]'s arms off.</span>",
+								"<span class='userdanger'>[chassis] rips [target]'s arms off.</span>")*/
+		else
+			step_away(M,chassis)
+			target.visible_message("[chassis] tosses [target] like a piece of paper.")
+			return 1
+
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher
+	name = "exosuit extinguisher"
+	desc = "Equipment for engineering exosuits. A rapid-firing high capacity fire extinguisher."
+	icon_state = "mecha_exting"
+	equip_cooldown = 5
+	energy_drain = 0
+	range = MELEE|RANGED
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher/New()
+	create_reagents(1000)
+	reagents.add_reagent("water", 1000)
+	..()
+	return
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher/action(atom/target) //copypasted from extinguisher. TODO: Rewrite from scratch.
+	if(!action_checks(target) || get_dist(chassis, target)>3)
+		return
+
+	if(istype(target, /obj/structure/reagent_dispensers/watertank) && get_dist(chassis,target) <= 1)
+		var/obj/structure/reagent_dispensers/watertank/WT = target
+		WT.reagents.trans_to(src, 1000)
+		occupant_message("<span class='notice'>Extinguisher refilled.</span>")
+		playsound(chassis, 'sound/effects/refill.ogg', 50, 1, -6)
+	else
+		if(reagents.total_volume > 0)
+			playsound(chassis, 'sound/effects/extinguish.ogg', 75, 1, -3)
+			var/direction = get_dir(chassis,target)
+			var/turf/T = get_turf(target)
+			var/turf/T1 = get_step(T,turn(direction, 90))
+			var/turf/T2 = get_step(T,turn(direction, -90))
+
+			var/list/the_targets = list(T,T1,T2)
+			spawn(0)
+				for(var/a=0, a<5, a++)
+					var/obj/effect/effect/water/W = new /obj/effect/effect/water(get_turf(chassis))
+					if(!W)
+						return
+					var/turf/my_target = pick(the_targets)
+					var/datum/reagents/R = new/datum/reagents(5)
+					W.reagents = R
+					R.my_atom = W
+					reagents.trans_to(W,1)
+					for(var/b=0, b<4, b++)
+						if(!W)
+							return
+						step_towards(W,my_target)
+						if(!W)
+							return
+						var/turf/W_turf = get_turf(W)
+						W.reagents.reaction(W_turf)
+						for(var/atom/atm in W_turf)
+							W.reagents.reaction(atm)
+						if(W.loc == my_target)
+							break
+						sleep(2)
+		return 1
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher/get_equip_info()
+	return "[..()] \[[src.reagents.total_volume]\]"
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher/on_reagent_change()
+	return
+
+/obj/item/mecha_parts/mecha_equipment/extinguisher/can_attach(obj/mecha/working/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+
+/obj/item/mecha_parts/mecha_equipment/rcd
+	name = "Mounted RCD"
+	desc = "An exosuit-mounted Rapid Construction Device. (Can be attached to: Any exosuit)"
+	icon_state = "mecha_rcd"
+	origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4"
+	equip_cooldown = 10
+	energy_drain = 250
+	range = MELEE|RANGED
+	var/mode = 0 //0 - deconstruct, 1 - wall or floor, 2 - airlock.
+	var/canRwall = 0
+
+/obj/item/mecha_parts/mecha_equipment/rcd/New()
+	rcd_list += src
+	..()
+
+/obj/item/mecha_parts/mecha_equipment/rcd/Destroy()
+	rcd_list -= src
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/rcd/action(atom/target)
+	if(istype(target, /turf/space/transit))//>implying these are ever made -Sieve
+		return
+
+	if(!istype(target, /turf) && !istype(target, /obj/machinery/door/airlock))
+		target = get_turf(target)
+
+	if(!action_checks(target) || get_dist(chassis, target)>3)
+		return
+	playsound(chassis, 'sound/machines/click.ogg', 50, 1)
+
+	switch(mode)
+		if(0)
+			if(istype(target, /turf/simulated/wall))
+				if(istype(target, /turf/simulated/wall/r_wall) && !canRwall)
+					return 0
+				var/turf/simulated/wall/W = target
+				occupant_message("Deconstructing [target]...")
+				if(do_after_cooldown(W))
+					chassis.spark_system.start()
+					W.ChangeTurf(/turf/simulated/floor/plating)
+					playsound(W, 'sound/items/Deconstruct.ogg', 50, 1)
+			else if(istype(target, /turf/simulated/floor))
+				var/turf/simulated/floor/F = target
+				occupant_message("Deconstructing [target]...")
+				if(do_after_cooldown(F))
+					chassis.spark_system.start()
+					F.ChangeTurf(/turf/space)
+					F.air_update_turf()
+					playsound(F, 'sound/items/Deconstruct.ogg', 50, 1)
+			else if(istype(target, /obj/machinery/door/airlock))
+				occupant_message("Deconstructing [target]...")
+				if(do_after_cooldown(target))
+					chassis.spark_system.start()
+					qdel(target)
+					playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
+		if(1)
+			if(istype(target, /turf/space))
+				var/turf/space/S = target
+				occupant_message("Building Floor...")
+				if(do_after_cooldown(S))
+					S.ChangeTurf(/turf/simulated/floor/plating)
+					playsound(S, 'sound/items/Deconstruct.ogg', 50, 1)
+					chassis.spark_system.start()
+			else if(istype(target, /turf/simulated/floor))
+				var/turf/simulated/floor/F = target
+				occupant_message("Building Wall...")
+				if(do_after_cooldown(F))
+					F.ChangeTurf(/turf/simulated/wall)
+					playsound(F, 'sound/items/Deconstruct.ogg', 50, 1)
+					chassis.spark_system.start()
+		if(2)
+			if(istype(target, /turf/simulated/floor))
+				occupant_message("Building Airlock...")
+				if(do_after_cooldown(target))
+					chassis.spark_system.start()
+					var/obj/machinery/door/airlock/T = new /obj/machinery/door/airlock(target)
+					T.autoclose = 1
+					playsound(target, 'sound/items/Deconstruct.ogg', 50, 1)
+					playsound(target, 'sound/effects/sparks2.ogg', 50, 1)
+
+
+/obj/item/mecha_parts/mecha_equipment/rcd/Topic(href,href_list)
+	..()
+	if(href_list["mode"])
+		mode = text2num(href_list["mode"])
+		switch(mode)
+			if(0)
+				occupant_message("Switched RCD to Deconstruct.")
+			if(1)
+				occupant_message("Switched RCD to Construct.")
+			if(2)
+				occupant_message("Switched RCD to Construct Airlock.")
+
+/obj/item/mecha_parts/mecha_equipment/rcd/get_equip_info()
+	return "[..()] \[<a href='?src=\ref[src];mode=0'>D</a>|<a href='?src=\ref[src];mode=1'>C</a>|<a href='?src=\ref[src];mode=2'>A</a>\]"
+
+
+/obj/item/mecha_parts/mecha_equipment/mimercd
+	name = "mounted MRCD"
+	desc = "An exosuit-mounted Mime Rapid Construction Device. (Can be attached to: Recitence)"
+	icon_state = "mecha_rcd"
+	origin_tech = "materials=4;bluespace=3;magnets=4;powerstorage=4"
+	equip_cooldown = 10
+	energy_drain = 250
+	range = MELEE|RANGED
+
+/obj/item/mecha_parts/mecha_equipment/mimercd/can_attach(obj/mecha/combat/recitence/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/mimercd/action(atom/target)
+	if(istype(target, /turf/space/transit))//>implying these are ever made -Sieve
+		return
+	if(!istype(target, /turf))
+		target = get_turf(target)
+	if(!action_checks(target) || get_dist(chassis, target)>3)
+		return
+
+	if(istype(target, /turf/simulated/floor))
+		occupant_message("Building Wall...")
+		if(do_after_cooldown(target))
+			new /obj/structure/barricade/mime/mrcd(target)
+			chassis.spark_system.start()
+
+
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer
+	name = "cable layer"
+	desc = "Equipment for engineering exosuits. Lays cable along the exosuit's path."
+	icon_state = "mecha_wire"
+	var/datum/event/event
+	var/turf/old_turf
+	var/obj/structure/cable/last_piece
+	var/obj/item/stack/cable_coil/cable
+	var/max_cable = 1000
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/New()
+	cable = new(src)
+	cable.amount = 0
+	..()
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/can_attach(obj/mecha/working/M)
+	if(..())
+		if(istype(M))
+			return 1
+	return 0
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/attach()
+	..()
+	event = chassis.events.addEvent("onMove",src,"layCable")
+	return
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/detach()
+	chassis.events.clearEvent("onMove",event)
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/Destroy()
+	chassis.events.clearEvent("onMove",event)
+	return ..()
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/action(var/obj/item/stack/cable_coil/target)
+	if(!action_checks(target))
+		return
+	if(istype(target) && target.amount)
+		var/cur_amount = cable? cable.amount : 0
+		var/to_load = max(max_cable - cur_amount,0)
+		if(to_load)
+			to_load = min(target.amount, to_load)
+			if(!cable)
+				cable = new(src)
+				cable.amount = 0
+			cable.amount += to_load
+			target.use(to_load)
+			occupant_message("<span class='notice'>[to_load] meters of cable successfully loaded.</span>")
+			send_byjax(chassis.occupant,"exosuit.browser","\ref[src]",src.get_equip_info())
+		else
+			occupant_message("<span class='warning'>Reel is full.</span>")
+	else
+		occupant_message("<span class='warning'>Unable to load [target] - no cable found.</span>")
+
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/Topic(href,href_list)
+	..()
+	if(href_list["toggle"])
+		set_ready_state(!equip_ready)
+		occupant_message("[src] [equip_ready?"dea":"a"]ctivated.")
+		log_message("[equip_ready?"Dea":"A"]ctivated.")
+		return
+	if(href_list["cut"])
+		if(cable && cable.amount)
+			var/m = round(input(chassis.occupant,"Please specify the length of cable to cut","Cut cable",min(cable.amount,30)) as num, 1)
+			m = min(m, cable.amount)
+			if(m)
+				use_cable(m)
+				var/obj/item/stack/cable_coil/CC = new (get_turf(chassis))
+				CC.amount = m
+		else
+			occupant_message("There's no more cable on the reel.")
+	return
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/get_equip_info()
+	var/output = ..()
+	if(output)
+		return "[output] \[Cable: [cable ? cable.amount : 0] m\][(cable && cable.amount) ? "- <a href='?src=\ref[src];toggle=1'>[!equip_ready?"Dea":"A"]ctivate</a>|<a href='?src=\ref[src];cut=1'>Cut</a>" : null]"
+	return
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/use_cable(amount)
+	if(!cable || cable.amount<1)
+		set_ready_state(1)
+		occupant_message("Cable depleted, [src] deactivated.")
+		log_message("Cable depleted, [src] deactivated.")
+		return
+	if(cable.amount < amount)
+		occupant_message("No enough cable to finish the task.")
+		return
+	cable.use(amount)
+	update_equip_info()
+	return 1
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/reset()
+	last_piece = null
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/dismantleFloor(var/turf/new_turf)
+	if(istype(new_turf, /turf/simulated/floor))
+		var/turf/simulated/floor/T = new_turf
+		if(!istype(T, /turf/simulated/floor/plating))
+			if(!T.broken && !T.burnt)
+				new T.floor_tile(T)
+			T.make_plating()
+	return !new_turf.intact
+
+/obj/item/mecha_parts/mecha_equipment/cable_layer/proc/layCable(var/turf/new_turf)
+	if(equip_ready || !istype(new_turf) || !dismantleFloor(new_turf))
+		return reset()
+	var/fdirn = turn(chassis.dir,180)
+	for(var/obj/structure/cable/LC in new_turf)		// check to make sure there's not a cable there already
+		if(LC.d1 == fdirn || LC.d2 == fdirn)
+			return reset()
+	if(!use_cable(1))
+		return reset()
+	var/obj/structure/cable/NC = new(new_turf)
+	NC.cableColor("red")
+	NC.d1 = 0
+	NC.d2 = fdirn
+	NC.updateicon()
+
+	var/datum/powernet/PN
+	if(last_piece && last_piece.d2 != chassis.dir)
+		last_piece.d1 = min(last_piece.d2, chassis.dir)
+		last_piece.d2 = max(last_piece.d2, chassis.dir)
+		last_piece.updateicon()
+		PN = last_piece.powernet
+
+	if(!PN)
+		PN = new()
+		powernets += PN
+	NC.powernet = PN
+	PN.cables += NC
+	NC.mergeConnectedNetworks(NC.d2)
+
+	//NC.mergeConnectedNetworksOnTurf()
+	last_piece = NC
+	return 1
+

code/game/mecha/mecha_topic.dm

@@ -0,0 +1,393 @@
+
+////////////////////////////////////
+///// Rendering stats window ///////
+////////////////////////////////////
+
+/obj/mecha/proc/get_stats_html()
+	var/output = {"<html>
+						<head><title>[name] data</title>
+						<style>
+						body {color: #00ff00; background: #000000; font-family:"Lucida Console",monospace; font-size: 12px;}
+						hr {border: 1px solid #0f0; color: #0f0; background-color: #0f0;}
+						a {padding:2px 5px;;color:#0f0;}
+						.wr {margin-bottom: 5px;}
+						.header {cursor:pointer;}
+						.open, .closed {background: #32CD32; color:#000; padding:1px 2px;}
+						.links a {margin-bottom: 2px;padding-top:3px;}
+						.visible {display: block;}
+						.hidden {display: none;}
+						</style>
+						<script language='javascript' type='text/javascript'>
+						[js_byjax]
+						[js_dropdowns]
+						function ticker() {
+						    setInterval(function(){
+						        window.location='byond://?src=\ref[src]&update_content=1';
+						    }, 1000);
+						}
+
+						window.onload = function() {
+							dropdowns();
+							ticker();
+						}
+						</script>
+						</head>
+						<body>
+						<div id='content'>
+						[get_stats_part()]
+						</div>
+						<div id='eq_list'>
+						[get_equipment_list()]
+						</div>
+						<hr>
+						<div id='commands'>
+						[get_commands()]
+						</div>
+						</body>
+						</html>
+					 "}
+	return output
+
+
+/obj/mecha/proc/report_internal_damage()
+	var/output = null
+	var/list/dam_reports = list(
+										"[MECHA_INT_FIRE]" = "<font color='red'><b>INTERNAL FIRE</b></font>",
+										"[MECHA_INT_TEMP_CONTROL]" = "<font color='red'><b>LIFE SUPPORT SYSTEM MALFUNCTION</b></font>",
+										"[MECHA_INT_TANK_BREACH]" = "<font color='red'><b>GAS TANK BREACH</b></font>",
+										"[MECHA_INT_CONTROL_LOST]" = "<font color='red'><b>COORDINATION SYSTEM CALIBRATION FAILURE</b></font> - <a href='?src=\ref[src];repair_int_control_lost=1'>Recalibrate</a>",
+										"[MECHA_INT_SHORT_CIRCUIT]" = "<font color='red'><b>SHORT CIRCUIT</b></font>"
+										)
+	for(var/tflag in dam_reports)
+		var/intdamflag = text2num(tflag)
+		if(hasInternalDamage(intdamflag))
+			output += dam_reports[tflag]
+			output += "<br />"
+	if(return_pressure() > WARNING_HIGH_PRESSURE)
+		output += "<font color='red'><b>DANGEROUSLY HIGH CABIN PRESSURE</b></font><br />"
+	return output
+
+
+/obj/mecha/proc/get_stats_part()
+	var/integrity = health/initial(health)*100
+	var/cell_charge = get_charge()
+	var/tank_pressure = internal_tank ? round(internal_tank.return_pressure(),0.01) : "None"
+	var/tank_temperature = internal_tank ? internal_tank.return_temperature() : "Unknown"
+	var/cabin_pressure = round(return_pressure(),0.01)
+	var/output = {"[report_internal_damage()]
+						[integrity<30?"<font color='red'><b>DAMAGE LEVEL CRITICAL</b></font><br>":null]
+						<b>Integrity: </b> [integrity]%<br>
+						<b>Powercell charge: </b>[isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]<br>
+						<b>Air source: </b>[use_internal_tank?"Internal Airtank":"Environment"]<br>
+						<b>Airtank pressure: </b>[tank_pressure]kPa<br>
+						<b>Airtank temperature: </b>[tank_temperature]&deg;K|[tank_temperature - T0C]&deg;C<br>
+						<b>Cabin pressure: </b>[cabin_pressure>WARNING_HIGH_PRESSURE ? "<font color='red'>[cabin_pressure]</font>": cabin_pressure]kPa<br>
+						<b>Cabin temperature: </b> [return_temperature()]&deg;K|[return_temperature() - T0C]&deg;C<br>
+						<b>Lights: </b>[lights?"on":"off"]<br>
+						[dna?"<b>DNA-locked:</b><br> <span style='font-size:10px;letter-spacing:-1px;'>[dna]</span> \[<a href='?src=\ref[src];reset_dna=1'>Reset</a>\]<br>":null]
+					"}
+	return output
+
+/obj/mecha/proc/get_commands()
+	var/output = {"<div class='wr'>
+						<div class='header'>Electronics</div>
+						<div class='links'>
+						<a href='?src=\ref[src];toggle_lights=1'>Toggle Lights</a><br>
+						<b>Radio settings:</b><br>
+						Microphone: <a href='?src=\ref[src];rmictoggle=1'><span id="rmicstate">[radio.broadcasting?"Engaged":"Disengaged"]</span></a><br>
+						Speaker: <a href='?src=\ref[src];rspktoggle=1'><span id="rspkstate">[radio.listening?"Engaged":"Disengaged"]</span></a><br>
+						Frequency:
+						<a href='?src=\ref[src];rfreq=-10'>-</a>
+						<a href='?src=\ref[src];rfreq=-2'>-</a>
+						<span id="rfreq">[format_frequency(radio.frequency)]</span>
+						<a href='?src=\ref[src];rfreq=2'>+</a>
+						<a href='?src=\ref[src];rfreq=10'>+</a><br>
+						</div>
+						</div>
+						<div class='wr'>
+						<div class='header'>Airtank</div>
+						<div class='links'>
+						<a href='?src=\ref[src];toggle_airtank=1'>Toggle Internal Airtank Usage</a><br>
+						[(/obj/mecha/verb/disconnect_from_port in verbs)?"<a href='?src=\ref[src];port_disconnect=1'>Disconnect from port</a><br>":null]
+						[(/obj/mecha/verb/connect_to_port in verbs)?"<a href='?src=\ref[src];port_connect=1'>Connect to port</a><br>":null]
+						</div>
+						</div>
+						<div class='wr'>
+						<div class='header'>Permissions & Logging</div>
+						<div class='links'>
+						<a href='?src=\ref[src];toggle_id_upload=1'><span id='t_id_upload'>[add_req_access?"L":"Unl"]ock ID upload panel</span></a><br>
+						<a href='?src=\ref[src];toggle_maint_access=1'><span id='t_maint_access'>[maint_access?"Forbid":"Permit"] maintenance protocols</span></a><br>
+						<a href='?src=\ref[src];dna_lock=1'>DNA-lock</a><br>
+						<a href='?src=\ref[src];view_log=1'>View internal log</a><br>
+						<a href='?src=\ref[src];change_name=1'>Change exosuit name</a><br>
+						</div>
+						</div>
+						<div id='equipment_menu'>[get_equipment_menu()]</div>
+						<hr>
+						[(/obj/mecha/verb/eject in verbs)?"<a href='?src=\ref[src];eject=1'>Eject</a><br>":null]
+						"}
+	return output
+
+/obj/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu
+	var/output
+	if(equipment.len)
+		output += {"<div class='wr'>
+						<div class='header'>Equipment</div>
+						<div class='links'>"}
+		for(var/obj/item/mecha_parts/mecha_equipment/W in equipment)
+			output += "[W.name] <a href='?src=\ref[W];detach=1'>Detach</a><br>"
+		output += "<b>Available equipment slots:</b> [max_equip-equipment.len]"
+		output += "</div></div>"
+	return output
+
+/obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html
+	if(!equipment.len)
+		return
+	var/output = "<b>Equipment:</b><div style=\"margin-left: 15px;\">"
+	for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
+		output += "<div id='\ref[MT]'>[MT.get_equip_info()]</div>"
+	output += "</div>"
+	return output
+
+
+/obj/mecha/proc/get_log_html()
+	var/output = "<html><head><title>[name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
+	for(var/list/entry in log)
+		output += {"<div style='font-weight: bold;'>[time2text(entry["time"],"DDD MMM DD hh:mm:ss")] 2555</div>
+						<div style='margin-left:15px; margin-bottom:10px;'>[entry["message"]]</div>
+						"}
+	output += "</body></html>"
+	return output
+
+
+/obj/mecha/proc/output_access_dialog(obj/item/weapon/card/id/id_card, mob/user)
+	if(!id_card || !user) return
+	var/output = {"<html>
+						<head><style>
+						h1 {font-size:15px;margin-bottom:4px;}
+						body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
+						a {color:#0f0;}
+						</style>
+						</head>
+						<body>
+						<h1>Following keycodes are present in this system:</h1>"}
+	for(var/a in operation_req_access)
+		output += "[get_access_desc(a)] - <a href='?src=\ref[src];del_req_access=[a];user=\ref[user];id_card=\ref[id_card]'>Delete</a><br>"
+	output += "<hr><h1>Following keycodes were detected on portable device:</h1>"
+	for(var/a in id_card.access)
+		if(a in operation_req_access) continue
+		var/a_name = get_access_desc(a)
+		if(!a_name) continue //there's some strange access without a name
+		output += "[a_name] - <a href='?src=\ref[src];add_req_access=[a];user=\ref[user];id_card=\ref[id_card]'>Add</a><br>"
+	output += "<hr><a href='?src=\ref[src];finish_req_access=1;user=\ref[user]'>Finish</a> <font color='red'>(Warning! The ID upload panel will be locked. It can be unlocked only through Exosuit Interface.)</font>"
+	output += "</body></html>"
+	user << browse(output, "window=exosuit_add_access")
+	onclose(user, "exosuit_add_access")
+	return
+
+/obj/mecha/proc/output_maintenance_dialog(obj/item/weapon/card/id/id_card,mob/user)
+	if(!id_card || !user) return
+	var/output = {"<html>
+						<head>
+						<style>
+						body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
+						a {padding:2px 5px; background:#32CD32;color:#000;display:block;margin:2px;text-align:center;text-decoration:none;}
+						</style>
+						</head>
+						<body>
+						[add_req_access?"<a href='?src=\ref[src];req_access=1;id_card=\ref[id_card];user=\ref[user]'>Edit operation keycodes</a>":null]
+						[maint_access?"<a href='?src=\ref[src];maint_access=1;id_card=\ref[id_card];user=\ref[user]'>Initiate maintenance protocol</a>":null]
+						[(state>0) ?"<a href='?src=\ref[src];set_internal_tank_valve=1;user=\ref[user]'>Set Cabin Air Pressure</a>":null]
+						</body>
+						</html>"}
+	user << browse(output, "window=exosuit_maint_console")
+	onclose(user, "exosuit_maint_console")
+	return
+
+
+////////////////////////////////
+/////// Messages and Log ///////
+////////////////////////////////
+
+/obj/mecha/proc/occupant_message(message as text)
+	if(message)
+		if(occupant && occupant.client)
+			to_chat(occupant, "[bicon(src)] [message]")
+	return
+
+/obj/mecha/proc/log_message(message as text,red=null)
+	log.len++
+	log[log.len] = list("time"=world.timeofday,"message"="[red?"<font color='red'>":null][message][red?"</font>":null]")
+	return log.len
+
+/obj/mecha/proc/log_append_to_last(message as text,red=null)
+	var/list/last_entry = log[log.len]
+	last_entry["message"] += "<br>[red?"<font color='red'>":null][message][red?"</font>":null]"
+	return
+
+
+/////////////////
+///// Topic /////
+/////////////////
+
+/obj/mecha/Topic(href, href_list)
+	..()
+	if(href_list["update_content"])
+		if(usr != occupant)	return
+		send_byjax(occupant,"exosuit.browser","content",get_stats_part())
+		return
+	if(href_list["close"])
+		return
+	if(usr.stat > 0)
+		return
+	var/datum/topic_input/filter = new /datum/topic_input(href,href_list)
+	if(href_list["select_equip"])
+		if(usr != occupant)	return
+		var/obj/item/mecha_parts/mecha_equipment/equip = filter.getObj("select_equip")
+		if(equip)
+			selected = equip
+			occupant_message("You switch to [equip]")
+			visible_message("[src] raises [equip]")
+			send_byjax(occupant,"exosuit.browser","eq_list",get_equipment_list())
+		return
+	if(href_list["eject"])
+		if(usr != occupant)	return
+		eject()
+		return
+	if(href_list["toggle_lights"])
+		if(usr != occupant)	return
+		toggle_lights()
+		return
+	if(href_list["toggle_airtank"])
+		if(usr != occupant)	return
+		toggle_internal_tank()
+		return
+	if(href_list["rmictoggle"])
+		if(usr != occupant)	return
+		radio.broadcasting = !radio.broadcasting
+		send_byjax(occupant,"exosuit.browser","rmicstate",(radio.broadcasting?"Engaged":"Disengaged"))
+		return
+	if(href_list["rspktoggle"])
+		if(usr != occupant)	return
+		radio.listening = !radio.listening
+		send_byjax(occupant,"exosuit.browser","rspkstate",(radio.listening?"Engaged":"Disengaged"))
+		return
+	if(href_list["rfreq"])
+		if(usr != occupant)	return
+		var/new_frequency = (radio.frequency + filter.getNum("rfreq"))
+		if((radio.frequency < PUBLIC_LOW_FREQ || radio.frequency > PUBLIC_HIGH_FREQ))
+			new_frequency = sanitize_frequency(new_frequency)
+		radio.set_frequency(new_frequency)
+		send_byjax(occupant,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]")
+		return
+	if(href_list["port_disconnect"])
+		if(usr != occupant)	return
+		disconnect_from_port()
+		return
+	if(href_list["port_connect"])
+		if(usr != occupant)	return
+		connect_to_port()
+		return
+	if(href_list["view_log"])
+		if(usr != occupant)	return
+		occupant << browse(get_log_html(), "window=exosuit_log")
+		onclose(occupant, "exosuit_log")
+		return
+	if(href_list["change_name"])
+		if(usr != occupant)	return
+		var/newname = strip_html_simple(input(occupant,"Choose new exosuit name","Rename exosuit",initial(name)) as text, MAX_NAME_LEN)
+		if(newname && trim(newname))
+			name = newname
+		else
+			alert(occupant, "nope.avi")
+		return
+	if(href_list["toggle_id_upload"])
+		if(usr != occupant)	return
+		add_req_access = !add_req_access
+		send_byjax(occupant,"exosuit.browser","t_id_upload","[add_req_access?"L":"Unl"]ock ID upload panel")
+		return
+	if(href_list["toggle_maint_access"])
+		if(usr != occupant)	return
+		if(state)
+			occupant_message("<font color='red'>Maintenance protocols in effect</font>")
+			return
+		maint_access = !maint_access
+		send_byjax(occupant,"exosuit.browser","t_maint_access","[maint_access?"Forbid":"Permit"] maintenance protocols")
+		return
+	if(href_list["req_access"] && add_req_access)
+		if(!in_range(src, usr))	return
+		output_access_dialog(filter.getObj("id_card"),filter.getMob("user"))
+		return
+	if(href_list["maint_access"] && maint_access)
+		if(!in_range(src, usr))	return
+		var/mob/user = filter.getMob("user")
+		if(user)
+			if(state==0)
+				state = 1
+				to_chat(user, "The securing bolts are now exposed.")
+			else if(state==1)
+				state = 0
+				to_chat(user, "The securing bolts are now hidden.")
+			output_maintenance_dialog(filter.getObj("id_card"),user)
+		return
+	if(href_list["set_internal_tank_valve"] && state >=1)
+		if(!in_range(src, usr))	return
+		var/mob/user = filter.getMob("user")
+		if(user)
+			var/new_pressure = input(user,"Input new output pressure","Pressure setting",internal_tank_valve) as num
+			if(new_pressure)
+				internal_tank_valve = new_pressure
+				to_chat(user, "The internal pressure valve has been set to [internal_tank_valve]kPa.")
+	if(href_list["add_req_access"] && add_req_access && filter.getObj("id_card"))
+		if(!in_range(src, usr))	return
+		operation_req_access += filter.getNum("add_req_access")
+		output_access_dialog(filter.getObj("id_card"),filter.getMob("user"))
+		return
+	if(href_list["del_req_access"] && add_req_access && filter.getObj("id_card"))
+		if(!in_range(src, usr))	return
+		operation_req_access -= filter.getNum("del_req_access")
+		output_access_dialog(filter.getObj("id_card"),filter.getMob("user"))
+		return
+	if(href_list["finish_req_access"])
+		if(!in_range(src, usr))	return
+		add_req_access = 0
+		var/mob/user = filter.getMob("user")
+		user << browse(null,"window=exosuit_add_access")
+		return
+	if(href_list["dna_lock"])
+		if(usr != occupant)
+			return
+		if(occupant && !iscarbon(occupant))
+			to_chat(occupant, "<span class='danger'>You do not have any DNA!</span>")
+			return
+		dna = occupant.dna.unique_enzymes
+		occupant_message("You feel a prick as the needle takes your DNA sample.")
+		return
+	if(href_list["reset_dna"])
+		if(usr != occupant)	return
+		dna = null
+	if(href_list["repair_int_control_lost"])
+		if(usr != occupant)	return
+		occupant_message("Recalibrating coordination system.")
+		log_message("Recalibration of coordination system started.")
+		var/T = loc
+		spawn(100)
+			if(T == loc)
+				clearInternalDamage(MECHA_INT_CONTROL_LOST)
+				occupant_message("<font color='blue'>Recalibration successful.</font>")
+				log_message("Recalibration of coordination system finished with 0 errors.")
+			else
+				occupant_message("<font color='red'>Recalibration failed.</font>")
+				log_message("Recalibration of coordination system failed with 1 error.",1)
+
+	//debug
+	/*
+	if(href_list["debug"])
+		if(href_list["set_i_dam"])
+			setInternalDamage(filter.getNum("set_i_dam"))
+		if(href_list["clear_i_dam"])
+			clearInternalDamage(filter.getNum("clear_i_dam"))
+		return
+	*/
+
+	return

code/game/mecha/medical/medical.dm

@@ -1,22 +1,7 @@
+/obj/mecha/medical
+	turnsound = 'sound/mecha/mechmove01.ogg'
+	stepsound = 'sound/mecha/mechstep.ogg'
+
 /obj/mecha/medical/New()
 	..()
 	new /obj/item/mecha_parts/mecha_tracking(src)
-	return
-
-
-/obj/mecha/medical/mechturn(direction)
-	dir = direction
-	playsound(src,'sound/mecha/mechmove01.ogg',40,1)
-	return 1
-
-/obj/mecha/medical/mechstep(direction)
-	var/result = step(src,direction)
-	if(result)
-		playsound(src,'sound/mecha/mechstep.ogg',25,1)
-	return result
-
-/obj/mecha/medical/mechsteprand()
-	var/result = step_rand(src)
-	if(result)
-		playsound(src,'sound/mecha/mechstep.ogg',25,1)
-	return result

code/game/mecha/medical/odysseus.dm

@@ -12,44 +12,35 @@
 	step_energy_drain = 6
 	var/builtin_hud_user = 0
 
-	moved_inside(var/mob/living/carbon/human/H as mob)
-		if(..())
-			if(H.glasses && istype(H.glasses, /obj/item/clothing/glasses/hud))
-				occupant_message("<span class='warning'>Your [H.glasses] prevent you from using the built-in medical hud.</span>")
-			else
-				var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
-				A.add_hud_to(H)
-				builtin_hud_user = 1
-			return 1
+/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H)
+	. = ..()
+	if(. && ishuman(H))
+		if(istype(H.glasses, /obj/item/clothing/glasses/hud))
+			occupant_message("<span class='warning'>[H.glasses] prevent you from using the built-in medical hud.</span>")
 		else
-			return 0
-
-	mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
-		if(..())
-			if(occupant.client)
-				var/datum/atom_hud/A = huds[DATA_HUD_MEDICAL_ADVANCED]
-				A.add_hud_to(occupant)
-				builtin_hud_user = 1
-			return 1
-		else
-			return 0
-
-	go_out()
-		if(istype(occupant,/mob/living/carbon/human)  && builtin_hud_user)
-			var/mob/living/carbon/human/H = occupant
 			var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
-			A.remove_hud_from(H)
-			builtin_hud_user = 0
-		else if((istype(occupant, /mob/living/carbon/brain) || pilot_is_mmi()) && builtin_hud_user )
-			var/mob/living/carbon/brain/H = occupant
+			A.add_hud_to(H)
+			builtin_hud_user = 1
+
+/obj/mecha/medical/odysseus/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc, mob/user)
+	. = ..()
+	if(.)
+		if(occupant.client)
 			var/datum/atom_hud/A = huds[DATA_HUD_MEDICAL_ADVANCED]
-			A.remove_hud_from(H)
-			builtin_hud_user = 0
+			A.add_hud_to(occupant)
+			builtin_hud_user = 1
 
-		..()
-		return
+/obj/mecha/medical/odysseus/go_out()
+	if(ishuman(occupant) && builtin_hud_user)
+		var/mob/living/carbon/human/H = occupant
+		var/datum/atom_hud/data/human/medical/advanced/A = huds[DATA_HUD_MEDICAL_ADVANCED]
+		A.remove_hud_from(H)
+		builtin_hud_user = 0
+	else if((isbrain(occupant) || pilot_is_mmi()) && builtin_hud_user)
+		var/mob/living/carbon/brain/H = occupant
+		var/datum/atom_hud/A = huds[DATA_HUD_MEDICAL_ADVANCED]
+		A.remove_hud_from(H)
+		builtin_hud_user = 0
+
+	. = ..()
 
-//TODO - Check documentation for client.eye and client.perspective...
-/obj/item/clothing/glasses/hud/health/mech
-	name = "Integrated Medical Hud"
-	HUDType = DATA_HUD_MEDICAL_ADVANCED

code/game/mecha/working/ripley.dm

@@ -14,52 +14,46 @@
 	var/list/cargo = new
 	var/cargo_capacity = 15
 
-/*
-/obj/mecha/working/ripley/New()
-	..()
-	return
-*/
-
 /obj/mecha/working/ripley/Move()
 	. = ..()
 	update_pressure()
 
 /obj/mecha/working/ripley/Destroy()
-	while(src.damage_absorption.["brute"] < 0.6)
-		new /obj/item/asteroid/goliath_hide(src.loc)
-		src.damage_absorption.["brute"] = src.damage_absorption.["brute"] + 0.1 //If a goliath-plated ripley gets killed, all the plates drop
-	for(var/atom/movable/A in src.cargo)
-		A.loc = loc
+	while(damage_absorption.["brute"] < 0.6)
+		new /obj/item/asteroid/goliath_hide(loc)
+		damage_absorption.["brute"] = damage_absorption.["brute"] + 0.1 //If a goliath-plated ripley gets killed, all the plates drop
+	for(var/atom/movable/A in cargo)
+		A.forceMove(loc)
 		step_rand(A)
 	cargo.Cut()
 	return ..()
 
 /obj/mecha/working/ripley/go_out()
 	..()
-	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-open")
-	else if(src.damage_absorption.["brute"] == 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open")
+	if(damage_absorption.["brute"] < 0.6 && damage_absorption.["brute"] > 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-open")
+	else if(damage_absorption.["brute"] == 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full-open")
 
 /obj/mecha/working/ripley/moved_inside(var/mob/living/carbon/human/H as mob)
 	..()
-	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
-	else if(src.damage_absorption.["brute"] == 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
+	if(damage_absorption.["brute"] < 0.6 && damage_absorption.["brute"] > 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
+	else if(damage_absorption.["brute"] == 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
 
 /obj/mecha/working/ripley/mmi_moved_inside(var/obj/item/device/mmi/mmi_as_oc as obj,mob/user as mob)
 	..()
-	if(src.damage_absorption.["brute"] < 0.6 && src.damage_absorption.["brute"] > 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
-	else if(src.damage_absorption.["brute"] == 0.3)
-		src.overlays = null
-		src.overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
+	if(damage_absorption.["brute"] < 0.6 && damage_absorption.["brute"] > 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g")
+	else if(damage_absorption.["brute"] == 0.3)
+		overlays = null
+		overlays += image("icon" = "mecha.dmi", "icon_state" = "ripley-g-full")
 
 /obj/mecha/working/ripley/firefighter
 	desc = "Standart APLU chassis was refitted with additional thermal protection and cistern."
@@ -90,7 +84,7 @@
 
 /obj/mecha/working/ripley/deathripley/New()
 	..()
-	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/tool/safety_clamp
+	var/obj/item/mecha_parts/mecha_equipment/ME = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/kill
 	ME.attach(src)
 	return
 
@@ -102,10 +96,10 @@
 	..()
 	//Attach drill
 	if(prob(25)) //Possible diamond drill... Feeling lucky?
-		var/obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill/D = new /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
+		var/obj/item/mecha_parts/mecha_equipment/drill/diamonddrill/D = new /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
 		D.attach(src)
 	else
-		var/obj/item/mecha_parts/mecha_equipment/tool/drill/D = new /obj/item/mecha_parts/mecha_equipment/tool/drill
+		var/obj/item/mecha_parts/mecha_equipment/drill/D = new /obj/item/mecha_parts/mecha_equipment/drill
 		D.attach(src)
 
 	//Add possible plasma cutter
@@ -117,12 +111,12 @@
 	cargo.Add(new /obj/structure/ore_box(src))
 
 	//Attach hydrolic clamp
-	var/obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp/HC = new /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
+	var/obj/item/mecha_parts/mecha_equipment/hydraulic_clamp/HC = new /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
 	HC.attach(src)
-	for(var/obj/item/mecha_parts/mecha_tracking/B in src.contents)//Deletes the beacon so it can't be found easily
+	for(var/obj/item/mecha_parts/mecha_tracking/B in contents)//Deletes the beacon so it can't be found easily
 		qdel(B)
 
-	var/obj/item/mecha_parts/mecha_equipment/tool/mining_scanner/scanner = new /obj/item/mecha_parts/mecha_equipment/tool/mining_scanner
+	var/obj/item/mecha_parts/mecha_equipment/mining_scanner/scanner = new /obj/item/mecha_parts/mecha_equipment/mining_scanner
 	scanner.attach(src)
 
 /obj/mecha/working/ripley/Exit(atom/movable/O)
@@ -134,14 +128,14 @@
 	..()
 	if(href_list["drop_from_cargo"])
 		var/obj/O = locate(href_list["drop_from_cargo"])
-		if(O && O in src.cargo)
-			src.occupant_message("\blue You unload [O].")
+		if(O && O in cargo)
+			occupant_message("\blue You unload [O].")
 			O.loc = get_turf(src)
-			src.cargo -= O
+			cargo -= O
 			var/turf/T = get_turf(O)
 			if(T)
 				T.Entered(O)
-			src.log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - src.cargo.len]")
+			log_message("Unloaded [O]. Cargo compartment capacity: [cargo_capacity - cargo.len]")
 	return
 
 
@@ -149,8 +143,8 @@
 /obj/mecha/working/ripley/get_stats_part()
 	var/output = ..()
 	output += "<b>Cargo Compartment Contents:</b><div style=\"margin-left: 15px;\">"
-	if(src.cargo.len)
-		for(var/obj/O in src.cargo)
+	if(cargo.len)
+		for(var/obj/O in cargo)
 			output += "<a href='?src=\ref[src];drop_from_cargo=\ref[O]'>Unload</a> : [O]<br>"
 	else
 		output += "Nothing"
@@ -159,12 +153,12 @@
 
 /obj/mecha/working/ripley/Destroy()
 	for(var/mob/M in src)
-		if(M==src.occupant)
+		if(M == occupant)
 			continue
 		M.loc = get_turf(src)
 		M.loc.Entered(M)
 		step_rand(M)
-	for(var/atom/movable/A in src.cargo)
+	for(var/atom/movable/A in cargo)
 		A.loc = get_turf(src)
 		var/turf/T = get_turf(A)
 		if(T)
@@ -179,9 +173,9 @@
 
 	if(pressure < 20)
 		step_in = 3
-		for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
 			drill.equip_cooldown = initial(drill.equip_cooldown)/2
 	else
 		step_in = 5
-		for(var/obj/item/mecha_parts/mecha_equipment/tool/drill/drill in equipment)
+		for(var/obj/item/mecha_parts/mecha_equipment/drill/drill in equipment)
 			drill.equip_cooldown = initial(drill.equip_cooldown)

code/game/mecha/working/working.dm

@@ -4,29 +4,3 @@
 /obj/mecha/working/New()
 	..()
 	new /obj/item/mecha_parts/mecha_tracking(src)
-	return
-
-/*
-/obj/mecha/working/melee_action(atom/target as obj|mob|turf)
-	if(internal_damage&MECHA_INT_CONTROL_LOST)
-		target = pick(oview(1,src))
-	if(selected_tool)
-		selected_tool.action(target)
-	return
-*/
-
-/obj/mecha/working/range_action(atom/target as obj|mob|turf)
-	return
-
-/*
-/obj/mecha/working/get_stats_part()
-	var/output = ..()
-	output += "<b>[src.name] Tools:</b><div style=\"margin-left: 15px;\">"
-	if(equipment.len)
-		for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
-			output += "[selected==MT?"<b>":"<a href='?src=\ref[src];select_equip=\ref[MT]'>"][MT.get_equip_info()][selected==MT?"</b>":"</a>"]<br>"
-	else
-		output += "None"
-	output += "</div>"
-	return output
-*/

code/game/objects/buckling.dm

@@ -29,6 +29,11 @@
 	. = ..()
 	unbuckle_mob()
 
+/atom/movable/proc/has_buckled_mobs()
+	if(buckled_mob)
+		return TRUE
+	return FALSE
+
 //procs that handle the actual buckling and unbuckling
 /atom/movable/proc/buckle_mob(mob/living/M)
 	if(!can_buckle || !istype(M) || (M.loc != loc) || M.buckled || M.buckled_mob || buckled_mob || (buckle_requires_restraints && !M.restrained()) || M == src)

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

@@ -53,6 +53,8 @@
 
 	var/max_uses = 20
 	var/uses = 0
+	var/shards = 0
+	var/recycle = 3
 	var/emagged = 0
 	var/failmsg = ""
 	// How much to increase per each glass?
@@ -68,7 +70,7 @@
 
 /obj/item/device/lightreplacer/examine(mob/user)
 	if(..(user, 2))
-		to_chat(user, "It has [uses] lights remaining.")
+		to_chat(user, "It has [uses] lights and [shards] shards remaining.")
 
 /obj/item/device/lightreplacer/attackby(obj/item/W, mob/user, params)
 	if(istype(W, /obj/item/stack/sheet/glass))
@@ -89,14 +91,46 @@
 	if(istype(W, /obj/item/weapon/light))
 		var/obj/item/weapon/light/L = W
 		if(L.status == 0) // LIGHT OKAY
+			if(!user.drop_item())
+				to_chat(user, "[L] is stuck to your hand!")
+				return
 			if(uses < max_uses)
 				AddUses(1)
 				to_chat(user, "You insert the [L.name] into the [src.name]. You have [uses] lights remaining.")
 				user.drop_item()
 				qdel(L)
 				return
-		else
-			to_chat(user, "You need a working light.")
+		else if(L.status == 2 || L.status == 3)
+			if(!user.drop_item())
+				to_chat(user, "[L] is stuck to your hand!")
+				return
+			else
+				AddShards(1)
+				to_chat(user, "You insert [L] into [src]. You have [shards] shards remaining.")
+				user.drop_item()
+				qdel(L)
+				return
+
+	if(istype(W, /obj/item/weapon/storage))
+		var/obj/item/weapon/storage/S = W
+		var/found_lightbulbs = 0
+
+		for(var/obj/item/I in S.contents)
+			if(istype(I,/obj/item/weapon/light))
+				var/obj/item/weapon/light/L = I
+				found_lightbulbs = 1
+				if(uses >= max_uses)
+					to_chat(user, "<span class='warning'>[src] is full!</span>")
+					break
+				if(L.status == 0)
+					AddUses(1)
+					qdel(L)
+				else if(L.status == 2 || L.status == 3)
+					AddShards(1)
+					qdel(L)
+			to_chat(user, "<span class='notice'>You fill [src] with lights from [S].")
+		if(!found_lightbulbs)
+			to_chat(user, "<span class='warning'>[S] contains no bulbs.</span>")
 			return
 
 /obj/item/device/lightreplacer/emag_act(user as mob)
@@ -128,6 +162,14 @@
 /obj/item/device/lightreplacer/proc/AddUses(var/amount = 1)
 	uses = min(max(uses + amount, 0), max_uses)
 
+/obj/item/device/lightreplacer/proc/AddShards(amount = 1)
+	shards += amount
+	var/recycled_lights = round(shards / recycle)
+	if(recycled_lights > 0)
+		AddUses(recycled_lights)
+	shards = shards % recycle
+	return recycled_lights
+
 /obj/item/device/lightreplacer/proc/Charge(var/mob/user)
 	charge += 1
 	if(charge > 7)
@@ -206,4 +248,4 @@
 #undef LIGHT_OK
 #undef LIGHT_EMPTY
 #undef LIGHT_BROKEN
-#undef LIGHT_BURNED
+#undef LIGHT_BURNED

code/game/objects/items/weapons/holosign.dm

@@ -11,7 +11,7 @@
 	throw_range = 7
 	origin_tech = "programming=3"
 	var/list/signs = list()
-	var/max_signs = 10
+	var/max_signs = 20
 
 /obj/item/weapon/holosign_creator/afterattack(atom/target, mob/user, flag)
 	if(flag)
@@ -45,4 +45,4 @@
 	desc = "The words flicker as if they mean nothing."
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "holosign"
-	anchored = 1
+	anchored = 1

code/game/objects/items/weapons/holy_weapons.dm

@@ -9,6 +9,7 @@
 	throwforce = 10
 	w_class = 1
 	var/reskinned = FALSE
+	var/reskin_selectable = TRUE			//set to FALSE if a subtype is meant to not normally be available as a reskin option (fluff ones will get re-added through their list)
 	var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/weapon/nullrod
 
 /obj/item/weapon/nullrod/suicide_act(mob/user)
@@ -31,7 +32,11 @@
 		reskin_holy_weapon(user)
 
 /obj/item/weapon/nullrod/proc/reskin_holy_weapon(mob/M)
-	var/list/holy_weapons_list = typesof(/obj/item/weapon/nullrod) - typesof(/obj/item/weapon/nullrod/fluff)
+	var/list/holy_weapons_list = typesof(/obj/item/weapon/nullrod)
+	for(var/entry in holy_weapons_list)
+		var/obj/item/weapon/nullrod/variant = entry
+		if(!initial(variant.reskin_selectable))
+			holy_weapons_list -= variant
 	if(fluff_transformations.len)
 		for(var/thing in fluff_transformations)
 			holy_weapons_list += thing
@@ -57,10 +62,13 @@
 		M.put_in_active_hand(holy_weapon)
 		qdel(src)
 
+/obj/item/weapon/nullrod/fluff		//fluff subtype to be used for all donator nullrods
+	reskin_selectable = FALSE
+
 /obj/item/weapon/nullrod/godhand
+	name = "god hand"
 	icon_state = "disintegrate"
 	item_state = "disintegrate"
-	name = "god hand"
 	desc = "This hand of yours glows with an awesome power!"
 	flags = ABSTRACT | NODROP
 	w_class = 5
@@ -69,9 +77,9 @@
 	attack_verb = list("punched", "cross countered", "pummeled")
 
 /obj/item/weapon/nullrod/staff
+	name = "red holy staff"
 	icon_state = "godstaff-red"
 	item_state = "godstaff-red"
-	name = "red holy staff"
 	desc = "It has a mysterious, protective aura."
 	w_class = 5
 	force = 5
@@ -84,9 +92,9 @@
 	item_state = "godstaff-blue"
 
 /obj/item/weapon/nullrod/claymore
+	name = "holy claymore"
 	icon_state = "claymore"
 	item_state = "claymore"
-	name = "holy claymore"
 	desc = "A weapon fit for a crusade!"
 	w_class = 4
 	slot_flags = SLOT_BACK|SLOT_BELT
@@ -102,26 +110,26 @@
 	return ..()
 
 /obj/item/weapon/nullrod/claymore/darkblade
+	name = "dark blade"
 	icon_state = "cultblade"
 	item_state = "cultblade"
-	name = "dark blade"
 	desc = "Spread the glory of the dark gods!"
 	slot_flags = SLOT_BELT
 	hitsound = 'sound/hallucinations/growl1.ogg'
 
 /obj/item/weapon/nullrod/claymore/chainsaw_sword
+	name = "sacred chainsaw sword"
 	icon_state = "chainswordon"
 	item_state = "chainswordon"
-	name = "sacred chainsaw sword"
 	desc = "Suffer not a heretic to live."
 	slot_flags = SLOT_BELT
 	attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
 	hitsound = 'sound/weapons/chainsaw.ogg'
 
 /obj/item/weapon/nullrod/claymore/glowing
+	name = "force weapon"
 	icon_state = "swordon"
 	item_state = "swordon"
-	name = "force weapon"
 	desc = "The blade glows with the power of faith. Or possibly a battery."
 	slot_flags = SLOT_BELT
 
@@ -171,9 +179,9 @@
 	attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 
 /obj/item/weapon/nullrod/scythe
+	name = "reaper scythe"
 	icon_state = "scythe0"
 	item_state = "scythe0"
-	name = "reaper scythe"
 	desc = "Ask not for whom the bell tolls..."
 	w_class = 4
 	armour_penetration = 35
@@ -184,16 +192,16 @@
 	hitsound = 'sound/weapons/bladeslice.ogg'
 
 /obj/item/weapon/nullrod/scythe/vibro
+	name = "high frequency blade"
 	icon_state = "hfrequency0"
 	item_state = "hfrequency1"
-	name = "high frequency blade"
 	desc = "Bad references are the DNA of the soul."
 	attack_verb = list("chopped", "sliced", "cut", "zandatsu'd")
 
 /obj/item/weapon/nullrod/scythe/talking
+	name = "possessed blade"
 	icon_state = "talking_sword"
 	item_state = "talking_sword"
-	name = "possessed blade"
 	desc = "When the station falls into chaos, it's nice to have a friend by your side."
 	attack_verb = list("chopped", "sliced", "cut")
 	hitsound = 'sound/weapons/bladeslice.ogg'
@@ -212,7 +220,7 @@
 
 	if(candidates.len)
 		theghost = pick(candidates)
-		var/mob/living/simple_animal/shade/S = new(src)
+		var/mob/living/simple_animal/shade/sword/S = new(src)
 		S.real_name = name
 		S.name = name
 		S.ckey = theghost.ckey
@@ -227,16 +235,16 @@
 		possessed = FALSE
 
 /obj/item/weapon/nullrod/scythe/talking/Destroy()
-	for(var/mob/living/simple_animal/shade/S in contents)
+	for(var/mob/living/simple_animal/shade/sword/S in contents)
 		to_chat(S, "You were destroyed!")
 		S.ghostize()
 		qdel(S)
 	return ..()
 
 /obj/item/weapon/nullrod/hammmer
+	name = "relic war hammer"
 	icon_state = "hammeron"
 	item_state = "hammeron"
-	name = "relic war hammer"
 	desc = "This war hammer cost the chaplain fourty thousand space dollars."
 	slot_flags = SLOT_BELT
 	w_class = 5
@@ -255,10 +263,10 @@
 	hitsound = 'sound/weapons/chainsaw.ogg'
 
 /obj/item/weapon/nullrod/clown
+	name = "clown dagger"
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "clownrender"
 	item_state = "gold_horn"
-	name = "clown dagger"
 	desc = "Used for absolutely hilarious sacrifices."
 	hitsound = 'sound/items/bikehorn.ogg'
 	sharp = 1
@@ -342,9 +350,9 @@
 	item_state = "bostaff0"
 
 /obj/item/weapon/nullrod/tribal_knife
+	name = "arrhythmic knife"
 	icon_state = "crysknife"
 	item_state = "crysknife"
-	name = "arrhythmic knife"
 	w_class = 5
 	desc = "They say fear is the true mind killer, but stabbing them in the head works too. Honour compels you to not sheathe it once drawn."
 	sharp = 1
@@ -366,9 +374,9 @@
 	slowdown = rand(-2, 2)
 
 /obj/item/weapon/nullrod/pitchfork
+	name = "unholy pitchfork"
 	icon_state = "pitchfork0"
 	item_state = "pitchfork0"
-	name = "unholy pitchfork"
 	w_class = 3
 	desc = "Holding this makes you look absolutely devilish."
 	attack_verb = list("poked", "impaled", "pierced", "jabbed")
@@ -377,9 +385,9 @@
 	edge = 1
 
 /obj/item/weapon/nullrod/rosary
+	name = "prayer beads"
 	icon_state = "rosary"
 	item_state = null
-	name = "prayer beads"
 	desc = "A set of prayer beads used by many of the more traditional religions in space.<br>Vampires and other unholy abominations have learned to fear these."
 	force = 0
 	throwforce = 0
@@ -445,5 +453,122 @@
 					if(prob(10))
 						to_chat(M, "<span class='userdanger'>Being in the presence of [holder]'s [src] is interfering with your powers!</span>")
 
+/obj/item/weapon/nullrod/missionary_staff
+	name = "holy staff"
+	desc = "It has a mysterious, protective aura."
+	description_antag = "This seemingly standard holy staff is actually a disguised neurotransmitter capable of inducing blind zealotry in its victims. It must be allowed to recharge in the presence of a linked set of missionary robes. Activate the staff while wearing robes to link, then aim the staff at your victim to try and convert them."
+	reskinned = TRUE
+	reskin_selectable = FALSE
+	icon_state = "godstaff-red"
+	item_state = "godstaff-red"
+	w_class = 5
+	force = 5
+	slot_flags = SLOT_BACK
+	block_chance = 50
 
+	var/team_color = "red"
+	var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robes = null		//the robes linked with this staff
+	var/faith = 99	//a conversion requires 100 faith to attempt. faith recharges over time while you are wearing missionary robes that have been linked to the staff.
 
+/obj/item/weapon/nullrod/missionary_staff/New()
+	team_color = pick("red", "blue")
+	icon_state = "godstaff-[team_color]"
+	item_state = "godstaff-[team_color]"
+	name = "[team_color] holy staff"
+
+/obj/item/weapon/nullrod/missionary_staff/Destroy()
+	if(robes)		//delink on destruction
+		robes.linked_staff = null
+		robes = null
+	return ..()
+
+/obj/item/weapon/nullrod/missionary_staff/attack_self(mob/user)
+	if(robes)	//as long as it is linked, sec can't try to meta by stealing your staff and seeing if they get the link error message
+		return 0
+	if(!ishuman(user))		//prevents the horror (runtimes) of missionary xenos and other non-human mobs that might be able to activate the item
+		return 0
+	var/mob/living/carbon/human/missionary = user
+	if(missionary.wear_suit && istype(missionary.wear_suit, /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe))
+		var/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/robe_to_link = missionary.wear_suit
+		if(robe_to_link.linked_staff)
+			to_chat(missionary, "<span class='warning'>These robes are already linked with a staff and cannot support another. Connection refused.</span>")
+			return 0
+		robes = robe_to_link
+		robes.linked_staff = src
+		to_chat(missionary, "<span class='notice'>Link established. Faith generators initialized. Go spread the word.</span>")
+		faith = 100		//full charge when a fresh link is made (can't be delinked without destroying the robes so this shouldn't be an exploitable thing)
+		return 1
+	else
+		to_chat(missionary, "<span class='warning'>You must be wearing the missionary robes you wish to link with this staff.</span>")
+		return 0
+
+/obj/item/weapon/nullrod/missionary_staff/afterattack(mob/living/carbon/human/target, mob/living/carbon/human/missionary, flag, params)
+	if(!istype(target) || !istype(missionary))		//ishuman checks effectively
+		return
+	if(target == missionary)	//you can't convert yourself, that would raise too many questions about your own dedication to the cause
+		return
+	if(!robes)		//staff must be linked to convert
+		to_chat(missionary, "<span class='warning'>You must link your staff to a set of missionary robes before attempting conversions.</span>")
+		return
+	if(!missionary.wear_suit || missionary.wear_suit != robes)	//must be wearing the robes to convert
+		return
+	if(faith < 100)
+		to_chat(missionary, "<span class='warning'>You don't have enough faith to attempt a conversion right now.</span>")
+		return
+	to_chat(missionary, "<span class='notice'>You concentrate on [target] and begin the conversion ritual...</span>")
+	if(!target.mind)	//no mind means no conversion, but also means no faith lost.
+		to_chat(missionary, "<span class='warning'>You halt the conversion as you realize [target] is mindless! Best to save your faith for someone more worthwhile.</span>")
+		return
+	if(do_after(missionary, 40))	//4 seconds to temporarily convert, roughly 1 second faster than a vampire's enthrall ability
+		if(faith < 100)		//to stop people from trying to exploit the do_after system to multi-convert, we check again if you have enough faith when it completes
+			to_chat(missionary, "<span class='warning'>You don't have enough faith to complete the conversion on [target]!</span>")
+			return
+		if(missionary in viewers(target))	//missionary must maintain line of sight to target, but the target doesn't necessary need to be able to see the missionary
+			do_convert(target, missionary)
+		else
+			to_chat(missionary, "<span class='warning'>You lost sight of the target before they could be converted!</span>")
+			faith -= 25		//they escaped, so you only lost a little faith (to prevent spamming)
+	else	//the do_after failed, probably because you moved or dropped the staff
+		to_chat(missionary, "<span class='warning'>Your concentration was broken!</span>")
+
+/obj/item/weapon/nullrod/missionary_staff/proc/do_convert(mob/living/carbon/human/target, mob/living/carbon/human/missionary)
+	var/convert_duration = 6000		//10 min
+	if(!target || !istype(target) || !missionary || !istype(missionary))
+		return
+	if(ismindslave(target) || target.mind.zealot_master)	//mindslaves and zealots override the staff because the staff is just a temporary mindslave
+		to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind is already slaved to someone else's ideals. Perhaps an inquisition would reveal more...</span>")
+		faith -= 25		//same faith cost as losing sight of them mid-conversion, but did you just find someone who can lead you to a fellow traitor?
+		return
+	if(isloyal(target))
+		if(prob(20))	//loyalty implants typically overpower this, but you CAN get lucky and convert still (20% chance of success)
+			faith -= 125	//yes, this puts it negative. it's gonna take longer to recharge if you manage to convert a one of these people to balance the new power you gained through them
+			to_chat(missionary, "<span class='notice'>Through sheer willpower, you overcome their closed mind and rally [target] to your cause! You may need a bit longer than usual before your faith is fully recharged, and they won't remain loyal to you for long ...</span>")
+			convert_duration = 3000		//5 min, because the loyalty implant will attempt to counteract the subversion
+		else	//80% chance to fail
+			faith -= 75
+			to_chat(missionary, "<span class='warning'>Your faith is strong, but their mind remains closed to your ideals. Your resolve helps you retain a bit of faith though.</span>")
+			return
+	else if(target.mind.assigned_role == "Psychiatrist" || target.mind.assigned_role == "Librarian")		//fancy book lernin helps counter religion (day 0 job love, what madness!)
+		if(prob(35))	//35% chance to fail
+			to_chat(missionary, "<span class='warning'>This one is well trained in matters of the mind... They will not be swayed as easily as you thought...</span>")
+			faith -=50		//lose half your faith to the book-readers
+			return
+		else
+			to_chat(missionary, "<span class='notice'>You successfully convert [target] to your cause. The following grows because of your faith!</span>")
+			faith -= 100
+	else if(target.mind.assigned_role == "Civilian")
+		if(prob(55))	//55% chance to take LESS faith than normal, because civies are stupid and easily manipulated
+			to_chat(missionary, "<span class='notice'>Your message seems to resound well with [target]; converting them was much easier than expected.</span>")
+			faith -= 50
+		else		//45% chance to take the normal 100 faith cost
+			to_chat(missionary, "<span class='notice'>You successfully convert [target] to your cause. The following grows because of your faith!</span>")
+			faith -= 100
+	else		//everyone else takes 100 faith cost because they are normal
+		to_chat(missionary, "<span class='notice'>You successfully convert [target] to your cause. The following grows because of your faith!</span>")
+		faith -= 100
+	//if you made it this far: congratulations! you are now a religious zealot!
+	target.mind.make_zealot(missionary, convert_duration, team_color)
+
+	target << sound('sound/misc/wololo.ogg', 0, 1, 25)
+	missionary.say("WOLOLO!")
+	missionary << sound('sound/misc/wololo.ogg', 0, 1, 25)

code/game/objects/items/weapons/implants/implant_explosive.dm

@@ -133,6 +133,8 @@
 /obj/item/weapon/implant/dust
 	name = "duster implant"
 	desc = "An alarm which monitors host vital signs, transmitting a radio message and dusting the corpse on death."
+	icon = 'icons/effects/blood.dmi'
+	icon_state = "remains"
 
 /obj/item/weapon/implant/dust/get_data()
 	var/dat = {"<b>Implant Specifications:</b><BR>

code/game/objects/items/weapons/implants/implant_traitor.dm

@@ -45,21 +45,21 @@
 				return -1
 			H.implanting = 1
 			to_chat(H, "<span class='notice'>You feel completely loyal to [user.name].</span>")
-			if(!(user.mind in ticker.mode:implanter))
-				ticker.mode:implanter[ref] = list()
-			implanters = ticker.mode:implanter[ref]
+			if(!(user.mind in ticker.mode.implanter))
+				ticker.mode.implanter[ref] = list()
+			implanters = ticker.mode.implanter[ref]
 			implanters.Add(H.mind)
 			ticker.mode.implanted.Add(H.mind)
 			ticker.mode.implanted[H.mind] = user.mind
-			//ticker.mode:implanter[user.mind] += H.mind
-			ticker.mode:implanter[ref] = implanters
+			//ticker.mode.implanter[user.mind] += H.mind
+			ticker.mode.implanter[ref] = implanters
 			ticker.mode.traitors += H.mind
 			H.mind.special_role = SPECIAL_ROLE_TRAITOR
 			to_chat(H, "<span class='warning'><B>You're now completely loyal to [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost.</span>")
 			var/datum/objective/protect/mindslave/MS = new
 			MS.owner = H.mind
-			MS.target = user:mind
-			MS.explanation_text = "Obey every order from and protect [user:real_name], the [user:mind:assigned_role=="MODE" ? (user:mind:special_role) : (user:mind:assigned_role)]."
+			MS.target = user.mind
+			MS.explanation_text = "Obey every order from and protect [user.real_name], the [user.mind.assigned_role=="MODE" ? (user.mind.special_role) : (user.mind.assigned_role)]."
 			H.mind.objectives += MS
 			for(var/datum/objective/objective in H.mind.objectives)
 				to_chat(H, "<B>Objective #1</B>: [objective.explanation_text]")

code/game/objects/items/weapons/mop.dm

@@ -73,13 +73,13 @@
 /obj/item/weapon/mop/advanced
 	desc = "The most advanced tool in a custodian's arsenal. Just think of all the viscera you will clean up with this!"
 	name = "advanced mop"
-	mopcap = 10
+	mopcap = 15
 	icon_state = "advmop"
 	item_state = "mop"	//meh will do for now until TG makes one
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
+	mopspeed = 10
 
 /obj/item/weapon/mop/advanced/cyborg
 	mopcap = 40
@@ -90,4 +90,4 @@
 
 /obj/item/weapon/mop/advanced/cyborg/examine(mob/user)
 	..(user)
-	to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")
+	to_chat(user, "<span class='notice'>The mop's water tank has [round(reagents.get_reagent_amount("water"))] units of water left.</span>")

code/game/objects/items/weapons/storage/bags.dm

@@ -33,7 +33,7 @@
 	icon_state = "trashbag"
 	item_state = "trashbag"
 
-	w_class = 4
+	w_class = 1
 	max_w_class = 2
 	storage_slots = 30
 	can_hold = list() // any
@@ -46,12 +46,17 @@
 
 /obj/item/weapon/storage/bag/trash/update_icon()
 	if(contents.len == 0)
+		w_class = 1
 		icon_state = "[initial(icon_state)]"
 	else if(contents.len < 12)
+		w_class = 4
 		icon_state = "[initial(icon_state)]1"
 	else if(contents.len < 21)
+		w_class = 4
 		icon_state = "[initial(icon_state)]2"
-	else icon_state = "[initial(icon_state)]3"
+	else
+		w_class = 4
+		icon_state = "[initial(icon_state)]3"
 
 /obj/item/weapon/storage/bag/trash/cyborg
 
@@ -499,4 +504,4 @@
 	max_combined_w_class = 200
 	w_class = 1
 	can_hold = list("/obj/item/slime_extract","/obj/item/weapon/reagent_containers/food/snacks/monkeycube","/obj/item/weapon/reagent_containers/syringe","/obj/item/weapon/reagent_containers/glass/beaker","/obj/item/weapon/reagent_containers/glass/bottle","/obj/item/weapon/reagent_containers/blood","/obj/item/weapon/reagent_containers/hypospray/autoinjector")
-	burn_state = FLAMMABLE
+	burn_state = FLAMMABLE

code/game/objects/items/weapons/storage/uplink_kits.dm

@@ -77,8 +77,7 @@
 				new /obj/item/weapon/melee/energy/sword/saber(src)
 				new /obj/item/weapon/melee/energy/sword/saber(src)
 				new /obj/item/weapon/dnainjector/telemut/darkbundle(src)
-				new /obj/item/clothing/head/chaplain_hood(src)
-				new /obj/item/clothing/suit/chaplain_hoodie(src)
+				new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
 				new /obj/item/weapon/card/id/syndicate(src)
 				return
 
@@ -205,3 +204,16 @@
 	..()
 	new /obj/item/weapon/grenade/clusterbuster/plasma(src)
 	new /obj/item/weapon/grenade/clusterbuster/n2o(src)
+
+/obj/item/weapon/storage/box/syndie_kit/missionary_set
+	name = "Missionary Starter Kit"
+
+/obj/item/weapon/storage/box/syndie_kit/missionary_set/New()
+	..()
+	new /obj/item/weapon/nullrod/missionary_staff(src)
+	new /obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe(src)
+	var/obj/item/weapon/storage/bible/B = new /obj/item/weapon/storage/bible(src)
+	if(prob(25))	//an omen of success to come?
+		B.deity_name = "Success"
+		B.icon_state = "greentext"
+		B.item_state = "greentext"

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -89,12 +89,6 @@
 	new /obj/item/weapon/extinguisher(src)
 	new /obj/item/clothing/head/hardhat/red(src)
 
-/obj/structure/closet/firecloset/update_icon()
-	if(!opened)
-		icon_state = icon_closed
-	else
-		icon_state = icon_opened
-
 
 /*
  * Tool Closet

code/game/turfs/simulated.dm

@@ -54,17 +54,16 @@
 /turf/simulated/Entered(atom/A, atom/OL, ignoreRest = 0)
 	..()
 	if(!ignoreRest)
-		if(ismob(A)) //only mobs make dirt
-			if(prob(80))
-				dirt++
+		if(isliving(A) && prob(50))
+			dirt++
 
-			var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt) in src
-			if(dirt >= 100)
-				if(!dirtoverlay)
-					dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
-					dirtoverlay.alpha = 10
-				else if(dirt > 100)
-					dirtoverlay.alpha = min(dirtoverlay.alpha + 10, 200)
+		var/obj/effect/decal/cleanable/dirt/dirtoverlay = locate(/obj/effect/decal/cleanable/dirt) in src
+		if(dirt >= 100)
+			if(!dirtoverlay)
+				dirtoverlay = new/obj/effect/decal/cleanable/dirt(src)
+				dirtoverlay.alpha = 10
+			else if(dirt > 100)
+				dirtoverlay.alpha = min(dirtoverlay.alpha + 10, 200)
 
 		if(ishuman(A))
 			var/mob/living/carbon/human/M = A
@@ -138,4 +137,4 @@
 	. = ..()
 	smooth_icon_neighbors(src)
 
-/turf/simulated/proc/is_shielded()
+/turf/simulated/proc/is_shielded()

code/game/turfs/simulated/walls_misc.dm

@@ -26,4 +26,5 @@
 /turf/simulated/wall/r_wall/coated			//Coated for heat resistance
 	name = "coated reinforced wall"
 	desc = "A huge chunk of reinforced metal used to seperate rooms. It seems to have additional plating to protect against heat."
+	icon = 'icons/turf/walls/coated_reinforced_wall.dmi'
 	max_temperature = INFINITY

code/game/turfs/turf.dm

@@ -200,6 +200,9 @@
 	levelupdate()
 	CalculateAdjacentTurfs()
 
+	if(air_master && !ignore_air)
+		air_master.add_to_active(src)
+
 	if(!keep_cabling && !can_have_cabling())
 		for(var/obj/structure/cable/C in contents)
 			qdel(C)

code/modules/admin/player_panel.dm

@@ -530,10 +530,6 @@
 		if(ticker.mode.greyshirts.len)
 			dat += check_role_table("Greyshirts", ticker.mode.greyshirts)
 
-		var/datum/game_mode/mutiny/mutiny = get_mutiny_mode()
-		if(mutiny)
-			dat += mutiny.check_antagonists_ui(src)
-
 		dat += "</body></html>"
 		usr << browse(dat, "window=roundstatus;size=400x500")
 	else

code/modules/admin/secrets.dm

@@ -67,8 +67,9 @@
 					<center>
 					<h2><B>IC Events</B></h2>
 					<b>Teams</b><br>
-					<A href='?src=\ref[src];secretsfun=striketeam'>Send in the Deathsquad</A>&nbsp;&nbsp;
-					<A href='?src=\ref[src];secretsfun=striketeam_syndicate'>Send in a syndicate strike team</A>&nbsp;&nbsp;
+					<A href='?src=\ref[src];secretsfun=infiltrators_syndicate'>Send SIT - Syndicate Infiltration Team</A>&nbsp;&nbsp;
+					<BR><A href='?src=\ref[src];secretsfun=striketeam'>Send in the Deathsquad</A>&nbsp;&nbsp;
+					<A href='?src=\ref[src];secretsfun=striketeam_syndicate'>Send in a Syndie Strike Team</A>&nbsp;&nbsp;
 					<A href='?src=\ref[src];secretsfun=honksquad'>Send in a HONKsquad</A><BR>
 					<b>Change Security Level</b><BR>
 					<A href='?src=\ref[src];secretsfun=securitylevel0'>Security Level - Green</A>&nbsp;&nbsp;

code/modules/admin/topic.dm

@@ -2273,6 +2273,10 @@
 				if(usr.client.syndicate_strike_team())
 					feedback_inc("admin_secrets_fun_used",1)
 					feedback_add_details("admin_secrets_fun_used","Strike")
+			if("infiltrators_syndicate")
+				if(usr.client.syndicate_infiltration_team())
+					feedback_inc("admin_secrets_fun_used",1)
+					feedback_add_details("admin_secrets_fun_used","SyndieInfiltrationTeam")
 			if("tripleAI")
 				usr.client.triple_ai()
 				feedback_inc("admin_secrets_fun_used",1)

code/modules/admin/verbs/debug.dm

@@ -780,11 +780,10 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes)
 			M.equip_to_slot_or_del(new /obj/item/clothing/gloves/color/black(M), slot_gloves)
 			M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask)
-			M.equip_to_slot_or_del(new /obj/item/clothing/head/chaplain_hood(M), slot_head)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(M), slot_belt)
 			M.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal/monocle(M), slot_glasses)
-			M.equip_to_slot_or_del(new /obj/item/clothing/suit/chaplain_hoodie(M), slot_wear_suit)
+			M.equip_to_slot_or_del(new /obj/item/clothing/suit/hooded/chaplain_hoodie(M), slot_wear_suit)
 			M.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/food/snacks/grown/banana(M), slot_l_store)
 			M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_r_store)
 			equip_special_id(M,list(access_clown, access_theatre, access_maint_tunnels), "Tunnel Clown", /obj/item/weapon/card/id)
@@ -913,11 +912,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 			M.equip_to_slot_or_del(new /obj/item/device/flashlight(M), slot_in_backpack)
 			M.equip_to_slot_or_del(new /obj/item/device/radio/headset/syndicate(M), slot_l_ear)
 			M.equip_to_slot_or_del(new /obj/item/weapon/twohanded/dualsaber/red(M), slot_l_hand)
-			var/obj/item/clothing/head/chaplain_hood/hood = new(M)
-			hood.name = "dark lord hood"
-			M.equip_to_slot_or_del(hood, slot_head)
-			var/obj/item/clothing/suit/chaplain_hoodie/robe = new(M)
+			var/obj/item/clothing/suit/hooded/chaplain_hoodie/robe = new /obj/item/clothing/suit/hooded/chaplain_hoodie(M)
 			robe.name = "dark lord robes"
+			robe.hood.name = "dark lord hood"
 			M.equip_to_slot_or_del(robe, slot_wear_suit)
 			equip_special_id(M,get_all_accesses(), "Dark Lord", /obj/item/weapon/card/id/syndicate, "syndie")
 
@@ -1387,20 +1384,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
 	spawn(30)
 		for(var/obj/machinery/the_singularitygen/G in machines)
 			if(G.anchored)
-				var/obj/singularity/S = new /obj/singularity(get_turf(G), 50)
-//				qdel(G)
-				S.energy = 1750
-				S.current_size = 7
-				S.icon = 'icons/effects/224x224.dmi'
-				S.icon_state = "singularity_s7"
-				S.pixel_x = -96
-				S.pixel_y = -96
-				S.grav_pull = 0
-				//S.consume_range = 3
-				S.dissipate = 0
-				//S.dissipate_delay = 10
-				//S.dissipate_track = 0
-				//S.dissipate_strength = 10
+				var/obj/singularity/S = new /obj/singularity(get_turf(G))
+				S.energy = 800
+				break
 
 	for(var/obj/machinery/power/rad_collector/Rad in machines)
 		if(Rad.anchored)

code/modules/admin/verbs/infiltratorteam_syndicate.dm

@@ -0,0 +1,219 @@
+// Syndicate Infiltration Team (SIT)
+// A little like Syndicate Strike Team (SST) but geared towards stealthy team missions rather than murderbone.
+
+var/global/sent_syndicate_infiltration_team = 0
+
+/client/proc/syndicate_infiltration_team()
+	set category = "Event"
+	set name = "Send Syndicate Infiltration Team"
+	set desc = "Spawns a squad of syndicate infiltrators on the Syndicate Mothership if you want to run an admin event."
+	if(!check_rights(R_ADMIN))
+		to_chat(src, "Only administrators may use this command.")
+		return
+	if(!ticker)
+		alert("The game hasn't started yet!")
+		return
+	if(alert("Do you want to send in the Syndicate Infiltration Team?",,"Yes","No")=="No")
+		return
+	var/spawn_dummies = 0
+	if(alert("Spawn full-size team, even if there aren't enough ghosts to populate them?",,"Yes","No")=="Yes")
+		spawn_dummies = 1
+	var/pick_manually = 0
+	if(alert("Pick the team members manually? If you select yes, you pick from ghosts. If you select no, ghosts get offered the chance to join.",,"Yes","No")=="Yes")
+		pick_manually = 1
+	var/list/teamsizeoptions = list(1,2,3,4,5)
+	var/teamsize = input(src, "How many team members, not counting the team leader?") as null|anything in teamsizeoptions
+	if(!(teamsize in teamsizeoptions))
+		alert("Invalid team size specified. Aborting.")
+		return
+	var/input = null
+	while(!input)
+		input = sanitize(copytext(input(src, "Please specify which mission the syndicate infiltration team shall undertake.", "Specify Mission", ""),1,MAX_MESSAGE_LEN))
+		if(!input)
+			alert("No mission specified. Aborting.")
+			return
+	var/tctext = input(src, "How much TC do you want to give each team member? Suggested: 20-30. They cannot trade TC.") as num
+	var/tcamount = text2num(tctext)
+	tcamount = between(0, tcamount, 1000)
+	var/spawn_sit_mgmt = 0
+	if(alert("Spawn a syndicate mob for you, so you can brief them before they go?",,"Yes","No")=="Yes")
+		spawn_sit_mgmt = 1
+	if(sent_syndicate_infiltration_team == 1)
+		if(alert("A Syndicate Infiltration Team has already been sent. Sure you want to send another?",,"Yes","No")=="No")
+			return
+
+	var/syndicate_leader_selected = 0
+
+	var/list/infiltrators = list()
+
+	if(pick_manually)
+		var/list/possible_ghosts = list()
+		for(var/mob/dead/observer/G in player_list)
+			if(!G.client.is_afk())
+				if(!(G.mind && G.mind.current && G.mind.current.stat != DEAD))
+					possible_ghosts += G
+		for(var/i=teamsize,(i>0&&possible_ghosts.len),i--) //Decrease with every SIT member selected.
+			var/candidate = input("Pick characters to spawn as a SIT member. This will go on until there either no more ghosts to pick from, or the slots are full.", "Active Players") as null|anything in possible_ghosts // auto-picks if only one candidate
+			possible_ghosts -= candidate
+			infiltrators += candidate
+	else
+		to_chat(src, "Polling candidates...")
+		infiltrators = pollCandidates("Do you want to play as a SYNDICATE INFILTRATOR?") // ROLE_TRAITOR, 7
+
+	if(!infiltrators.len)
+		to_chat(src, "Nobody volunteered.")
+		return 0
+
+	sent_syndicate_infiltration_team = 1
+
+	var/list/sit_spawns = list()
+	var/list/sit_spawns_leader = list()
+	var/list/sit_spawns_mgmt = list()
+	for(var/obj/effect/landmark/L in landmarks_list)
+		if(L.name == "Syndicate-Infiltrator")
+			sit_spawns += L
+		if(L.name == "Syndicate-Infiltrator-Leader")
+			sit_spawns_leader += L
+		if(L.name == "Syndicate-Infiltrator-Admin")
+			sit_spawns_mgmt += L
+
+	var/num_spawned = 1
+	var/team_leader = null
+	for(var/obj/effect/landmark/L in sit_spawns)
+		if(!infiltrators.len && !spawn_dummies) break
+		syndicate_leader_selected = num_spawned == 1?1:0
+		var/mob/living/carbon/human/new_syndicate_infiltrator = create_syndicate_infiltrator(L, syndicate_leader_selected, tcamount, 0)
+		if(infiltrators.len)
+			var/mob/theguy = pick(infiltrators)
+			if(!spawn_sit_mgmt || theguy.key != key)
+				new_syndicate_infiltrator.key = theguy.key
+				new_syndicate_infiltrator.internal = new_syndicate_infiltrator.s_store
+				new_syndicate_infiltrator.update_internals_hud_icon(1)
+			infiltrators -= theguy
+		to_chat(new_syndicate_infiltrator, "<span class='danger'>You are a [!syndicate_leader_selected?"Infiltrator":"<B>Lead Infiltrator</B>"] in the service of the Syndicate. \nYour current mission is: <B>[input]</B></span>")
+		to_chat(new_syndicate_infiltrator, "<span class='notice'>You are equipped with an uplink implant to help you achieve your objectives. ((activate it via button in top left of screen))</span>")
+		new_syndicate_infiltrator.faction += "syndicate"
+		data_core.manifest_inject(new_syndicate_infiltrator)
+		if(syndicate_leader_selected)
+			var/obj/effect/landmark/warpto = pick(sit_spawns_leader)
+			new_syndicate_infiltrator.loc = warpto.loc
+			sit_spawns_leader -= warpto
+			team_leader = new_syndicate_infiltrator
+			to_chat(new_syndicate_infiltrator, "<span class='danger'>As team leader, it is up to you to organize your team! Give the job to someone else if you can't handle it. Only your ID opens the exit door.</span>")
+		else
+			to_chat(new_syndicate_infiltrator, "<span class='danger'>Your team leader is: [team_leader]. They are in charge!</span>")
+			teamsize--
+		to_chat(new_syndicate_infiltrator, "<span class='notice'>You have more helpful information stored in your Notes.</span>")
+		new_syndicate_infiltrator.mind.store_memory("<B>Mission:</B> [input] ")
+		new_syndicate_infiltrator.mind.store_memory("<B>Team Leader:</B> [team_leader] ")
+		new_syndicate_infiltrator.mind.store_memory("<B>Starting Equipment:</B> <BR>- Chameleon Jumpsuit ((right click to Change Color))<BR> - Agent ID card ((disguise as another job))<BR> - Uplink Implant ((top left of screen)) <BR> - Dust Implant ((destroys your body on death)) <BR> - Combat Gloves ((insulated, disguised as black gloves)) <BR> - Anything bought with your uplink implant")
+		var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
+		opshud.join_hud(new_syndicate_infiltrator.mind.current)
+		ticker.mode.set_antag_hud(new_syndicate_infiltrator.mind.current, "hudoperative")
+		new_syndicate_infiltrator.regenerate_icons()
+		num_spawned++
+		if(!teamsize)
+			break
+	if(spawn_sit_mgmt)
+		for(var/obj/effect/landmark/L in sit_spawns_mgmt)
+			var/mob/living/carbon/human/syndimgmtmob = create_syndicate_infiltrator(L, 1, 100, 1)
+			syndimgmtmob.key = key
+			syndimgmtmob.internal = syndimgmtmob.s_store
+			syndimgmtmob.update_internals_hud_icon(1)
+			syndimgmtmob.faction += "syndicate"
+			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
+			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/suit/space/rig/syndi/elite, slot_wear_suit)
+			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/space/rig/syndi/elite, slot_head)
+			syndimgmtmob.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/syndicate, slot_wear_mask)
+			var/datum/atom_hud/antag/opshud = huds[ANTAG_HUD_OPS]
+			opshud.join_hud(syndimgmtmob.mind.current)
+			ticker.mode.set_antag_hud(syndimgmtmob.mind.current, "hudoperative")
+			syndimgmtmob.mind.special_role = "Syndicate Management Consultant"
+			syndimgmtmob.regenerate_icons()
+			to_chat(syndimgmtmob, "<span class='userdanger'>You have spawned as Syndicate Management. You should brief them on their mission before they go.</span>")
+	message_admins("[key_name_admin(src)] has spawned a Syndicate Infiltration Team.", 1)
+	log_admin("[key_name(src)] used Spawn Syndicate Infiltration Team.")
+	feedback_add_details("admin_verb","SPAWNSIT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+// ---------------------------------------------------------------------------------------------------------
+
+/client/proc/create_syndicate_infiltrator(obj/spawn_location, syndicate_leader_selected = 0, uplink_tc = 20, is_mgmt = 0)
+	var/mob/living/carbon/human/new_syndicate_infiltrator = new(spawn_location.loc)
+
+	var/syndicate_infiltrator_name = random_name(pick(MALE,FEMALE))
+
+	var/datum/preferences/A = new() //Randomize appearance
+	A.real_name = syndicate_infiltrator_name
+	A.copy_to(new_syndicate_infiltrator)
+
+	new_syndicate_infiltrator.dna.ready_dna(new_syndicate_infiltrator) //Creates DNA.
+
+	//Creates mind stuff.
+	new_syndicate_infiltrator.mind_initialize()
+	new_syndicate_infiltrator.mind.assigned_role = "MODE"
+	new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
+	ticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
+	new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
+	qdel(spawn_location)
+	return new_syndicate_infiltrator
+
+// ---------------------------------------------------------------------------------------------------------
+
+/mob/living/carbon/human/proc/equip_syndicate_infiltrator(syndicate_leader_selected = 0, num_tc, flag_mgmt)
+	// Storage items
+	equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(src), slot_back)
+	equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(src), slot_in_backpack)
+	equip_to_slot_or_del(new /obj/item/clothing/under/chameleon(src), slot_w_uniform)
+	if(!flag_mgmt)
+		equip_to_slot_or_del(new /obj/item/device/flashlight(src), slot_in_backpack)
+		equip_to_slot_or_del(new /obj/item/weapon/storage/belt/utility/full/multitool(src), slot_belt)
+
+	var/obj/item/clothing/gloves/combat/G = new /obj/item/clothing/gloves/combat(src)
+	G.name = "black gloves"
+	equip_to_slot_or_del(G, slot_gloves)
+
+	// Implants:
+	// Uplink
+	var/obj/item/weapon/implant/uplink/U = new /obj/item/weapon/implant/uplink(src)
+	U.implant(src)
+	if (flag_mgmt)
+		U.hidden_uplink.uses = 500
+	else
+		U.hidden_uplink.uses = num_tc
+	// Storage
+	//var/obj/item/weapon/implant/storage/T = new /obj/item/weapon/implant/storage(src)
+	//T.implant(src)
+	// Dust
+	var/obj/item/weapon/implant/dust/D = new /obj/item/weapon/implant/dust(src)
+	D.implant(src)
+
+	// Radio & PDA
+	var/obj/item/device/radio/R = new /obj/item/device/radio/headset/syndicate(src)
+	R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode.
+	equip_to_slot_or_del(R, slot_l_ear)
+	equip_or_collect(new /obj/item/device/pda(src), slot_in_backpack)
+
+	// Other gear
+	equip_to_slot_or_del(new /obj/item/clothing/shoes/syndigaloshes(src), slot_shoes)
+
+	var/obj/item/weapon/card/id/syndicate/W = new(src) //Untrackable by AI
+	if (flag_mgmt)
+		W.icon_state = "commander"
+	else
+		W.icon_state = "id"
+	W.access = list(access_maint_tunnels,access_external_airlocks)
+	W.assignment = "Civilian"
+	W.access += get_access("Civilian")
+	W.access += list(access_medical, access_engine, access_cargo, access_research)
+	if(flag_mgmt)
+		W.assignment = "Syndicate Management Consultant"
+		W.access += get_syndicate_access("Syndicate Commando")
+	else if(syndicate_leader_selected)
+		W.access += get_syndicate_access("Syndicate Commando")
+	else
+		W.access += get_syndicate_access("Syndicate Operative")
+	W.name = "[real_name]'s ID Card ([W.assignment])"
+	W.registered_name = real_name
+	equip_to_slot_or_del(W, slot_wear_id)
+
+	return 1

code/modules/admin/verbs/striketeam_syndicate.dm

@@ -79,7 +79,7 @@ var/global/sent_syndicate_strike_team = 0
 			new_syndicate_commando.mind.store_memory("<B>Mission:</B> \red [input].")
 
 			to_chat(new_syndicate_commando, "\blue You are an Elite Syndicate. [!syndicate_leader_selected?"commando":"<B>LEADER</B>"] in the service of the Syndicate. \nYour current mission is: <span class='danger'>[input]</span>")
-
+			new_syndicate_commando.faction += "syndicate"
 			syndicate_commando_number--
 
 //Spawns the rest of the commando gear.

code/modules/assembly/infrared.dm

@@ -174,7 +174,7 @@
 		return
 
 	dir = turn(dir, 90)
-	
+
 	if(usr.machine == src)
 		interact(usr)
 
@@ -246,7 +246,9 @@
 	hit()
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
-	if(istype(AM, /obj/effect/beam) || !AM.density)
+	if(!isobj(AM) && !isliving(AM))
+		return
+	if(istype(AM, /obj/effect))
 		return
 	hit()
 
@@ -259,4 +261,4 @@
 	if(previous)
 		previous.next = null
 		master.last = previous
-	return ..()
+	return ..()

code/modules/assembly/proximity.dm

@@ -42,7 +42,9 @@
 
 
 	HasProximity(atom/movable/AM as mob|obj)
-		if(istype(AM, /obj/effect/beam))	return
+		if(!isobj(AM) && !isliving(AM))
+			return
+		if(istype(AM, /obj/effect))	return
 		if(AM.move_speed < 12)	sense()
 		return
 

code/modules/client/preference/preferences.dm

@@ -23,7 +23,6 @@ var/global/list/special_role_times = list( //minimum age (in days) for accounts
 // 	ROLE_GANG = 21,
 	ROLE_BORER = 21,
 	ROLE_NINJA = 21,
-	ROLE_MUTINEER = 21,
 	ROLE_ABDUCTOR = 30,
 )
 

code/modules/clothing/head/misc.dm

@@ -349,10 +349,13 @@
 	desc = "Why not 'eagle head'? Who knows."
 	icon_state = "griffinhat"
 	item_state = "griffinhat"
-	flags = BLOCKHAIR|NODROP
+	flags = BLOCKHAIR
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE
 	actions_types = list(/datum/action/item_action/caw)
 
+/obj/item/clothing/head/griffin/super_hero
+	flags = BLOCKHAIR|NODROP
+
 /obj/item/clothing/head/griffin/attack_self()
 	caw()
 

code/modules/clothing/masks/gasmask.dm

@@ -170,10 +170,13 @@
 	name = "owl mask"
 	desc = "Twoooo!"
 	icon_state = "owl"
-	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | NODROP
+	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT
 	burn_state = FLAMMABLE
 	actions_types = list(/datum/action/item_action/hoot)
 
+/obj/item/clothing/mask/gas/owl_mask/super_hero
+	flags = MASKCOVERSMOUTH | MASKCOVERSEYES | BLOCK_GAS_SMOKE_EFFECT | AIRTIGHT | NODROP
+
 /obj/item/clothing/mask/gas/owl_mask/attack_self()
 	hoot()
 
@@ -190,23 +193,26 @@
 	name = "security gas mask"
 	desc = "A standard issue Security gas mask with integrated 'Compli-o-nator 3000' device, plays over a dozen pre-recorded compliance phrases designed to get scumbags to stand still whilst you taze them. Do not tamper with the device."
 	icon_state = "sechailer"
-	var/aggressiveness = 2
+	var/phrase = 1
+	var/aggressiveness = 1
 	var/safety = 1
-	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust)
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/adjust, /datum/action/item_action/selectphrase)
 
 /obj/item/clothing/mask/gas/sechailer/hos
 	name = "\improper HOS SWAT mask"
 	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a tan stripe."
 	icon_state = "hosmask"
 	aggressiveness = 3
-	actions_types = list(/datum/action/item_action/halt)
+	phrase = 12
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)
 
 /obj/item/clothing/mask/gas/sechailer/warden
 	name = "\improper Warden SWAT mask"
 	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000. It has a blue stripe."
 	icon_state = "wardenmask"
 	aggressiveness = 3
-	actions_types = list(/datum/action/item_action/halt)
+	phrase = 12
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)
 
 
 /obj/item/clothing/mask/gas/sechailer/swat
@@ -214,7 +220,8 @@
 	desc = "A close-fitting tactical mask with an especially aggressive Compli-o-nator 3000."
 	icon_state = "officermask"
 	aggressiveness = 3
-	actions_types = list(/datum/action/item_action/halt)
+	phrase = 12
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)
 
 /obj/item/clothing/mask/gas/sechailer/blue
 	name = "\improper blue SWAT mask"
@@ -222,40 +229,177 @@
 	icon_state = "blue_sechailer"
 	item_state = "blue_sechailer"
 	aggressiveness = 3
-	actions_types = list(/datum/action/item_action/halt)
+	phrase = 12
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)
 
 /obj/item/clothing/mask/gas/sechailer/cyborg
 	name = "security hailer"
 	desc = "A set of recognizable pre-recorded messages for cyborgs to use when apprehending criminals."
 	icon = 'icons/obj/device.dmi'
 	icon_state = "taperecorder_idle"
-	aggressiveness = 1 //Borgs are nicecurity!
-	actions_types = list(/datum/action/item_action/halt)
+	actions_types = list(/datum/action/item_action/halt, /datum/action/item_action/selectphrase)
 
 /obj/item/clothing/mask/gas/sechailer/ui_action_click(mob/user, actiontype)
 	if(actiontype == /datum/action/item_action/halt)
 		halt()
-	else
+	else if(actiontype == /datum/action/item_action/adjust)
 		adjustmask(user)
+	else if(actiontype == /datum/action/item_action/selectphrase)
+		switch(aggressiveness)
+			if(1)
+				switch(phrase)
+					if(1)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop in the name of the Law.</span>")
+						phrase = 2
+					if(2)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Compliance is in your best interest.</span>")
+						phrase = 3
+					if(3)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Prepare for justice.</span>")
+						phrase = 4
+					if(4)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Running will only increase your sentence.</span>")
+						phrase = 5
+					if(5)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Don't move, Creep!</span>")
+						phrase = 6
+					if(6)
+						to_chat(user, "<span class='notice'>You set the restrictor to: HALT! HALT! HALT! HALT!</span>")
+						phrase = 1
+					else
+						to_chat(user, "<span class='notice'>You set the restrictor to: HALT! HALT! HALT! HALT!</span>")
+						phrase = 1
+			if(2)
+				switch(phrase)
+					if(7)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Dead or alive you're coming with me.</span>")
+						phrase = 8
+					if(8)
+						to_chat(user, "<span class='notice'>You set the restrictor to: God made today for the crooks we could not catch yesterday.</span>")
+						phrase = 9
+					if(9)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Freeze, Scum Bag!</span>")
+						phrase = 10
+					if(10)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop right there, criminal scum!</span>")
+						phrase = 11
+					if(11)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Down on the floor, Creep!</span>")
+						phrase = 7
+					else
+						to_chat(user, "<span class='notice'>You set the restrictor to: Down on the floor, Creep!</span>")
+						phrase = 7
+			if(3)
+				switch(phrase)
+					if(12)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Go ahead, make my day.</span>")
+						phrase = 13
+					if(13)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop breaking the law, ass hole.</span>")
+						phrase = 14
+					if(14)
+						to_chat(user, "<span class='notice'>You set the restrictor to: You have the right to shut the fuck up.</span>")
+						phrase = 15
+					if(15)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Shut up crime!</span>")
+						phrase = 16
+					if(16)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Face the wrath of the golden bolt.</span>")
+						phrase = 17
+					if(17)
+						to_chat(user, "<span class='notice'>You set the restrictor to: I am, the LAW!</span>")
+						phrase = 18
+					if(18)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop or I'll bash you.</span>")
+						phrase = 12
+					else
+						to_chat(user, "<span class='notice'>You set the restrictor to: Go ahead, make my day.</span>")
+						phrase = 13
+
+			if(4)
+				switch(phrase)
+					if(1)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop in the name of the Law.</span>")
+						phrase = 2
+					if(2)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Compliance is in your best interest.</span>")
+						phrase = 3
+					if(3)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Prepare for justice.</span>")
+						phrase = 4
+					if(4)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Running will only increase your sentence.</span>")
+						phrase = 5
+					if(5)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Don't move, Creep!</span>")
+						phrase = 6
+					if(6)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Down on the floor, Creep!</span>")
+						phrase = 7
+					if(7)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Dead or alive you're coming with me.</span>")
+						phrase = 8
+					if(8)
+						to_chat(user, "<span class='notice'>You set the restrictor to: God made today for the crooks we could not catch yesterday.</span>")
+						phrase = 9
+					if(9)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Freeze, Scum Bag!</span>")
+						phrase = 10
+					if(10)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop right there, criminal scum!</span>")
+						phrase = 11
+					if(11)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop or I'll bash you.</span>")
+						phrase = 12
+					if(12)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Go ahead, make my day.</span>")
+						phrase = 13
+					if(13)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Stop breaking the law, ass hole.</span>")
+						phrase = 14
+					if(14)
+						to_chat(user, "<span class='notice'>You set the restrictor to: You have the right to shut the fuck up.</span>")
+						phrase = 15
+					if(15)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Shut up crime!</span>")
+						phrase = 16
+					if(16)
+						to_chat(user, "<span class='notice'>You set the restrictor to: Face the wrath of the golden bolt.</span>")
+						phrase = 17
+					if(17)
+						to_chat(user, "<span class='notice'>You set the restrictor to: I am, the LAW!</span>")
+						phrase = 18
+					if(18)
+						to_chat(user, "<span class='notice'>You set the restrictor to: HALT! HALT! HALT! HALT!</span>")
+						phrase = 1
+			else
+				to_chat(user, "<span class='notice'>It's broken.</span>")
 
 /obj/item/clothing/mask/gas/sechailer/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
 	if(istype(W, /obj/item/weapon/screwdriver))
 		switch(aggressiveness)
 			if(1)
-				to_chat(user, "\blue You set the restrictor to the middle position.")
+				to_chat(user, "\blue You set the aggressiveness restrictor to the second position.")
 				aggressiveness = 2
+				phrase = 7
 			if(2)
-				to_chat(user, "\blue You set the restrictor to the last position.")
+				to_chat(user, "\blue You set the aggressiveness restrictor to the third position.")
 				aggressiveness = 3
+				phrase = 13
 			if(3)
-				to_chat(user, "\blue You set the restrictor to the first position.")
-				aggressiveness = 1
+				to_chat(user, "\blue You set the aggressiveness restrictor to the fourth position.")
+				aggressiveness = 4
+				phrase = 1
 			if(4)
+				to_chat(user, "\blue You set the aggressiveness restrictor to the first position.")
+				aggressiveness = 1
+				phrase = 1
+			if(5)
 				to_chat(user, "\red You adjust the restrictor but nothing happens, probably because its broken.")
 	else if(istype(W, /obj/item/weapon/wirecutters))
-		if(aggressiveness != 4)
+		if(aggressiveness != 5)
 			to_chat(user, "\red You broke it!")
-			aggressiveness = 4
+			aggressiveness = 5
 	else
 		..()
 
@@ -270,7 +414,6 @@
 		return
 
 /obj/item/clothing/mask/gas/sechailer/proc/halt()
-	var/phrase = 0	//selects which phrase to use
 	var/phrase_text = null
 	var/phrase_sound = null
 
@@ -282,15 +425,7 @@
 			playsound(src.loc, 'sound/voice/binsult.ogg', 100, 0, 4)
 			cooldown = world.time
 			return
-		switch(aggressiveness)		// checks if the user has unlocked the restricted phrases
-			if(1)
-				phrase = rand(1,5)	// set the upper limit as the phrase above the first 'bad cop' phrase, the mask will only play 'nice' phrases
-			if(2)
-				phrase = rand(1,11)	// default setting, set upper limit to last 'bad cop' phrase. Mask will play good cop and bad cop phrases
-			if(3)
-				phrase = rand(1,18)	// user has unlocked all phrases, set upper limit to last phrase. The mask will play all phrases
-			if(4)
-				phrase = rand(12,18)	// user has broke the restrictor, it will now only play shitcurity phrases
+
 
 		switch(phrase)	//sets the properties of the chosen phrase
 			if(1)				// good cop

code/modules/clothing/shoes/miscellaneous.dm

@@ -156,6 +156,8 @@
 	desc = "A pair of costume boots fashioned after bird talons."
 	icon_state = "griffinboots"
 	item_state = "griffinboots"
+
+/obj/item/clothing/shoes/griffin/super_hero
 	flags = NODROP
 
 /obj/item/clothing/shoes/fluff/noble_boot

code/modules/clothing/suits/miscellaneous.dm

@@ -763,6 +763,8 @@
 	armor = list(melee = 5, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
 	allowed = list(/obj/item/weapon/gun/energy,/obj/item/weapon/reagent_containers/spray/pepper,/obj/item/weapon/gun/projectile,/obj/item/ammo_box,/obj/item/ammo_casing,/obj/item/weapon/melee/baton,/obj/item/weapon/restraints/handcuffs,/obj/item/device/flashlight/seclite)
 	actions_types = list(/datum/action/item_action/toggle_wings)
+
+/obj/item/clothing/suit/toggle/owlwings/super_hero
 	flags = NODROP
 
 /obj/item/clothing/suit/toggle/owlwings/griffinwings
@@ -771,6 +773,9 @@
 	icon_state = "griffin_wings"
 	item_state = "griffin_wings"
 
+/obj/item/clothing/suit/toggle/owlwings/griffinwings/super_hero
+	flags = NODROP
+
 /obj/item/clothing/suit/toggle/attack_self()
 	if(icon_state == initial(icon_state))
 		icon_state = icon_state + "_t"
@@ -852,3 +857,45 @@
 				user.reagents.add_reagent("syndicate_nanites", 15)
 	else
 		processing_objects.Remove(src)
+
+//Syndicate Chaplain Robe (WOLOLO!)
+/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe
+	description_antag = "This robe is made of reinforced fibers, granting it superior protection. The robes also wirelessly generate power for the neurotransmitter in the linked missionary staff while being worn."
+	armor = list(melee = 10, bullet = 10, laser = 5, energy = 5, bomb = 0, bio = 0, rad = 15)
+	var/obj/item/weapon/nullrod/missionary_staff/linked_staff = null
+
+/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/Destroy()
+	if(linked_staff)	//delink on destruction
+		linked_staff.robes = null
+		linked_staff = null
+	processing_objects -= src	//probably is cleared in a parent call already, but just in case we're gonna do it here
+	return ..()
+
+/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/equipped(mob/living/carbon/human/H, slot)
+	if(!istype(H) || slot != slot_wear_suit)
+		processing_objects -= src
+		return
+	else
+		processing_objects |= src
+
+/obj/item/clothing/suit/hooded/chaplain_hoodie/missionary_robe/process()
+	if(!linked_staff)	//if we don't have a linked staff, the rest of this is useless
+		return
+
+	if(!ishuman(loc))		//if we somehow try to process while not on a human, remove ourselves from processing and return
+		processing_objects -= src
+		return
+
+	var/mob/living/carbon/human/H = loc
+
+	if(linked_staff.faith >= 100)	//if the linked staff is fully recharged, do nothing
+		return
+
+	if(!linked_staff in range(3, get_turf(src)))		//staff won't charge at range (to prevent it from being handed off / stolen and used)
+		if(prob(10))	//10% chance per process should avoid being too spammy, can tweak if it ends up still being too frequent.
+			to_chat(H, "<span class='warning'>Your staff is unable to charge at this range. Get closer!</span>")
+		return
+
+	linked_staff.faith += 5
+	if(linked_staff.faith >= 100)	//if this charge puts the staff at or above full, notify the wearer
+		to_chat(H, "<span class='notice'>Faith renewed; ready to convert new followers.</span>")

code/modules/clothing/under/miscellaneous.dm

@@ -679,6 +679,8 @@
 	desc = "A soft brown jumpsuit made of synthetic feathers and strong conviction."
 	icon_state = "owl"
 	item_color = "owl"
+
+/obj/item/clothing/under/owl/super_hero
 	flags = NODROP
 
 /obj/item/clothing/under/griffin
@@ -686,6 +688,8 @@
 	desc = "A soft brown jumpsuit with a white feather collar made of synthetic feathers and a lust for mayhem."
 	icon_state = "griffin"
 	item_color = "griffin"
+
+/obj/item/clothing/under/griffin/super_hero
 	flags = NODROP
 
 /obj/item/clothing/under/noble_clothes

code/modules/mining/mine_turfs.dm

@@ -436,10 +436,9 @@ var/global/list/rockTurfEdgeCache = list(
 
 	else if(istype(AM,/obj/mecha))
 		var/obj/mecha/M = AM
-		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
+		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
 			M.selected.action(src)
-	else
-		return
+
 
 /**********************Asteroid**************************/
 

code/modules/mob/living/carbon/superheroes.dm

@@ -66,9 +66,9 @@
 	..()
 
 	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/black/greytide(H), slot_shoes)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/owl(H), slot_w_uniform)
-	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings(H), slot_wear_suit)
-	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask(H), slot_wear_mask)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/owl/super_hero(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/super_hero(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/owl_mask/super_hero(H), slot_wear_mask)
 	H.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/bluespace/owlman(H), slot_belt)
 	H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses)
 
@@ -84,10 +84,10 @@
 /datum/superheroes/griffin/equip(var/mob/living/carbon/human/H)
 	..()
 
-	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin(H), slot_shoes)
-	H.equip_to_slot_or_del(new /obj/item/clothing/under/griffin(H), slot_w_uniform)
-	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings(H), slot_wear_suit)
-	H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/clothing/shoes/griffin/super_hero(H), slot_shoes)
+	H.equip_to_slot_or_del(new /obj/item/clothing/under/griffin/super_hero(H), slot_w_uniform)
+	H.equip_to_slot_or_del(new /obj/item/clothing/suit/toggle/owlwings/griffinwings/super_hero(H), slot_wear_suit)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/griffin/super_hero(H), slot_head)
 
 	var/obj/item/weapon/implant/freedom/L = new/obj/item/weapon/implant/freedom(H)
 	L.imp_in = H

code/modules/mob/living/simple_animal/shade.dm

@@ -47,3 +47,7 @@
 					if((M.client && !( M.blinded )))
 						M.show_message("\red [user] gently taps [src] with the [O]. ")
 		return
+
+/mob/living/simple_animal/shade/sword
+	universal_speak = 1
+	faction = list("neutral")

code/modules/mob/mob.dm

@@ -90,21 +90,23 @@
 // blind_message (optional) is what blind people will hear e.g. "You hear something!"
 
 /mob/visible_message(var/message, var/self_message, var/blind_message)
-	for(var/mob/M in viewers(src))
+	for(var/mob/M in get_mobs_in_view(7, src))
 		if(M.see_invisible < invisibility)
 			continue //can't view the invisible
 		var/msg = message
-		if(self_message && M==src)
+		if(self_message && M == src)
 			msg = self_message
-		M.show_message( msg, 1, blind_message, 2)
+		M.show_message(msg, 1, blind_message, 2)
 
 // Show a message to all mobs in sight of this atom
 // Use for objects performing visible actions
 // message is output to anyone who can see, e.g. "The [src] does something!"
 // blind_message (optional) is what blind people will hear e.g. "You hear something!"
 /atom/proc/visible_message(var/message, var/blind_message)
-	for(var/mob/M in viewers(src))
-		M.show_message( message, 1, blind_message, 2)
+	for(var/mob/M in get_mobs_in_view(7, src))
+		if(!M.client)
+			continue
+		M.show_message(message, 1, blind_message, 2)
 
 // Show a message to all mobs in earshot of this one
 // This would be for audible actions by the src mob
@@ -118,7 +120,7 @@
 		range = hearing_distance
 	var/msg = message
 	for(var/mob/M in get_mobs_in_view(range, src))
-		if(self_message && M==src)
+		if(self_message && M == src)
 			msg = self_message
 		M.show_message(msg, 2, deaf_message, 1)
 
@@ -872,9 +874,12 @@ var/list/slot_equipment_priority = list( \
 
 //this and stop_pulling really ought to be /mob/living procs
 /mob/proc/start_pulling(atom/movable/AM)
-	if( !AM || !src || src==AM || !isturf(AM.loc) )	//if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
+	if(src == AM) // Trying to pull yourself is a shortcut to stop pulling
+		stop_pulling()
 		return
-	if(!( AM.anchored ))
+	if(!AM || !isturf(AM.loc))	//if there's no object or the object being pulled is inside something: abort!
+		return
+	if(!(AM.anchored))
 		AM.add_fingerprint(src)
 
 		// If we're pulling something then drop what we're currently pulling and pull this instead.

code/modules/mob/mob_movement.dm

@@ -408,44 +408,42 @@
 ///Called by /client/Move()
 ///For moving in space
 ///Return 1 for movement 0 for none
-/mob/Process_Spacemove(var/movement_dir = 0)
-
+/mob/Process_Spacemove(movement_dir = 0)
 	if(..())
 		return 1
+	var/atom/movable/backup = get_spacemove_backup()
+	if(backup)
+		if(istype(backup) && movement_dir && !backup.anchored)
+			if(backup.newtonian_move(turn(movement_dir, 180))) //You're pushing off something movable, so it moves
+				src << "<span class='info'>You push off of [backup] to propel yourself.</span>"
+		return 1
+	return 0
 
+/mob/get_spacemove_backup()
 	var/atom/movable/dense_object_backup
-	for(var/atom/A in orange(1, get_turf(src)))
+	for(var/A in orange(1, get_turf(src)))
 		if(isarea(A))
 			continue
-
 		else if(isturf(A))
 			var/turf/turf = A
-			if(istype(turf,/turf/space))
+			if(istype(turf, /turf/space))
 				continue
-
 			if(!turf.density && !mob_negates_gravity())
 				continue
-
-			return 1
-
+			return A
 		else
 			var/atom/movable/AM = A
 			if(AM == buckled) //Kind of unnecessary but let's just be sure
 				continue
-			if(AM.density)
+			if(!AM.CanPass(src) || AM.density)
 				if(AM.anchored)
-					return 1
+					return AM
 				if(pulling == AM)
 					continue
 				dense_object_backup = AM
+				break
+	. = dense_object_backup
 
-	if(movement_dir && dense_object_backup)
-		if(dense_object_backup.newtonian_move(turn(movement_dir, 180))) //You're pushing off something movable, so it moves
-			to_chat(src, "<span class='info'>You push off of [dense_object_backup] to propel yourself.</span>")
-
-
-		return 1
-	return 0
 
 /mob/proc/mob_has_gravity(turf/T)
 	return has_gravity(src, T)

code/modules/research/designs/mechfabricator_designs.dm

@@ -601,7 +601,7 @@
 	name = "Exosuit Engineering Equipment (Cable Layer)"
 	id = "mech_cable_layer"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/cable_layer
+	build_path = /obj/item/mecha_parts/mecha_equipment/cable_layer
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -610,7 +610,7 @@
 	name = "Exosuit Engineering Equipment (Drill)"
 	id = "mech_drill"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill
+	build_path = /obj/item/mecha_parts/mecha_equipment/drill
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -619,7 +619,7 @@
 	name = "Exosuit Engineering Equipment (Extinguisher)"
 	id = "mech_extinguisher"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/extinguisher
+	build_path = /obj/item/mecha_parts/mecha_equipment/extinguisher
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -628,7 +628,7 @@
 	name = "Exosuit Engineering Equipment (Hydraulic Clamp)"
 	id = "mech_hydraulic_clamp"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/hydraulic_clamp
+	build_path = /obj/item/mecha_parts/mecha_equipment/hydraulic_clamp
 	materials = list(MAT_METAL=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -638,7 +638,7 @@
 	id = "mech_sleeper"
 	build_type = MECHFAB
 	req_tech = list("biotech" = 2)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/sleeper
+	build_path = /obj/item/mecha_parts/mecha_equipment/medical/sleeper
 	materials = list(MAT_METAL=5000,MAT_GLASS=10000)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -648,7 +648,7 @@
 	id = "mech_syringe_gun"
 	build_type = MECHFAB
 	req_tech = list("magnets" = 3,"biotech" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/syringe_gun
+	build_path = /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun
 	materials = list(MAT_METAL=3000,MAT_GLASS=2000)
 	construction_time = 200
 	category = list("Exosuit Equipment")
@@ -723,7 +723,7 @@
 	desc = "An exosuit-mounted Mime Rapid Construction Device."
 	id = "mech_mrcd"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/mimercd
+	build_path = /obj/item/mecha_parts/mecha_equipment/mimercd
 	materials = list(MAT_METAL=30000,MAT_TRANQUILLITE=10000)
 	construction_time = 700
 	category = list("Exosuit Equipment")
@@ -735,7 +735,7 @@
 	id = "mech_diamond_drill"
 	build_type = MECHFAB
 	req_tech = list("materials" = 4, "engineering" = 3)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/drill/diamonddrill
+	build_path = /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill
 	materials = list(MAT_METAL=10000,MAT_DIAMOND=6500)
 	construction_time = 100
 	category = list("Exosuit Equipment")
@@ -744,7 +744,7 @@
 	name = "Exosuit Engineering Equipement (Mining Scanner)"
 	id = "mech_mscanner"
 	build_type = MECHFAB
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/mining_scanner
+	build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner
 	materials = list(MAT_METAL=5000,MAT_GLASS=2500)
 	construction_time = 50
 	category = list("Exosuit Equipment")
@@ -788,7 +788,7 @@
 	id = "mech_rcd"
 	build_type = MECHFAB
 	req_tech = list("materials" = 4, "bluespace" = 3, "magnets" = 4, "powerstorage"=4, "engineering" = 4)
-	build_path = /obj/item/mecha_parts/mecha_equipment/tool/rcd
+	build_path = /obj/item/mecha_parts/mecha_equipment/rcd
 	materials = list(MAT_METAL=30000,MAT_GOLD=20000,MAT_PLASMA=25000,MAT_SILVER=20000)
 	construction_time = 1200
 	category = list("Exosuit Equipment")

code/modules/research/xenoarchaeology/artifact/artifact.dm

@@ -59,7 +59,7 @@
 
 	else if(istype(AM,/obj/mecha))
 		var/obj/mecha/M = AM
-		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
+		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
 			M.selected.action(src)
 
 /obj/structure/boulder/attackby(obj/item/weapon/W as obj, mob/user as mob, params)

code/modules/research/xenoarchaeology/artifact/artifact_hoverpod.dm

@@ -3,40 +3,11 @@
 	icon_state = "engineering_pod"
 	desc = "Stubby and round, it has a human sized access hatch on the top."
 	wreckage = /obj/effect/decal/mecha_wreckage/hoverpod
+	stepsound = 'sound/machines/hiss.ogg'
 
 /obj/mecha/working/hoverpod/Process_Spacemove(var/movement_dir = 0)
 	return 1 // puts the hover in hoverpod
 
-//these three procs overriden to play different sounds
-/obj/mecha/working/hoverpod/mechturn(direction)
-	dir = direction
-	//playsound(src,'sound/machines/hiss.ogg',40,1)
-	return 1
-
-/obj/mecha/working/hoverpod/mechstep(direction)
-	var/result = step(src,direction)
-	if(result)
-		playsound(src,'sound/machines/hiss.ogg',40,1)
-	return result
-
-
-/obj/mecha/working/hoverpod/mechsteprand()
-	var/result = step_rand(src)
-	if(result)
-		playsound(src,'sound/machines/hiss.ogg',40,1)
-	return result
-
 /obj/effect/decal/mecha_wreckage/hoverpod
 	name = "Hover pod wreckage"
 	icon_state = "engineering_pod-broken"
-
-	/*New()
-		..()
-		var/list/parts = list(
-
-		for(var/i=0;i<2;i++)
-			if(!isemptylist(parts) && prob(40))
-				var/part = pick(parts)
-				welder_salvage += part
-				parts -= part
-		return*/

code/modules/research/xenobiology/xenobiology.dm

@@ -384,6 +384,7 @@
 	G.change_gender(pick(MALE,FEMALE))
 	G.loc = src.loc
 	G.key = ghost.key
+	add_logs(G, user, "summoned", null, "as a golem")
 	to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. Serve [user], and assist them in completing their goals at any cost.")
 	qdel(src)
 

code/modules/shuttle/shuttle.dm

@@ -787,6 +787,14 @@
 	shuttleId = "sst"
 	possible_destinations = "sst_home;sst_away"
 
+/obj/machinery/computer/shuttle/sit
+	req_access = list(access_syndicate)
+	name = "Syndicate Infiltration Team Shuttle Console"
+	desc = "Used to call and send the SIT shuttle."
+	shuttleId = "sit"
+	possible_destinations = "sit_arrivals;sit_scimaint;sit_engshuttle;sit_away"
+
+
 var/global/trade_dock_timelimit = 0
 var/global/trade_dockrequest_timelimit = 0
 

code/modules/surgery/generic.dm

@@ -214,7 +214,7 @@
 //drill bone
 /datum/surgery_step/generic/drill
 	name = "drill bone"
-	allowed_tools = list(/obj/item/weapon/surgicaldrill = 100, /obj/item/weapon/pickaxe/drill = 60, /obj/item/mecha_parts/mecha_equipment/tool/drill = 60, /obj/item/weapon/screwdriver = 20)
+	allowed_tools = list(/obj/item/weapon/surgicaldrill = 100, /obj/item/weapon/pickaxe/drill = 60, /obj/item/mecha_parts/mecha_equipment/drill = 60, /obj/item/weapon/screwdriver = 20)
 	time = 30
 
 /datum/surgery_step/generic/drill/begin_step(mob/living/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)

config/example/config.txt

@@ -86,12 +86,10 @@ PROBABILITY VAMPIRE 3
 PROBABILITY RAGINMAGES 0
 PROBABILITY BORER 0
 PROBABILITY XENOS 0
-PROBABILITY MUTINY 0
-PROBABILITY METEOR 1
+PROBABILITY METEOR 0
 PROBABILITY TRAITOR 0
 PROBABILITY SHADOWLING 2
-PROBABILITY NATIONS 1
-PROBABILITY RP-REVOLUTION 0
+PROBABILITY NATIONS 0
 
 ## Hash out to disable random events during the round.
 ALLOW_RANDOM_EVENTS

goon/browserassets/html/browserOutput.html

@@ -7,6 +7,7 @@
 	<link rel="stylesheet" type="text/css" href="font-awesome.css" />
 	<link rel="stylesheet" type="text/css" href="browserOutput.css" />
 	<script type="text/javascript" src="jquery.min.js"></script>
+	<script type="text/javascript" src="jquery.mark.min.js"></script>
 	<script type="text/javascript" src="json2.min.js"></script>
 </head>
 <body>

goon/browserassets/js/browserOutput.js

@@ -97,44 +97,18 @@ function linkify(text) {
 	});
 }
 
-//Actually turns the highlight term match into appropriate html
-function addHighlightMarkup(match) {
-	var extra = '';
-	if (opts.highlightColor) {
-		extra += ' style="background-color: '+opts.highlightColor+'"';
-	}
-	return '<span class="highlight"'+extra+'>'+match+'</span>';
+// Colorizes the highlight spans
+function setHighlightColor(match) {
+	match.style.background = opts.highlightColor
 }
 
 //Highlights words based on user settings
 function highlightTerms(el) {
-	if (el.children.length > 0) {
-		for(var h = 0; h < el.children.length; h++){
-			highlightTerms(el.children[h]);
+	for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term
+		if(opts.highlightTerms[i]) {
+			$(el).mark(opts.highlightTerms[i], {"element" : "span", "each" : setHighlightColor});
 		}
 	}
-	if (el.childNodes.length > 0 && typeof el.childNodes[0].data !== 'undefined' && el.childNodes[0].data.length > 0) { //If element actually has text
-		var newText = '';
-		for (var c = 0; c < el.childNodes.length; c++) { //Each child element
-			if (el.childNodes[c].nodeType === 3) { //Is it text only?
-				var words = el.childNodes[c].data.split(' ');
-				for (var w = 0; w < words.length; w++) { //Each word in the text
-					var newWord = null;
-					for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term
-						if (opts.highlightTerms[i] && words[w].toLowerCase().indexOf(opts.highlightTerms[i].toLowerCase()) > -1) { //If a match is found
-							newWord = words[w].replace(new RegExp(opts.highlightTerms[i], 'gi'), addHighlightMarkup);
-							break;
-						}
-					}
-					newText += newWord ? newWord : words[w];
-					newText += w >= words.length ? '' : ' ';
-				}
-			} else { //Every other type of element
-				newText += outerHTML(el.childNodes[c]);
-			}
-		}
-		el.innerHTML = newText;
-	}
 }
 
 //Send a message to the client

goon/code/datums/browserOutput.dm

@@ -1,5 +1,6 @@
 var/list/chatResources = list(
 	"goon/browserassets/js/jquery.min.js",
+	"goon/browserassets/js/jquery.mark.min.js",
 	"goon/browserassets/js/json2.min.js",
 	"goon/browserassets/js/browserOutput.js",
 	"goon/browserassets/css/fonts/fontawesome-webfont.eot",

html/changelogs/AutoChangeLog-pr-4816.yml

@@ -0,0 +1,5 @@
+author: Kyep
+delete-after: True
+changes: 
+  - rscadd: "Added Syndicate Infiltration Teams (SITs), which are like Syndicate Strike Teams (SSTs) but focusing on stealth rather than direct combat. Useful for getting ghosts into rounds, spicing up rounds, having traitors with teamwork, and new kinds of traitor objectives like kidnap."
+  - bugfix: "Fixed bug that Dust implants had no icon."

html/changelogs/AutoChangeLog-pr-5239.yml

@@ -0,0 +1,12 @@
+author: TullyBurnalot
+delete-after: True
+changes: 
+  - tweak: "Trash Bags fit in satchels/bags/duffelbags, but cannot be transported after being filled up."
+  - tweak: "Advanced Mops clean faster, can clean more"
+  - tweak: "Holosign Projectors can create more signs"
+  - tweak: "Ghosts can no longer create dirt"
+  - tweak: "Dirt creation slowed down. \"Clean Station\" may actually be remotely possible now"
+  - tweak: "Janitorial Closet tidied up"
+  - rscadd: "Can fill Light Replacers with boxes directly"
+  - rscadd: "Can recycle 3 broken/burnt bulbs into a functioning one"
+  - bugfix: "Can no longer cheat around NODROP by inserting NODROP lightbulbs into Light Replacers"

html/changelogs/AutoChangeLog-pr-5382.yml

@@ -0,0 +1,4 @@
+author: Ty-Omaha
+delete-after: True
+changes: 
+  - tweak: "Allows sechailer phrases to be selectable"