Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit277

2019-11-04 23:10:54 +01:00
parent 639555c017 4e8c8ad335
commit b7364a1e8a
455 changed files with 5612 additions and 5488 deletions
@@ -1,4 +1,4 @@
-FROM tgstation/byond:512.1488 as base
+FROM tgstation/byond:513.1490 as base

 FROM base as build_base

@@ -475,6 +475,8 @@
 	dir = 4
 	},
 /obj/item/storage/bag/plants/portaseeder,
+/obj/item/seeds/cotton,
+/obj/item/seeds/cotton,
 /turf/open/indestructible/boss,
 /area/ruin/unpowered/ash_walkers)
 "bk" = (
@@ -68,7 +68,10 @@
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "k" = (
-/obj/machinery/computer/arcade/battle,
+/obj/machinery/computer/arcade/battle{
+	icon_state = "arcade";
+	dir = 4
+	},
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
 "l" = (
@@ -105,6 +108,13 @@
 /obj/machinery/computer/shuttle,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
+"s" = (
+/obj/machinery/computer/arcade/orion_trail{
+	icon_state = "arcade";
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/purple,
+/area/ruin/powered/golem_ship)
 "t" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = 30
@@ -142,10 +152,6 @@
 /obj/machinery/reagentgrinder,
 /turf/open/floor/mineral/titanium/purple,
 /area/ruin/powered/golem_ship)
-"y" = (
-/obj/machinery/computer/arcade/orion_trail,
-/turf/open/floor/mineral/titanium/purple,
-/area/ruin/powered/golem_ship)
 "z" = (
 /obj/structure/extinguisher_cabinet{
 	pixel_y = -30
@@ -332,7 +338,7 @@ l
 l
 j
 l
-y
+s
 b
 a
 a
@@ -167,6 +167,56 @@
 	},
 /turf/open/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/circuits)
+"av" = (
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/carbon/monkey{
+	faction = list("neutral","Syndicate")
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/unpowered/syndicate_lava_base/testlab)
+"aw" = (
+/obj/machinery/light/small,
+/obj/structure/bed/roller,
+/obj/machinery/iv_drip,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/mob/living/carbon/monkey{
+	faction = list("neutral","Syndicate")
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/unpowered/syndicate_lava_base/testlab)
+"ax" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/arcade/orion_trail{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/ruin/unpowered/syndicate_lava_base/bar)
 "aF" = (
 /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer3{
 	dir = 4
@@ -790,26 +840,6 @@
 /obj/structure/disposalpipe/trunk,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/ruin/unpowered/syndicate_lava_base/virology)
-"ej" = (
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/mob/living/carbon/monkey{
-	faction = list("neutral","Syndicate")
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ruin/unpowered/syndicate_lava_base/testlab)
 "ek" = (
 /obj/structure/grille,
 /obj/structure/window/plastitanium,
@@ -1136,27 +1166,6 @@
 /obj/structure/disposalpipe/segment,
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/ruin/unpowered/syndicate_lava_base/virology)
-"eK" = (
-/obj/machinery/light/small,
-/obj/structure/bed/roller,
-/obj/machinery/iv_drip,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/mob/living/carbon/monkey{
-	faction = list("neutral","Syndicate")
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/ruin/unpowered/syndicate_lava_base/testlab)
 "eL" = (
 /obj/machinery/door/airlock/hatch{
 	name = "Monkey Pen";
@@ -5148,12 +5157,6 @@
 /obj/item/clothing/mask/gas,
 /turf/open/floor/plating,
 /area/ruin/unpowered/syndicate_lava_base/arrivals)
-"mt" = (
-/obj/machinery/computer/arcade/orion_trail,
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel/dark,
-/area/ruin/unpowered/syndicate_lava_base/bar)
 "mu" = (
 /obj/item/twohanded/required/kirbyplants{
 	icon_state = "plant-22"
@@ -7340,8 +7343,8 @@ ae
 ae
 ae
 ae
-ej
-eK
+av
+aw
 ae
 fD
 ad
@@ -7362,7 +7365,7 @@ kH
 jN
 jZ
 lU
-mt
+ax
 mU
 np
 nP
@@ -56,11 +56,9 @@
 /obj/structure/chair/sofa{
 	dir = 4
 	},
-/mob/living/simple_animal/hostile/gorilla{
-	AIStatus = null;
-	desc = "There is no need to be upset.";
-	dir = 4;
-	name = "Familiar Gorilla"
+/mob/living/simple_animal/hostile/gorilla/familiar{
+	icon_state = "crawling";
+	dir = 4
 	},
 /turf/open/floor/plating/beach/sand,
 /area/ruin/powered)
@@ -16,6 +16,13 @@
 	heat_capacity = 1e+006
 	},
 /area/awaymission/moonoutpost19/hive)
+"ae" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/awaymission/moonoutpost19/arrivals)
 "ag" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/weeds{
@@ -6408,10 +6415,6 @@
 	heat_capacity = 1e+006
 	},
 /area/awaymission/moonoutpost19/arrivals)
-"mB" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/plasteel/dark,
-/area/awaymission/moonoutpost19/arrivals)
 "mC" = (
 /obj/machinery/vending/cigarette,
 /obj/structure/sign/poster/contraband/smoke{
@@ -43385,7 +43388,7 @@ la
 lq
 jk
 mj
-mB
+ae
 hJ
 ba
 ba
@@ -43642,7 +43645,7 @@ jN
 lr
 jj
 mj
-mB
+ae
 hI
 ba
 ba
@@ -245,10 +245,38 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/engineering)
+"aS" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/mob/living/carbon/monkey,
+/turf/open/floor/plasteel,
+/area/awaymission/research/interior/genetics)
 "aT" = (
 /mob/living/simple_animal/hostile/syndicate/melee/sword,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/engineering)
+"aU" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/mob/living/carbon/human,
+/turf/open/floor/plasteel,
+/area/awaymission/research/interior/genetics)
 "aV" = (
 /obj/item/stack/sheet/plasteel,
 /obj/effect/turf_decal/tile/yellow{
@@ -326,6 +354,23 @@
 	icon_state = "damaged4"
 	},
 /area/awaymission/research/interior/engineering)
+"bc" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/mob/living/carbon/monkey,
+/turf/open/floor/plasteel,
+/area/awaymission/research/interior/genetics)
 "bd" = (
 /turf/open/floor/plasteel{
 	icon_state = "damaged3"
@@ -903,6 +948,17 @@
 /obj/machinery/light/small,
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
+"co" = (
+/obj/item/ammo_casing/c45,
+/obj/effect/turf_decal/tile/yellow{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/yellow{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate,
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior)
 "cp" = (
 /turf/closed/wall/r_wall,
 /area/awaymission/research/interior)
@@ -1195,19 +1251,19 @@
 /turf/open/floor/plating,
 /area/awaymission/research/interior/genetics)
 "cT" = (
-/mob/living/carbon/monkey,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
+/mob/living/simple_animal/hostile/nanotrasen/ranged,
 /turf/open/floor/plasteel,
-/area/awaymission/research/interior/genetics)
+/area/awaymission/research/interior/security)
 "cU" = (
 /obj/machinery/door/window/eastright,
 /obj/effect/turf_decal/tile/purple{
@@ -1253,7 +1309,9 @@
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior/genetics)
 "cX" = (
-/mob/living/carbon/human,
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -1264,6 +1322,7 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/mob/living/carbon/human,
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior/genetics)
 "cY" = (
@@ -1356,22 +1415,15 @@
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior/genetics)
 "di" = (
-/obj/structure/window/reinforced{
-	dir = 4
-	},
-/mob/living/carbon/monkey,
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple,
 /obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/research/interior/genetics)
+/mob/living/simple_animal/hostile/nanotrasen/ranged,
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior/cryo)
 "dj" = (
 /obj/effect/decal/cleanable/blood,
 /obj/item/stack/rods,
@@ -1416,14 +1468,14 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior)
 "dn" = (
-/obj/item/ammo_casing/c45,
-/mob/living/simple_animal/hostile/syndicate,
 /obj/effect/turf_decal/tile/yellow{
 	dir = 1
 	},
+/obj/effect/turf_decal/tile/yellow,
 /obj/effect/turf_decal/tile/yellow{
-	dir = 8
+	dir = 4
 	},
+/mob/living/simple_animal/hostile/syndicate,
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior)
 "do" = (
@@ -1675,7 +1727,6 @@
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior/security)
 "dI" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
 /obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
@@ -1686,7 +1737,8 @@
 /obj/effect/turf_decal/tile/red{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
+/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
+/turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/security)
 "dJ" = (
 /obj/structure/rack,
@@ -1777,11 +1829,7 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/genetics)
-"dQ" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/mob/living/carbon/human,
+"dP" = (
 /obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
@@ -1792,8 +1840,23 @@
 /obj/effect/turf_decal/tile/purple{
 	dir = 8
 	},
+/mob/living/simple_animal/hostile/nanotrasen/ranged,
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior/cryo)
+"dQ" = (
+/obj/effect/turf_decal/tile/purple{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/nanotrasen,
 /turf/open/floor/plasteel,
-/area/awaymission/research/interior/genetics)
+/area/awaymission/research/interior/cryo)
 "dR" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -2144,15 +2207,15 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/cryo)
 "eB" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/red{
 	dir = 4
 	},
+/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
 /turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/cryo)
+/area/awaymission/research/interior/security)
 "eC" = (
 /obj/item/ammo_casing/c9mm,
 /obj/effect/turf_decal/tile/purple{
@@ -2214,16 +2277,22 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior)
 "eL" = (
-/mob/living/simple_animal/hostile/syndicate,
-/obj/effect/turf_decal/tile/yellow{
+/obj/structure/window/reinforced{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/purple{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/yellow,
-/obj/effect/turf_decal/tile/yellow{
+/obj/effect/turf_decal/tile/purple,
+/obj/effect/turf_decal/tile/purple{
 	dir = 4
 	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior)
+/obj/effect/turf_decal/tile/purple{
+	dir = 8
+	},
+/mob/living/carbon/monkey,
+/turf/open/floor/plasteel,
+/area/awaymission/research/interior/genetics)
 "eM" = (
 /obj/item/ammo_casing/c45,
 /obj/item/ammo_casing/c45,
@@ -2846,19 +2915,19 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/security)
 "fY" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/green{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/green{
 	dir = 8
 	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
 /turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/security)
+/area/awaymission/research/interior)
 "fZ" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -2966,6 +3035,23 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/secure)
+"gi" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/mob/living/simple_animal/bot/secbot/beepsky{
+	desc = "A beefy variant of the standard securitron model.";
+	emagged = 1;
+	faction = list("nanotrasenprivate");
+	health = 50;
+	maxHealth = 50;
+	name = "Officer Genesky"
+	},
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior/security)
 "gj" = (
 /obj/structure/cable{
 	icon_state = "4-8"
@@ -3115,19 +3201,13 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/cryo)
 "gv" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
+/mob/living/simple_animal/hostile/syndicate,
 /turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/cryo)
+/area/awaymission/research/interior)
 "gw" = (
 /obj/effect/mob_spawn/human/doctor{
 	brute_damage = 145;
@@ -3508,6 +3588,35 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior)
+"gW" = (
+/obj/structure/sign/directions/security{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 40
+	},
+/obj/structure/sign/directions/engineering{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 33
+	},
+/obj/structure/sign/directions/science{
+	dir = 1;
+	pixel_x = 32;
+	pixel_y = 26
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/green,
+/obj/effect/turf_decal/tile/green{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/green{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior)
 "gX" = (
 /obj/effect/decal/cleanable/blood/drip,
 /obj/effect/turf_decal/tile/purple{
@@ -3660,19 +3769,19 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/security)
 "hj" = (
-/mob/living/simple_animal/hostile/nanotrasen,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
-/obj/effect/turf_decal/tile/purple{
+/obj/effect/turf_decal/tile/blue{
 	dir = 8
 	},
-/turf/open/floor/plasteel,
-/area/awaymission/research/interior/cryo)
+/mob/living/simple_animal/hostile/syndicate/ranged/smg,
+/turf/open/floor/plasteel/white,
+/area/awaymission/research/interior/medbay)
 "hk" = (
 /obj/effect/decal/cleanable/blood,
 /obj/effect/turf_decal/tile/purple{
@@ -3736,15 +3845,19 @@
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/security)
 "hq" = (
-/mob/living/simple_animal/hostile/nanotrasen/ranged/smg,
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/blue{
 	dir = 1
 	},
-/obj/effect/turf_decal/tile/red{
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
+/obj/effect/turf_decal/tile/blue{
+	dir = 8
+	},
+/mob/living/simple_animal/hostile/syndicate,
 /turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/security)
+/area/awaymission/research/interior/medbay)
 "hr" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -3799,6 +3912,15 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/cryo)
+"hw" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 8
+	},
+/turf/open/floor/plasteel/yellowsiding{
+	dir = 4
+	},
+/area/awaymission/research/interior/dorm)
 "hx" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -4066,23 +4188,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/awaymission/research/interior/genetics)
-"hW" = (
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/mob/living/carbon/monkey,
-/obj/effect/turf_decal/tile/purple{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/purple,
-/obj/effect/turf_decal/tile/purple{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/purple{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/awaymission/research/interior/genetics)
 "hX" = (
 /obj/structure/rack,
 /obj/effect/spawner/lootdrop/maintenance,
@@ -4139,20 +4244,6 @@
 	},
 /turf/open/floor/plating,
 /area/awaymission/research/interior/maint)
-"if" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior)
 "ig" = (
 /obj/structure/cable{
 	icon_state = "2-4"
@@ -4186,23 +4277,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/security)
-"ij" = (
-/mob/living/simple_animal/bot/secbot/beepsky{
-	desc = "A beefy variant of the standard securitron model.";
-	emagged = 1;
-	faction = list("nanotrasenprivate");
-	health = 50;
-	maxHealth = 50;
-	name = "Officer Genesky"
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/red{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/security)
 "ik" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -4546,14 +4620,6 @@
 	},
 /turf/open/floor/plasteel/freezer,
 /area/awaymission/research/interior/bathroom)
-"iQ" = (
-/mob/living/simple_animal/hostile/syndicate,
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior)
 "iR" = (
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior/maint)
@@ -4723,35 +4789,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/awaymission/research/interior)
-"jr" = (
-/obj/structure/sign/directions/security{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 40
-	},
-/obj/structure/sign/directions/engineering{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 33
-	},
-/obj/structure/sign/directions/science{
-	dir = 1;
-	pixel_x = 32;
-	pixel_y = 26
-	},
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
-/obj/effect/turf_decal/tile/green{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/green,
-/obj/effect/turf_decal/tile/green{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/green{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior)
 "js" = (
 /obj/effect/turf_decal/tile/blue,
 /obj/effect/turf_decal/tile/blue{
@@ -4976,20 +5013,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/medbay)
-"jP" = (
-/mob/living/simple_animal/hostile/syndicate/ranged/smg,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/medbay)
 "jQ" = (
 /obj/effect/decal/cleanable/blood/drip,
 /obj/effect/turf_decal/tile/blue{
@@ -5591,9 +5614,6 @@
 	dir = 8
 	},
 /area/awaymission/research/interior/dorm)
-"ln" = (
-/turf/open/floor/plasteel,
-/area/space/nearstation)
 "lo" = (
 /obj/structure/table/wood,
 /obj/structure/bedsheetbin,
@@ -5613,20 +5633,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/awaymission/research/interior/medbay)
-"lr" = (
-/mob/living/simple_animal/hostile/syndicate,
-/obj/effect/turf_decal/tile/blue{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/blue,
-/obj/effect/turf_decal/tile/blue{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/blue{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white,
-/area/awaymission/research/interior/medbay)
 "ls" = (
 /obj/structure/table,
 /obj/item/storage/firstaid/regular,
@@ -5867,12 +5873,6 @@
 /obj/effect/landmark/awaystart,
 /turf/open/floor/wood,
 /area/awaymission/research/interior/dorm)
-"lU" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/plasteel/yellowsiding{
-	dir = 4
-	},
-/area/awaymission/research/interior/dorm)
 "lV" = (
 /obj/machinery/light/small{
 	dir = 1
@@ -38316,7 +38316,7 @@ ea
 ev
 fd
 fE
-gv
+dP
 ev
 fd
 fE
@@ -38565,10 +38565,10 @@ aH
 cm
 cw
 cx
-cT
+aS
 dh
 dq
-cT
+aS
 ea
 ev
 fc
@@ -38823,7 +38823,7 @@ cd
 cx
 cx
 cU
-di
+bc
 dr
 dr
 ea
@@ -39603,7 +39603,7 @@ ey
 fG
 gw
 gR
-hj
+dQ
 hu
 hK
 cK
@@ -40367,7 +40367,7 @@ cx
 cW
 dh
 du
-dQ
+cX
 ea
 eA
 fd
@@ -40377,7 +40377,7 @@ ev
 fd
 fE
 ea
-hW
+eL
 ib
 ib
 iz
@@ -40621,12 +40621,12 @@ aH
 ce
 cc
 cx
-cX
+aU
 dh
 dv
 dh
 ea
-eB
+di
 fc
 fH
 gx
@@ -40637,7 +40637,7 @@ ea
 dh
 dv
 dh
-cT
+aS
 cx
 cm
 cw
@@ -40651,7 +40651,7 @@ kr
 jn
 jF
 jF
-ln
+jF
 kc
 lL
 jk
@@ -41143,7 +41143,7 @@ ea
 ev
 fh
 fI
-gv
+dP
 ev
 fc
 fE
@@ -43224,8 +43224,8 @@ lc
 lp
 lp
 lN
-lU
-lU
+hw
+hw
 lY
 aP
 cd
@@ -44224,7 +44224,7 @@ dl
 dz
 cZ
 ek
-eL
+dn
 fl
 eJ
 eZ
@@ -44238,7 +44238,7 @@ ir
 hZ
 hZ
 hZ
-iQ
+gv
 hZ
 hZ
 hA
@@ -44490,7 +44490,7 @@ hl
 hl
 hl
 hl
-if
+fY
 is
 hl
 hl
@@ -44734,7 +44734,7 @@ cs
 cC
 cP
 TD
-dn
+co
 dB
 da
 em
@@ -44756,7 +44756,7 @@ ia
 ia
 ia
 ia
-jr
+gW
 jI
 hl
 kv
@@ -47584,7 +47584,7 @@ aO
 iW
 iW
 ju
-jP
+hj
 kh
 iW
 iW
@@ -48361,7 +48361,7 @@ kg
 kM
 jh
 jw
-lr
+hq
 kg
 iW
 cd
@@ -48855,7 +48855,7 @@ fq
 fW
 gK
 fW
-hq
+eB
 do
 dH
 dH
@@ -49366,7 +49366,7 @@ dT
 eo
 eR
 fr
-fY
+dI
 gK
 fW
 ho
@@ -49646,7 +49646,7 @@ kg
 kL
 kZ
 lg
-lr
+hq
 lD
 iW
 lW
@@ -50389,7 +50389,7 @@ ad
 aH
 aO
 do
-dI
+cT
 dH
 dH
 eS
@@ -50401,7 +50401,7 @@ fW
 fW
 fW
 fW
-ij
+gi
 do
 hD
 aH
@@ -50672,7 +50672,7 @@ jw
 km
 kB
 kO
-jP
+hj
 lj
 lw
 lI
@@ -372,7 +372,10 @@
 /turf/open/space,
 /area/space/nearstation)
 "aaU" = (
-/obj/machinery/computer/arcade,
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 4
+	},
 /turf/open/floor/plasteel,
 /area/security/prison)
 "aaV" = (
@@ -6019,6 +6022,18 @@
 	},
 /turf/open/floor/plasteel,
 /area/security/processing)
+"amd" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 4
+	},
+/turf/open/floor/plasteel/white/corner{
+	dir = 1
+	},
+/area/hallway/secondary/exit)
 "ame" = (
 /obj/structure/cable{
 	icon_state = "1-2"
@@ -6225,6 +6240,17 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/solars/port/fore)
+"amB" = (
+/obj/effect/turf_decal/tile/bar,
+/obj/effect/turf_decal/tile/bar{
+	dir = 1
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/crew_quarters/bar)
 "amC" = (
 /turf/open/floor/plating,
 /area/maintenance/port/fore)
@@ -19937,15 +19963,6 @@
 	dir = 1
 	},
 /area/chapel/main)
-"aUL" = (
-/obj/machinery/computer/arcade,
-/obj/effect/turf_decal/tile/red{
-	dir = 8
-	},
-/turf/open/floor/plasteel/white/corner{
-	dir = 1
-	},
-/area/hallway/secondary/exit)
 "aUM" = (
 /obj/machinery/camera{
 	c_tag = "Arrivals Bay 2";
@@ -22268,14 +22285,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/crew_quarters/bar)
-"baa" = (
-/obj/machinery/computer/arcade,
-/obj/effect/turf_decal/tile/bar,
-/obj/effect/turf_decal/tile/bar{
-	dir = 1
-	},
-/turf/open/floor/plasteel,
-/area/crew_quarters/bar)
 "bab" = (
 /obj/machinery/light,
 /obj/machinery/firealarm{
@@ -91961,7 +91970,7 @@ aUf
 aQc
 aXi
 aQc
-baa
+amB
 aJC
 bcq
 bcq
@@ -106349,7 +106358,7 @@ aCR
 aCR
 aCR
 aTl
-aUL
+amd
 aVW
 aXD
 aZj
@@ -173,6 +173,88 @@
 /obj/effect/landmark/xeno_spawn,
 /turf/open/space,
 /area/solar/starboard/fore)
+"aav" = (
+/obj/effect/decal/cleanable/cobweb,
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aaw" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"aax" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"aay" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aaz" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/starboard/fore)
+"aaA" = (
+/obj/effect/decal/cleanable/dirt,
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/maintenance/starboard/fore)
+"aaB" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/security/prison)
 "aaE" = (
 /obj/structure/lattice/catwalk,
 /turf/open/space,
@@ -4563,11 +4645,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/maintenance/starboard/fore)
-"anz" = (
-/obj/machinery/computer/arcade,
-/obj/effect/decal/cleanable/cobweb,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
 "anA" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -7122,10 +7199,6 @@
 	},
 /turf/open/floor/plating,
 /area/maintenance/starboard/fore)
-"arX" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
 "arY" = (
 /obj/structure/table/wood,
 /obj/item/toy/talking/codex_gigas,
@@ -7156,11 +7229,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/maintenance/starboard/fore)
-"asa" = (
-/obj/machinery/computer/arcade,
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plating,
-/area/maintenance/starboard/fore)
 "asb" = (
 /obj/machinery/airalarm{
 	dir = 1;
@@ -21997,10 +22065,6 @@
 /obj/machinery/atmospherics/pipe/simple/supply/hidden,
 /turf/open/floor/plating,
 /area/security/prison)
-"aRi" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/plating,
-/area/security/prison)
 "aRj" = (
 /obj/structure/cable/white{
 	icon_state = "0-2"
@@ -170617,7 +170681,7 @@ aox
 apu
 aqy
 arb
-aoy
+aax
 aig
 auA
 avU
@@ -170874,7 +170938,7 @@ aoy
 apv
 aqz
 apu
-arX
+aay
 aig
 auB
 avU
@@ -171383,8 +171447,8 @@ aiC
 akU
 alI
 amE
-anz
-aox
+aav
+aaw
 apw
 aqA
 apy
@@ -171902,7 +171966,7 @@ aiC
 apy
 apy
 apu
-aox
+aaz
 atw
 auD
 avW
@@ -172159,7 +172223,7 @@ aoB
 apz
 apw
 apv
-asa
+aaA
 atw
 auE
 avW
@@ -182715,7 +182779,7 @@ aFn
 aMn
 aNI
 aPr
-aRi
+aaB
 aKV
 aUC
 aWk
@@ -1279,6 +1279,22 @@
 	},
 /turf/open/floor/plasteel,
 /area/science/mixing)
+"abQ" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	dir = 4
+	},
+/turf/open/floor/plasteel/dark,
+/area/maintenance/port)
 "abR" = (
 /obj/structure/lattice,
 /turf/open/space,
@@ -37164,20 +37180,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/hallway/primary/starboard)
-"dEa" = (
-/obj/machinery/computer/arcade,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/maintenance/port)
 "dFV" = (
 /obj/machinery/atmospherics/pipe/simple/green/visible{
 	dir = 4
@@ -76194,7 +76196,7 @@ aZp
 bak
 bbc
 bbQ
-dEa
+abQ
 bdD
 beu
 sKE
@@ -35,6 +35,30 @@
 	icon_state = "platingdmg3"
 	},
 /area/maintenance/department/science)
+"aae" = (
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 8
+	},
+/turf/open/floor/plasteel/dark,
+/area/security/prison)
+"aaf" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	icon_state = "arcade";
+	dir = 1
+	},
+/turf/open/floor/plasteel/dark,
+/area/crew_quarters/heads/captain)
 "abf" = (
 /obj/structure/bed,
 /turf/open/floor/plating,
@@ -1621,10 +1645,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/security/prison)
-"afI" = (
-/obj/machinery/computer/arcade,
-/turf/open/floor/plasteel/dark,
-/area/security/prison)
 "afJ" = (
 /obj/effect/landmark/carpspawn,
 /turf/open/space/basic,
@@ -13685,20 +13705,6 @@
 	},
 /turf/open/floor/plasteel/dark,
 /area/crew_quarters/heads/captain)
-"aGm" = (
-/obj/machinery/computer/arcade,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel/dark,
-/area/crew_quarters/heads/captain)
 "aGn" = (
 /obj/item/twohanded/required/kirbyplants/photosynthetic{
 	layer = 3.1
@@ -83601,7 +83607,7 @@ aeu
 aeI
 lGp
 aeU
-afI
+aae
 aeU
 dUk
 agy
@@ -90832,7 +90838,7 @@ aCC
 aDG
 aBm
 aFz
-aGm
+aaf
 awR
 aHQ
 aIO
@@ -26979,9 +26979,9 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
+ae
+ae
+ae
 ab
 ab
 ab
@@ -27235,11 +27235,11 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
+ae
+ag
+ag
+ag
+ae
 ab
 ab
 ab
@@ -27492,11 +27492,11 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
+ae
+ag
+ag
+ag
+ae
 aF
 aF
 aF
@@ -27747,8 +27747,8 @@ ab
 ab
 ab
 ab
-ae
-ae
+ab
+ab
 ah
 ah
 ai
@@ -28003,9 +28003,9 @@ ab
 ab
 ab
 ab
-ae
-ag
-ag
+ab
+ab
+ab
 ah
 ar
 aj
@@ -28260,9 +28260,9 @@ ab
 ab
 ab
 ab
-ae
-ag
-ag
+ab
+ab
+ab
 ah
 as
 aj
@@ -28517,9 +28517,9 @@ ab
 ab
 ab
 ab
-ae
-ag
-ag
+ab
+ab
+ab
 ah
 VP
 aj
@@ -28775,8 +28775,8 @@ ab
 ab
 ab
 ab
-ae
-ae
+ab
+ab
 ah
 ah
 ay
@@ -29033,7 +29033,7 @@ ab
 ab
 ab
 ab
-ae
+ab
 an
 au
 aj
@@ -33657,7 +33657,7 @@ ab
 ab
 ab
 ab
-ae
+ab
 ah
 al
 aj
@@ -33914,7 +33914,7 @@ ab
 ab
 ab
 ab
-ae
+ab
 ai
 bE
 aj
@@ -34171,7 +34171,7 @@ ab
 ab
 ab
 ab
-ae
+ab
 ah
 al
 aj
@@ -34688,11 +34688,11 @@ ab
 ab
 ab
 ab
-ab
-ab
-ab
-ab
-ab
+ae
+ae
+ag
+ae
+ae
 aF
 aF
 aF
@@ -591,6 +591,22 @@
 /obj/machinery/recharger,
 /turf/open/floor/mineral/plastitanium/red/brig,
 /area/shuttle/escape)
+"bh" = (
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/computer/arcade{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/escape)
 "bj" = (
 /turf/open/floor/mech_bay_recharge_floor,
 /area/shuttle/escape)
@@ -1181,20 +1197,6 @@
 	},
 /turf/open/floor/plasteel/white,
 /area/shuttle/escape)
-"cz" = (
-/obj/machinery/computer/arcade,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 1
-	},
-/obj/effect/turf_decal/tile/neutral,
-/obj/effect/turf_decal/tile/neutral{
-	dir = 4
-	},
-/obj/effect/turf_decal/tile/neutral{
-	dir = 8
-	},
-/turf/open/floor/plasteel,
-/area/shuttle/escape)
 "cA" = (
 /obj/machinery/light{
 	dir = 8
@@ -1815,8 +1817,8 @@ ab
 ad
 cn
 cn
-cz
-cz
+bh
+bh
 cn
 cn
 ab
@@ -284,9 +284,6 @@
 /turf/open/floor/plating,
 /area/shuttle/escape)
 "be" = (
-/obj/machinery/light/small{
-	dir = 1
-	},
 /obj/structure/chair/sofa/right,
 /turf/open/floor/plating,
 /area/shuttle/escape)
@@ -363,6 +360,20 @@
 /obj/structure/shuttle/engine/propulsion,
 /turf/open/floor/plating/airless,
 /area/shuttle/escape)
+"fV" = (
+/turf/closed/wall/r_wall,
+/area/shuttle/escape)
+"IR" = (
+/obj/effect/spawner/structure/window/plasma/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"Pi" = (
+/obj/structure/chair/sofa,
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)

 (1,1,1) = {"
 aa
@@ -452,11 +463,11 @@ aP
 av
 av
 ax
-ab
-ad
-ab
+av
+fV
+fV
 bk
-ab
+fV
 bs
 bu
 "}
@@ -476,8 +487,8 @@ aT
 aT
 aT
 aT
-ac
-ac
+aT
+IR
 be
 aN
 bl
@@ -501,7 +512,7 @@ ab
 ad
 ab
 ad
-ad
+fV
 bf
 bl
 bq
@@ -522,11 +533,11 @@ aM
 aP
 aU
 aC
+aC
 aX
 aD
-ad
-ad
-bg
+fV
+Pi
 bm
 bn
 bs
@@ -546,10 +557,10 @@ ad
 ab
 ab
 aC
+aC
 aY
 aX
-ad
-ad
+fV
 bh
 aP
 bq
@@ -570,10 +581,10 @@ aC
 aD
 aC
 ax
+aC
 aZ
 ax
-ac
-ac
+IR
 bg
 bl
 br
@@ -594,14 +605,14 @@ aC
 aQ
 aV
 aC
+aC
 aX
 aD
-ad
-ab
+fV
 bi
 bn
 bl
-ab
+fV
 ab
 "}
 (11,1,1) = {"
@@ -621,10 +632,10 @@ ab
 ad
 ad
 ab
-ad
-ab
-ab
-ad
-ad
+fV
+fV
+fV
+fV
+fV
 aa
 "}
@@ -1329,6 +1329,14 @@
 "eP" = (
 /turf/closed/wall/mineral/plastitanium/nodiagonal,
 /area/shuttle/escape)
+"Mb" = (
+/obj/machinery/door/airlock/hatch{
+	name = "Shuttle EVA";
+	req_access_txt = "19"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/escape)

 (1,1,1) = {"
 aa
@@ -1645,7 +1653,7 @@ cs
 ad
 cr
 cs
-aR
+Mb
 cs
 ar
 br
@@ -131,6 +131,11 @@
 #define ORGAN_SLOT_BRAIN_ANTISTUN "brain_antistun"
 #define ORGAN_SLOT_TAIL "tail"
 #define ORGAN_SLOT_PENIS "penis"
+#define ORGAN_SLOT_WOMB "womb"
+#define ORGAN_SLOT_VAGINA "vagina"
+#define ORGAN_SLOT_TESTICLES "testicles"
+#define ORGAN_SLOT_BREASTS "breasts"
+

 ////organ defines
 #define STANDARD_ORGAN_THRESHOLD 	100
@@ -0,0 +1,32 @@
+
+#if DM_VERSION < 513
+
+#define ismovableatom(A) (istype(A, /atom/movable))
+
+#define islist(L) (istype(L, /list))
+
+#define CLAMP01(x) (CLAMP(x, 0, 1))
+
+#define CLAMP(CLVALUE,CLMIN,CLMAX) ( max( (CLMIN), min((CLVALUE), (CLMAX)) ) )
+
+#define ATAN2(x, y) ( !(x) && !(y) ? 0 : (y) >= 0 ? arccos((x) / sqrt((x)*(x) + (y)*(y))) : -arccos((x) / sqrt((x)*(x) + (y)*(y))) )
+
+#define TAN(x) (sin(x) / cos(x))
+
+#define arctan(x) (arcsin(x/sqrt(1+x*x)))
+
+//////////////////////////////////////////////////
+
+#else
+
+#define ismovableatom(A) ismovable(A)
+
+#define CLAMP01(x) clamp(x, 0, 1)
+
+#define CLAMP(CLVALUE, CLMIN, CLMAX) clamp(CLVALUE, CLMIN, CLMAX)
+
+#define TAN(x) tan(x)
+
+#define ATAN2(x, y) arctan(x, y)
+
+#endif
@@ -15,9 +15,26 @@
 #define ui_boxvore	"EAST-5:22,SOUTH+1:6"

 //Filters
-#define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, border=0, color="#04080F")
+#define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, color="#04080F")

 //organ defines
+#define VAGINA_LAYER_INDEX		1
+#define TESTICLES_LAYER_INDEX	2
+#define GENITAL_LAYER_INDEX		3
+#define PENIS_LAYER_INDEX		4
+
+#define GENITAL_LAYER_INDEX_LENGTH 4 //keep it updated with each new index added, thanks.
+
+//genital flags
+#define GENITAL_BLACKLISTED		(1<<0) //for genitals that shouldn't be added to GLOB.genitals_list.
+#define GENITAL_INTERNAL		(1<<1)
+#define GENITAL_HIDDEN			(1<<2)
+#define GENITAL_THROUGH_CLOTHES	(1<<3)
+#define GENITAL_FUID_PRODUCTION	(1<<4)
+#define CAN_MASTURBATE_WITH		(1<<5)
+#define MASTURBATE_LINKED_ORGAN	(1<<6) //used to pass our mission to the linked organ
+#define CAN_CLIMAX_WITH			(1<<7)
+
 #define COCK_SIZE_MIN		1
 #define COCK_SIZE_MAX		20

@@ -50,27 +67,6 @@

 #define BREASTS_VOLUME_BASE	50	//base volume for the reagents in the breasts, multiplied by the size then multiplier. 50u for A cups, 850u for HH cups.
 #define BREASTS_VOLUME_MULT	1	//global multiplier for breast volume.
-#define BREASTS_SIZE_FLAT	0
-#define BREASTS_SIZE_A		1
-#define BREASTS_SIZE_AA		1.5
-#define BREASTS_SIZE_B		2
-#define BREASTS_SIZE_BB		2.5
-#define BREASTS_SIZE_C		3
-#define BREASTS_SIZE_CC		3.5
-#define BREASTS_SIZE_D		4
-#define BREASTS_SIZE_DD		4.5
-#define BREASTS_SIZE_E		5
-#define BREASTS_SIZE_EE		5.5
-#define BREASTS_SIZE_F		6
-#define BREASTS_SIZE_FF		6.5
-#define BREASTS_SIZE_G		7
-#define BREASTS_SIZE_GG		7.5//Are these even real sizes? The world may never know because cup sizes make no fucking sense.
-#define BREASTS_SIZE_H		8
-#define BREASTS_SIZE_HH		8.5//Largest size, ever. For now.
-
-#define BREASTS_SIZE_MIN 	BREASTS_SIZE_A
-#define BREASTS_SIZE_DEF	BREASTS_SIZE_C
-#define BREASTS_SIZE_MAX 	BREASTS_SIZE_HH

 #define MILK_RATE			5
 #define MILK_RATE_MULT		1
@@ -104,8 +104,7 @@
 #define SHOVE_KNOCKDOWN_HUMAN 30
 #define SHOVE_KNOCKDOWN_TABLE 30
 #define SHOVE_KNOCKDOWN_COLLATERAL 10
-//Shove slowdown
-#define SHOVE_SLOWDOWN_ID "shove_slowdown"
+//for the shove slowdown, see __DEFINES/movespeed_modification.dm
 #define SHOVE_SLOWDOWN_LENGTH 30
 #define SHOVE_SLOWDOWN_STRENGTH 0.85 //multiplier
 //Shove disarming item list
@@ -126,7 +126,7 @@
 #define COMSIG_MOB_GHOSTIZE "mob_ghostize"						//from base of mob/Ghostize() (can_reenter_corpse)
 	#define COMPONENT_BLOCK_GHOSTING 1
 #define COMSIG_MOB_ALLOWED "mob_allowed"						//from base of obj/allowed(mob/M): (/obj) returns bool, if TRUE the mob has id access to the obj
-#define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic"			//from base of mob/anti_magic_check(): (magic, holy, protection_sources)
+#define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic"			//from base of mob/anti_magic_check(): (mob/user, magic, holy, tinfoil, chargecost, self, protection_sources)
 	#define COMPONENT_BLOCK_MAGIC 1
 #define COMSIG_MOB_HUD_CREATED "mob_hud_created"				//from base of mob/create_mob_hud(): ()
 #define COMSIG_MOB_ATTACK_HAND "mob_attack_hand"				//from base of
@@ -157,6 +157,10 @@
 // /mob/living/carbon signals
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))

+// /mob/living/simple_animal/hostile signals
+#define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
+	#define COMPONENT_HOSTILE_NO_ATTACK 1
+
 // /obj signals
 #define COMSIG_OBJ_DECONSTRUCT 	"obj_deconstruct"				//from base of obj/deconstruct(): (disassembled)
 #define COMSIG_OBJ_BREAK		"obj_break"						//from base of /obj/obj_break(): (damage_flag)
@@ -206,6 +210,9 @@
 // /obj/item/pen signals
 #define COMSIG_PEN_ROTATED "pen_rotated"						//called after rotation in /obj/item/pen/attack_self(): (rotation, mob/living/carbon/user)

+// /obj/item/projectile signals (sent to the firer)
+#define COMSIG_PROJECTILE_ON_HIT "projectile_on_hit"			// from base of /obj/item/projectile/proc/on_hit(): (atom/movable/firer, atom/target, Angle)
+#define COMSIG_PROJECTILE_BEFORE_FIRE "projectile_before_fire" 			// from base of /obj/item/projectile/proc/fire(): (obj/item/projectile, atom/original_target)

 // /mob/living/carbon/human signals
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack"			//from mob/living/carbon/human/UnarmedAttack(): (atom/target)
@@ -233,8 +240,7 @@
 //Mood
 #define COMSIG_ADD_MOOD_EVENT "add_mood" //Called when you send a mood event from anywhere in the code.
 #define COMSIG_CLEAR_MOOD_EVENT "clear_mood" //Called when you clear a mood event from anywhere in the code.
-#define COMSIG_INCREASE_SANITY "decrease_sanity" //Called when you want to increase sanity from anywhere in the code.
-#define COMSIG_DECREASE_SANITY "increase_sanity" //Same as above but to decrease sanity instead.
+#define COMSIG_MODIFY_SANITY "modify_sanity" //Called when you want to increase or decrease sanity from anywhere in the code.

 //NTnet
 #define COMSIG_COMPONENT_NTNET_RECEIVE "ntnet_receive"			//called on an object by its NTNET connection component on receive. (sending_id(number), sending_netname(text), data(datum/netdata))
@@ -0,0 +1,5 @@
+#define AFFIX_PREFIX 		(1 << 0)
+#define AFFIX_SUFFIX 		(1 << 1)
+
+#define AFFIX_GOOD 			(1 << 0)
+#define AFFIX_EVIL 			(1 << 1)
@@ -58,6 +58,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define GROUND (1<<0)
 #define FLYING (1<<1)
 #define VENTCRAWLING (1<<2)
+#define FLOATING (1<<3)

 //Fire and Acid stuff, for resistance_flags
 #define LAVA_PROOF		(1<<0)
@@ -28,7 +28,9 @@
 #define ITEM_SLOT_POCKET		(1<<11) // this is to allow items with a w_class of WEIGHT_CLASS_NORMAL or WEIGHT_CLASS_BULKY to fit in pockets.
 #define ITEM_SLOT_DENYPOCKET	(1<<12) // this is to deny items with a w_class of WEIGHT_CLASS_SMALL or WEIGHT_CLASS_TINY to fit in pockets.
 #define ITEM_SLOT_NECK			(1<<13)
-#define ITEM_SLOT_SUITSTORE		(1<<14)
+#define ITEM_SLOT_HANDS			(1<<14)
+#define ITEM_SLOT_BACKPACK		(1<<15)
+#define ITEM_SLOT_SUITSTORE		(1<<16)

 //SLOTS
 #define SLOT_BACK			1
@@ -86,6 +88,10 @@
 			. = ITEM_SLOT_ICLOTHING
 		if(SLOT_L_STORE, SLOT_R_STORE)
 			. = ITEM_SLOT_POCKET
+		if(SLOT_HANDS)
+			. = ITEM_SLOT_HANDS
+		if(SLOT_IN_BACKPACK)
+			. = ITEM_SLOT_BACKPACK
 		if(SLOT_S_STORE)
 			. = ITEM_SLOT_SUITSTORE

@@ -237,3 +243,6 @@ GLOBAL_LIST_INIT(security_wintercoat_allowed, typecacheof(list(

 //Internals checker
 #define GET_INTERNAL_SLOTS(C) list(C.head, C.wear_mask)
+
+//Slots that won't trigger humans' update_genitals() on equip().
+GLOBAL_LIST_INIT(no_genitals_update_slots, list(SLOT_L_STORE, SLOT_R_STORE, SLOT_S_STORE, SLOT_IN_BACKPACK, SLOT_LEGCUFFED, SLOT_HANDCUFFED, SLOT_HANDS, SLOT_GENERC_DEXTROUS_STORAGE))
@@ -1,11 +1,7 @@
 // simple is_type and similar inline helpers

-#define islist(L) (istype(L, /list))
-
 #define in_range(source, user) (get_dist(source, user) <= 1 && (get_step(source, 0)?:z) == (get_step(user, 0)?:z))

-#define ismovableatom(A) (istype(A, /atom/movable))
-
 #define isatom(A) (isloc(A))

 #define isweakref(D) (istype(D, /datum/weakref))
@@ -223,6 +219,10 @@ GLOBAL_LIST_INIT(pointed_types, typecacheof(list(

 #define isbodypart(A) (istype(A, /obj/item/bodypart))

+#define isprojectile(A) (istype(A, /obj/item/projectile))
+
+#define isgun(A) (istype(A, /obj/item/gun))
+
 //Assemblies
 #define isassembly(O) (istype(O, /obj/item/assembly))

@@ -246,4 +246,4 @@ GLOBAL_LIST_INIT(glass_sheet_types, typecacheof(list(

 #define isblobmonster(O) (istype(O, /mob/living/simple_animal/hostile/blob))

-#define isshuttleturf(T) (length(T.baseturfs) && (/turf/baseturf_skipover/shuttle in T.baseturfs))
+#define isshuttleturf(T) (length(T.baseturfs) && (/turf/baseturf_skipover/shuttle in T.baseturfs))
@@ -92,3 +92,7 @@ require only minor tweaks.
 #define PLACE_SAME_Z "same"
 #define PLACE_SPACE_RUIN "space"
 #define PLACE_LAVA_RUIN "lavaland"
+
+
+//Map type stuff.
+#define MAP_TYPE_STATION "station"
@@ -16,7 +16,6 @@
 #define TICK_USAGE_TO_MS(starting_tickusage) (TICK_DELTA_TO_MS(TICK_USAGE_REAL - starting_tickusage))

 #define PERCENT(val) (round((val)*100, 0.1))
-#define CLAMP01(x) (CLAMP(x, 0, 1))

 //time of day but automatically adjusts to the server going into the next day within the same round.
 //for when you need a reliable time number that doesn't depend on byond time.
@@ -30,17 +29,12 @@
 // round() acts like floor(x, 1) by default but can't handle other values
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )

-#define CLAMP(CLVALUE,CLMIN,CLMAX) ( max( (CLMIN), min((CLVALUE), (CLMAX)) ) )
-
 // Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
 #define WRAP(val, min, max) ( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) )

 // Real modulus that handles decimals
 #define MODULUS(x, y) ( (x) - (y) * round((x) / (y)) )

-// Tangent
-#define TAN(x) (sin(x) / cos(x))
-
 // Cotangent
 #define COT(x) (1 / TAN(x))

@@ -50,8 +44,6 @@
 // Cosecant
 #define CSC(x) (1 / sin(x))

-#define ATAN2(x, y) ( !(x) && !(y) ? 0 : (y) >= 0 ? arccos((x) / sqrt((x)*(x) + (y)*(y))) : -arccos((x) / sqrt((x)*(x) + (y)*(y))) )
-
 // Greatest Common Divisor - Euclid's algorithm
 /proc/Gcd(a, b)
 	return b ? Gcd(b, (a) % (b)) : a
@@ -207,4 +199,4 @@
 #define LORENTZ_CUMULATIVE_DISTRIBUTION(x, y, s) ( (1/PI)*TORADIANS(arctan((x-y)/s)) + 1/2 )

 #define RULE_OF_THREE(a, b, x) ((a*x)/b)
-// )
+// )
@@ -51,24 +51,25 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s

 //Human Overlays Indexes/////////
 //LOTS OF CIT CHANGES HERE. BE CAREFUL WHEN UPSTREAM ADDS MORE LAYERS
-#define MUTATIONS_LAYER			31		//mutations. Tk headglows, cold resistance glow, etc
-#define GENITALS_BEHIND_LAYER	30		//Some genitalia needs to be behind everything, such as with taurs (Taurs use body_behind_layer
-#define BODY_BEHIND_LAYER		29		//certain mutantrace features (tail when looking south) that must appear behind the body parts
-#define BODYPARTS_LAYER			28		//Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag
-#define MARKING_LAYER			27		//Matrixed body markings because clashing with snouts?
-#define BODY_ADJ_LAYER			26		//certain mutantrace features (snout, body markings) that must appear above the body parts
-#define GENITALS_FRONT_LAYER	25		//Draws some genitalia above clothes and the TAUR body if need be.
-#define BODY_LAYER				24		//underwear, undershirts, socks, eyes, lips(makeup)
-#define FRONT_MUTATIONS_LAYER	23		//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
-#define DAMAGE_LAYER			22		//damage indicators (cuts and burns)
-#define UNIFORM_LAYER			21
-#define ID_LAYER				20
+#define MUTATIONS_LAYER			32		//mutations. Tk headglows, cold resistance glow, etc
+#define GENITALS_BEHIND_LAYER	31		//Some genitalia needs to be behind everything, such as with taurs (Taurs use body_behind_layer
+#define BODY_BEHIND_LAYER		30		//certain mutantrace features (tail when looking south) that must appear behind the body parts
+#define BODYPARTS_LAYER			29		//Initially "AUGMENTS", this was repurposed to be a catch-all bodyparts flag
+#define MARKING_LAYER			28		//Matrixed body markings because clashing with snouts?
+#define BODY_ADJ_LAYER			27		//certain mutantrace features (snout, body markings) that must appear above the body parts
+#define GENITALS_FRONT_LAYER	26		//Draws some genitalia above clothes and the TAUR body if need be.
+#define BODY_LAYER				25		//underwear, undershirts, socks, eyes, lips(makeup)
+#define FRONT_MUTATIONS_LAYER	24		//mutations that should appear above body, body_adj and bodyparts layer (e.g. laser eyes)
+#define DAMAGE_LAYER			23		//damage indicators (cuts and burns)
+#define UNIFORM_LAYER			22
+#define ID_LAYER				21
 #define HANDS_PART_LAYER		20
 #define SHOES_LAYER				19
 #define GLOVES_LAYER			18
 #define EARS_LAYER				17
 #define BODY_TAUR_LAYER			16
 #define SUIT_LAYER				15
+#define GENITALS_EXPOSED_LAYER	14
 #define GLASSES_LAYER			13
 #define BELT_LAYER				12		//Possible make this an overlay of somethign required to wear a belt?
 #define SUIT_STORE_LAYER		11
@@ -82,7 +83,7 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 #define HANDS_LAYER				3
 #define BODY_FRONT_LAYER		2
 #define FIRE_LAYER				1		//If you're on fire
-#define TOTAL_LAYERS			30		//KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_;
+#define TOTAL_LAYERS			32		//KEEP THIS UP-TO-DATE OR SHIT WILL BREAK ;_;

 //Human Overlay Index Shortcuts for alternate_worn_layer, layers
 //Because I *KNOW* somebody will think layer+1 means "above"
@@ -489,7 +490,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define PDAIMG(what) {"<span class="pda16x16 [#what]"></span>"}

 //Filters
-#define AMBIENT_OCCLUSION list("type"="drop_shadow","x"=0,"y"=-2,"size"=4,"border"=4,"color"="#04080FAA")
+#define AMBIENT_OCCLUSION list("type"="drop_shadow","x"=0,"y"=-2,"size"=4,"color"="#04080FAA")
 #define EYE_BLUR(size) list("type"="blur", "size"=size)
 #define GRAVITY_MOTION_BLUR list("type"="motion_blur","x"=0,"y"=0)

@@ -1,12 +1,19 @@
 #define MOVESPEED_DATA_INDEX_PRIORITY 1
 #define MOVESPEED_DATA_INDEX_FLAGS 2
 #define MOVESPEED_DATA_INDEX_MULTIPLICATIVE_SLOWDOWN 3
+#define MOVESPEED_DATA_INDEX_MOVETYPE 4
+#define MOVESPEED_DATA_INDEX_BL_MOVETYPE 5
+#define MOVESPEED_DATA_INDEX_CONFLICT 6

-#define MOVESPEED_DATA_INDEX_MAX 3
+#define MOVESPEED_DATA_INDEX_MAX 6

 //flags
 #define IGNORE_NOSLOW	(1 << 0)

+//conflict types
+
+#define MOVE_CONFLICT_JETPACK							"JETPACK"
+
 //ids

 #define MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED			"MOB_WALK_RUN"
@@ -16,15 +23,29 @@
 #define MOVESPEED_ID_SLIME_HEALTHMOD					"SLIME_HEALTH_MODIFIER"
 #define MOVESPEED_ID_SLIME_TEMPMOD						"SLIME_TEMPERATURE_MODIFIER"

+#define MOVESPEED_ID_SLIME_STATUS						"SLIME_STATUS"
+
+#define MOVESPEED_ID_TARANTULA_WEB						"TARANTULA_WEB"
+
 #define MOVESPEED_ID_LIVING_TURF_SPEEDMOD				"LIVING_TURF_SPEEDMOD"

 #define MOVESPEED_ID_CARBON_SOFTCRIT					"CARBON_SOFTCRIT"
 #define MOVESPEED_ID_CARBON_OLDSPEED					"CARBON_DEPRECATED_SPEED"

+#define MOVESPEED_ID_DNA_VAULT							"DNA_VAULT"
+
+#define MOVESPEED_ID_YELLOW_ORB							"YELLOW_ORB"
+
+#define MOVESPEED_ID_TARFOOT							"TARFOOT"
+
+#define MOVESPEED_ID_SEPIA								"SEPIA"
+
 #define MOVESPEED_ID_MONKEY_REAGENT_SPEEDMOD			"MONKEY_REAGENT_SPEEDMOD"
 #define MOVESPEED_ID_MONKEY_TEMPERATURE_SPEEDMOD		"MONKEY_TEMPERATURE_SPEEDMOD"
 #define MOVESPEED_ID_MONKEY_HEALTH_SPEEDMOD				"MONKEY_HEALTH_SPEEDMOD"

+#define MOVESPEED_ID_CHANGELING_MUSCLES					"CHANGELING_MUSCLES"
+
 #define MOVESPEED_ID_SIMPLEMOB_VARSPEED					"SIMPLEMOB_VARSPEED_MODIFIER"
 #define MOVESPEED_ID_ADMIN_VAREDIT						"ADMIN_VAREDIT_MODIFIER"

@@ -32,7 +53,18 @@

 #define MOVESPEED_ID_SANITY								"MOOD_SANITY"

+#define MOVESPEED_ID_SPECIES							"SPECIES_SPEED_MOD"
+
 #define MOVESPEED_ID_PRONE_DRAGGING                     "PRONE_DRAG"
 #define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"

-#define MOVESPEED_ID_TASED_STATUS						"TASED"
+#define MOVESPEED_ID_TASED_STATUS						"TASED"
+
+#define MOVESPEED_ID_SLAUGHTER                          "SLAUGHTER"
+
+#define MOVESPEED_ID_CYBER_THRUSTER						"CYBER_IMPLANT_THRUSTER"
+#define MOVESPEED_ID_JETPACK							"JETPACK"
+
+#define MOVESPEED_ID_SHOVE 								"SHOVE"
+
+#define MOVESPEED_ID_MKULTRA							"MKULTRA"
@@ -2,43 +2,45 @@


 #define EMAGGED					(1<<0)
-#define IN_USE					(1<<1) // If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
-#define CAN_BE_HIT				(1<<2) //can this be bludgeoned by items?
-#define BEING_SHOCKED			(1<<3) // Whether this thing is currently (already) being shocked by a tesla
-#define DANGEROUS_POSSESSION	(1<<4) //Admin possession yes/no
-#define ON_BLUEPRINTS			(1<<5)  //Are we visible on the station blueprints at roundstart?
-#define UNIQUE_RENAME			(1<<6) // can you customize the description/name of the thing?
+#define IN_USE					(1<<1)	//If we have a user using us, this will be set on. We will check if the user has stopped using us, and thus stop updating and LAGGING EVERYTHING!
+#define CAN_BE_HIT				(1<<2)	//can this be bludgeoned by items?
+#define BEING_SHOCKED			(1<<3)	//Whether this thing is currently (already) being shocked by a tesla
+#define DANGEROUS_POSSESSION	(1<<4)	//Admin possession yes/no
+#define ON_BLUEPRINTS			(1<<5)	//Are we visible on the station blueprints at roundstart?
+#define UNIQUE_RENAME			(1<<6)	//can you customize the description/name of the thing?
 #define USES_TGUI				(1<<7)	//put on things that use tgui on ui_interact instead of custom/old UI.
 #define FROZEN					(1<<8)
-#define SHOVABLE_ONTO			(1<<9) //called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.
+#define SHOVABLE_ONTO			(1<<9)	//called on turf.shove_act() to consider whether an object should have a niche effect (defined in their own shove_act()) when someone is pushed onto it, or do a sanity CanPass() check.

 // If you add new ones, be sure to add them to /obj/Initialize as well for complete mapping support

 // Flags for the item_flags var on /obj/item

 #define BEING_REMOVED			(1<<0)
-#define IN_INVENTORY			(1<<1) //is this item equipped into an inventory slot or hand of a mob? used for tooltips
-#define FORCE_STRING_OVERRIDE	(1<<2) // used for tooltips
-#define NEEDS_PERMIT			(1<<3) //Used by security bots to determine if this item is safe for public use.
+#define IN_INVENTORY			(1<<1)	//is this item equipped into an inventory slot or hand of a mob? used for tooltips
+#define FORCE_STRING_OVERRIDE	(1<<2)	//used for tooltips
+#define NEEDS_PERMIT			(1<<3)	//Used by security bots to determine if this item is safe for public use.
 #define SLOWS_WHILE_IN_HAND		(1<<4)
-#define NO_MAT_REDEMPTION		(1<<5) // Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
-#define DROPDEL					(1<<6) // When dropped, it calls qdel on itself
-#define NOBLUDGEON				(1<<7)		// when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
-#define ABSTRACT				(1<<8) 	// for all things that are technically items but used for various different stuff
-#define IMMUTABLE_SLOW          (1<<9) //When players should not be able to change the slowdown of the item (Speed potions, ect)
+#define NO_MAT_REDEMPTION		(1<<5)	//Stops you from putting things like an RCD or other items into an ORM or protolathe for materials.
+#define DROPDEL					(1<<6)	//When dropped, it calls qdel on itself
+#define NOBLUDGEON				(1<<7)	//when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
+#define ABSTRACT				(1<<8)	//for all things that are technically items but used for various different stuff
+#define IMMUTABLE_SLOW          (1<<9)	//When players should not be able to change the slowdown of the item (Speed potions, ect)
 #define SURGICAL_TOOL			(1<<10)	//Tool commonly used for surgery: won't attack targets in an active surgical operation on help intent (in case of mistakes)
-#define NO_UNIFORM_REQUIRED		(1<<11) // Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.
+#define NO_UNIFORM_REQUIRED		(1<<11)	//Can be worn on certain slots (currently belt and id) that would otherwise require an uniform.

 // Flags for the clothing_flags var on /obj/item/clothing

-#define LAVAPROTECT (1<<0)
+#define LAVAPROTECT 			(1<<0)
 #define STOPSPRESSUREDAMAGE		(1<<1)	//SUIT and HEAD items which stop pressure damage. To stop you taking all pressure damage you must have both a suit and head item with this flag.
-#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	// blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
-#define ALLOWINTERNALS				    (1<<3)		// mask allows internals
-#define NOSLIP                  (1<<4)   //prevents from slipping on wet floors, in space etc
-#define THICKMATERIAL				(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
-#define VOICEBOX_TOGGLABLE (1<<6) // The voicebox in this clothing can be toggled.
-#define VOICEBOX_DISABLED (1<<7) // The voicebox is currently turned off.
+#define BLOCK_GAS_SMOKE_EFFECT	(1<<2)	//blocks the effect that chemical clouds would have on a mob --glasses, mask and helmets ONLY!
+#define ALLOWINTERNALS			(1<<3)	//mask allows internals
+#define NOSLIP                  (1<<4)	//prevents from slipping on wet floors, in space etc
+#define THICKMATERIAL			(1<<5)	//prevents syringes, parapens and hypos if the external suit or helmet (if targeting head) has this flag. Example: space suits, biosuit, bombsuits, thick suits that cover your body.
+#define VOICEBOX_TOGGLABLE 		(1<<6)	//The voicebox in this clothing can be toggled.
+#define VOICEBOX_DISABLED 		(1<<7)	//The voicebox is currently turned off.
+#define SNUG_FIT               	(1<<8)	//Prevents knock-off from things like hat-throwing.
+#define ANTI_TINFOIL_MANEUVER   (1<<9)	//Hats with negative effects when worn (i.e the tinfoil hat).

 // Flags for the organ_flags var on /obj/item/organ

@@ -47,4 +49,4 @@
 #define ORGAN_FAILING			(1<<2)	//Failing organs perform damaging effects until replaced or fixed
 #define ORGAN_EXTERNAL			(1<<3)	//Was this organ implanted/inserted/etc, if true will not be removed during species change.
 #define ORGAN_VITAL				(1<<4)	//Currently only the brain
-#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
+#define ORGAN_NO_SPOIL			(1<<5)	//Do not spoil under any circumstances
@@ -27,7 +27,7 @@
 #define NOBLIUM_RESEARCH_AMOUNT				1000
 #define BZ_RESEARCH_SCALE					4
 #define BZ_RESEARCH_MAX_AMOUNT				400
-#define MIASMA_RESEARCH_AMOUNT				160
+#define MIASMA_RESEARCH_AMOUNT				6
 #define STIMULUM_RESEARCH_AMOUNT			50
 //Plasma fusion properties
 #define FUSION_ENERGY_THRESHOLD				3e9 	//Amount of energy it takes to start a fusion reaction
@@ -3,12 +3,12 @@
 #define CHANNEL_ADMIN 1023
 #define CHANNEL_VOX 1022
 #define CHANNEL_JUKEBOX 1021
-#define CHANNEL_JUKEBOX_START 1020
-#define CHANNEL_JUSTICAR_ARK 1019
-#define CHANNEL_HEARTBEAT 1018 //sound channel for heartbeats
-#define CHANNEL_AMBIENCE 1017
-#define CHANNEL_BUZZ 1016
-#define CHANNEL_BICYCLE 1015
+#define CHANNEL_JUKEBOX_START 1016 //The gap between this and CHANNEL_JUKEBOX determines the amount of free jukebox channels. This currently allows 6 jukebox channels to exist.
+#define CHANNEL_JUSTICAR_ARK 1015
+#define CHANNEL_HEARTBEAT 1014 //sound channel for heartbeats
+#define CHANNEL_AMBIENCE 1013
+#define CHANNEL_BUZZ 1012
+#define CHANNEL_BICYCLE 1011

 //CIT CHANNELS - TRY NOT TO REGRESS
 #define CHANNEL_PRED 1010
@@ -74,6 +74,9 @@

 #define STATUS_EFFECT_ICHORIAL_STAIN /datum/status_effect/ichorial_stain //Prevents a servant from being revived by vitality matrices for one minute.

+#define STATUS_EFFECT_BREASTS_ENLARGEMENT /datum/status_effect/chem/breast_enlarger //Applied slowdown due to the ominous bulk.
+
+#define STATUS_EFFECT_PENIS_ENLARGEMENT /datum/status_effect/chem/penis_enlarger //More applied slowdown, just like the above.
 /////////////
 // NEUTRAL //
 /////////////
@@ -99,7 +99,6 @@
 #define FIRE_PRIORITY_GARBAGE		15
 #define FIRE_PRIORITY_WET_FLOORS	20
 #define FIRE_PRIORITY_AIR			20
-#define FIRE_PRIORITY_NPC			20
 #define FIRE_PRIORITY_PROCESS		25
 #define FIRE_PRIORITY_THROWING		25
 #define FIRE_PRIORITY_SPACEDRIFT	30
@@ -112,6 +111,7 @@
 #define FIRE_PRIORITY_AIR_TURFS		40
 #define FIRE_PRIORITY_DEFAULT		50
 #define FIRE_PRIORITY_PARALLAX		65
+#define FIRE_PRIORITY_NPC			80
 #define FIRE_PRIORITY_FLIGHTPACKS	80
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_TGUI			110
@@ -70,8 +70,6 @@
 #define TRAIT_MONKEYLIKE		"monkeylike" //sets IsAdvancedToolUser to FALSE
 #define TRAIT_PACIFISM			"pacifism"
 #define TRAIT_IGNORESLOWDOWN	"ignoreslow"
-#define TRAIT_GOTTAGOFAST		"fast"
-#define TRAIT_GOTTAGOREALLYFAST	"2fast"
 #define TRAIT_DEATHCOMA			"deathcoma" //Causes death-like unconsciousness
 #define TRAIT_FAKEDEATH			"fakedeath" //Makes the owner appear as dead to most forms of medical examination
 #define TRAIT_DISFIGURED		"disfigured"
@@ -147,13 +145,14 @@
 #define TRAIT_SKITTISH			"skittish"
 #define TRAIT_POOR_AIM			"poor_aim"
 #define TRAIT_PROSOPAGNOSIA		"prosopagnosia"
-#define	TRAIT_DRUNK_HEALING		"drunk_healing"
-#define	TRAIT_TAGGER			"tagger"
-#define	TRAIT_PHOTOGRAPHER		"photographer"
-#define	TRAIT_MUSICIAN			"musician"
-#define	TRAIT_CROCRIN_IMMUNE    "crocin_immune"
+#define TRAIT_DRUNK_HEALING		"drunk_healing"
+#define TRAIT_TAGGER			"tagger"
+#define TRAIT_PHOTOGRAPHER		"photographer"
+#define TRAIT_MUSICIAN			"musician"
+#define TRAIT_CROCRIN_IMMUNE    "crocin_immune"
 #define TRAIT_NYMPHO			"nymphomania"
 #define TRAIT_MASO              "masochism"
+#define TRAIT_EXHIBITIONIST		"exhibitionist"
 #define	TRAIT_HIGH_BLOOD        "high_blood"
 #define TRAIT_PHARMA            "hepatic_pharmacokinesis"
 #define TRAIT_PARA              "paraplegic"
@@ -56,6 +56,7 @@ GLOBAL_LIST_EMPTY(ipc_screens_list)
 GLOBAL_LIST_EMPTY(ipc_antennas_list)

 	//Genitals and Arousal Lists
+GLOBAL_LIST_EMPTY(genitals_list)
 GLOBAL_LIST_EMPTY(cock_shapes_list)//global_lists.dm for the list initializations //Now also _DATASTRUCTURES globals.dm
 GLOBAL_LIST_EMPTY(cock_shapes_icons) //Associated list for names->icon_states for cockshapes.
 GLOBAL_LIST_EMPTY(gentlemans_organ_names)
@@ -131,53 +132,53 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	SSblackbox.record_feedback("tally", "admin_verb", 1, "TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!

 /mob/living/carbon/proc/has_penis()
-	if(getorganslot("penis"))//slot shared with ovipositor
-		if(istype(getorganslot("penis"), /obj/item/organ/genital/penis))
-			return TRUE
+	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_PENIS)
+	if(G && istype(G, /obj/item/organ/genital/penis))
+		return TRUE
 	return FALSE

 /mob/living/carbon/proc/has_balls()
-	if(getorganslot("balls"))
-		if(istype(getorganslot("balls"), /obj/item/organ/genital/testicles))
-			return TRUE
+	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_TESTICLES)
+	if(G && istype(G, /obj/item/organ/genital/testicles))
+		return TRUE
 	return FALSE

 /mob/living/carbon/proc/has_vagina()
-	if(getorganslot("vagina"))
+	if(getorganslot(ORGAN_SLOT_VAGINA))
 		return TRUE
 	return FALSE

 /mob/living/carbon/proc/has_breasts()
-	if(getorganslot("breasts"))
+	if(getorganslot(ORGAN_SLOT_BREASTS))
 		return TRUE
 	return FALSE

 /mob/living/carbon/proc/has_ovipositor()
-	if(getorganslot("penis"))//shared slot
-		if(istype(getorganslot("penis"), /obj/item/organ/genital/ovipositor))
-			return TRUE
+	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_PENIS)
+	if(G && istype(G, /obj/item/organ/genital/ovipositor))
+		return TRUE
 	return FALSE

 /mob/living/carbon/human/proc/has_eggsack()
-	if(getorganslot("balls"))
-		if(istype(getorganslot("balls"), /obj/item/organ/genital/eggsack))
-			return TRUE
+	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_TESTICLES)
+	if(G && istype(G, /obj/item/organ/genital/eggsack))
+		return TRUE
 	return FALSE

-/mob/living/carbon/human/proc/is_bodypart_exposed(bodypart)
-
-/mob/living/carbon/proc/is_groin_exposed(var/list/L)
+/mob/living/carbon/proc/is_groin_exposed(list/L)
 	if(!L)
 		L = get_equipped_items()
-	for(var/obj/item/I in L)
+	for(var/A in L)
+		var/obj/item/I = A
 		if(I.body_parts_covered & GROIN)
 			return FALSE
 	return TRUE

-/mob/living/carbon/proc/is_chest_exposed(var/list/L)
+/mob/living/carbon/proc/is_chest_exposed(list/L)
 	if(!L)
 		L = get_equipped_items()
-	for(var/obj/item/I in L)
+	for(var/A in L)
+		var/obj/item/I = A
 		if(I.body_parts_covered & CHEST)
 			return FALSE
 	return TRUE
@@ -195,9 +196,9 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	message_admins("[src] gave everyone genitals.")
 	for(var/mob/living/carbon/human/H in GLOB.mob_list)
 		if(H.gender == MALE)
-			H.give_penis()
-			H.give_balls()
+			H.give_genital(/obj/item/organ/genital/penis)
+			H.give_genital(/obj/item/organ/genital/testicles)
 		else
-			H.give_vagina()
-			H.give_womb()
-			H.give_breasts()
+			H.give_genital(/obj/item/organ/genital/vagina)
+			H.give_genital(/obj/item/organ/genital/womb)
+			H.give_genital(/obj/item/organ/genital/breasts)
@@ -379,6 +379,12 @@
 			i++
 	return i

+/proc/count_occurences_of_value(list/L, val, limit) //special thanks to salmonsnake
+	. = 0
+	for (var/i in 1 to limit)
+		if (L[i] == val)
+			.++
+
 /proc/find_record(field, value, list/L)
 	for(var/datum/data/record/R in L)
 		if(R.fields[field] == value)
@@ -514,7 +520,7 @@
 		used_key_list[input_key] = 1
 	return input_key

-#if DM_VERSION > 512
+#if DM_VERSION > 513
 #error Remie said that lummox was adding a way to get a lists
 #error contents via list.values, if that is true remove this
 #error otherwise, update the version and bug lummox
@@ -564,4 +570,4 @@
 		if(key in L1)
 			L1[key] += other_value
 		else
-			L1[key] = other_value
+			L1[key] = other_value
@@ -72,6 +72,10 @@
 		var/datum/sprite_accessory/testicles/value = GLOB.balls_shapes_list[K]
 		GLOB.balls_shapes_icons[K] = value.icon_state

+	for(var/gpath in subtypesof(/obj/item/organ/genital))
+		var/obj/item/organ/genital/G = gpath
+		if(!CHECK_BITFIELD(initial(G.genital_flags), GENITAL_BLACKLISTED))
+			GLOB.genitals_list[initial(G.name)] = gpath
 //END OF CIT CHANGES

 	//Species
@@ -160,7 +160,6 @@
 		"xenodorsal" 		= "Standard",
 		"xenohead" 			= "Standard",
 		"xenotail" 			= "Xenomorph Tail",
-		"exhibitionist" 	= FALSE,
 		"genitals_use_skintone"	= FALSE,
 		"has_cock"			= FALSE,
 		"cock_shape"		= pick(GLOB.cock_shapes_list),
@@ -1,4 +1,4 @@
-/proc/priority_announce(text, title = "", sound = 'sound/ai/attention.ogg', type , sender_override)
+/proc/priority_announce(text, title = "", sound = "attention", type , sender_override)
 	if(!text)
 		return

@@ -29,19 +29,110 @@
 	announcement += "<br><span class='alert'>[html_encode(text)]</span><br>"
 	announcement += "<br>"

-	var/s = sound(sound)
+	var/s = sound(get_announcer_sound(sound))
 	for(var/mob/M in GLOB.player_list)
 		if(!isnewplayer(M) && M.can_hear())
 			to_chat(M, announcement)
 			if(M.client.prefs.toggles & SOUND_ANNOUNCEMENTS)
 				SEND_SOUND(M, s)

+/proc/get_announcer_sound(soundid)
+	if(isfile(soundid))
+		return soundid
+	else if(!istext(soundid))
+		CRASH("Invalid type passed to get_announcer_sound()")
+	switch(GLOB.announcertype) //These are all individually hardcoded to allow the announcer sounds to be included in the rsc, reducing lag from sending resources midgame.
+		if("classic")
+			switch(soundid)
+				if("aimalf")
+					. = 'sound/announcer/classic/aimalf.ogg'
+				if("aliens")
+					. = 'sound/announcer/classic/aliens.ogg'
+				if("animes")
+					. = 'sound/announcer/classic/animes.ogg'
+				if("attention")
+					. = 'sound/announcer/classic/attention.ogg'
+				if("commandreport")
+					. = 'sound/announcer/classic/commandreport.ogg'
+				if("granomalies")
+					. = 'sound/announcer/classic/granomalies.ogg'
+				if("intercept")
+					. = 'sound/announcer/classic/intercept.ogg'
+				if("ionstorm")
+					. = 'sound/announcer/classic/ionstorm.ogg'
+				if("meteors")
+					. = 'sound/announcer/classic/meteors.ogg'
+				if("newAI")
+					. = 'sound/announcer/classic/newAI.ogg'
+				if("outbreak5")
+					. = 'sound/announcer/classic/outbreak5.ogg'
+				if("outbreak7")
+					. = 'sound/announcer/classic/outbreak7.ogg'
+				if("poweroff")
+					. = 'sound/announcer/classic/poweroff.ogg'
+				if("poweron")
+					. = 'sound/announcer/classic/poweron.ogg'
+				if("radiation")
+					. = 'sound/announcer/classic/radiation.ogg'
+				if("shuttlecalled")
+					. = 'sound/announcer/classic/shuttlecalled.ogg'
+				if("shuttledock")
+					. = 'sound/announcer/classic/shuttledock.ogg'
+				if("shuttlerecalled")
+					. = 'sound/announcer/classic/shuttlerecalled.ogg'
+				if("spanomalies")
+					. = 'sound/announcer/classic/spanomalies.ogg'
+				if("welcome")
+					. = 'sound/announcer/classic/welcome.ogg'
+		if("medibot")
+			switch(soundid)
+				if("aimalf")
+					. = 'sound/announcer/classic/aimalf.ogg'
+				if("aliens")
+					. = 'sound/announcer/medibot/aliens.ogg'
+				if("animes")
+					. = 'sound/announcer/medibot/animes.ogg'
+				if("attention")
+					. = 'sound/announcer/medibot/attention.ogg'
+				if("commandreport")
+					. = 'sound/announcer/medibot/commandreport.ogg'
+				if("granomalies")
+					. = 'sound/announcer/medibot/granomalies.ogg'
+				if("intercept")
+					. = 'sound/announcer/medibot/intercept.ogg'
+				if("ionstorm")
+					. = 'sound/announcer/medibot/ionstorm.ogg'
+				if("meteors")
+					. = 'sound/announcer/medibot/meteors.ogg'
+				if("newAI")
+					. = 'sound/announcer/medibot/newAI.ogg'
+				if("outbreak5")
+					. = 'sound/announcer/medibot/outbreak5.ogg'
+				if("outbreak7")
+					. = 'sound/announcer/medibot/outbreak7.ogg'
+				if("poweroff")
+					. = 'sound/announcer/medibot/poweroff.ogg'
+				if("poweron")
+					. = 'sound/announcer/medibot/poweron.ogg'
+				if("radiation")
+					. = 'sound/announcer/medibot/radiation.ogg'
+				if("shuttlecalled")
+					. = 'sound/announcer/medibot/shuttlecalled.ogg'
+				if("shuttledock")
+					. = 'sound/announcer/medibot/shuttledocked.ogg'
+				if("shuttlerecalled")
+					. = 'sound/announcer/medibot/shuttlerecalled.ogg'
+				if("spanomalies")
+					. = 'sound/announcer/medibot/spanomalies.ogg'
+				if("welcome")
+					. = 'sound/announcer/medibot/welcome.ogg'
+
 /proc/print_command_report(text = "", title = null, announce=TRUE)
 	if(!title)
 		title = "Classified [command_name()] Update"

 	if(announce)
-		priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", 'sound/ai/commandreport.ogg')
+		priority_announce("A report has been downloaded and printed out at all communications consoles.", "Incoming Classified Message", "commandreport")

 	var/datum/comm_message/M  = new
 	M.title = title
@@ -451,10 +451,6 @@ Turf and target are separate in case you want to teleport some distance from a t
 	var/y = min(world.maxy, max(1, A.y + dy))
 	return locate(x,y,A.z)

-/proc/arctan(x)
-	var/y=arcsin(x/sqrt(1+x*x))
-	return y
-
 /*
 	Gets all contents of contents and returns them all in a list.
 */
@@ -142,6 +142,8 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"THICKMATERIAL" = THICKMATERIAL,
 		"VOICEBOX_TOGGLABLE" = VOICEBOX_TOGGLABLE,
 		"VOICEBOX_DISABLED" = VOICEBOX_DISABLED,
+		"SNUG_FIT" = SNUG_FIT,
+		"ANTI_TINFOIL_MANEUVER" = ANTI_TINFOIL_MANEUVER,
 		),
 	"tesla_flags" = list(
 		"TESLA_MOB_DAMAGE" = TESLA_MOB_DAMAGE,
@@ -200,4 +202,14 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"ORGAN_VITAL" = ORGAN_VITAL,
 		"ORGAN_NO_SPOIL" = ORGAN_NO_SPOIL
 		),
-		))
+	"genital_flags" = list(
+		"GENITAL_BLACKLISTED" = GENITAL_BLACKLISTED,
+		"GENITAL_INTERNAL" = GENITAL_INTERNAL,
+		"GENITAL_HIDDEN" = GENITAL_HIDDEN,
+		"GENITAL_THROUGH_CLOTHES" = GENITAL_THROUGH_CLOTHES,
+		"GENITAL_FUID_PRODUCTION" = GENITAL_FUID_PRODUCTION,
+		"CAN_MASTURBATE_WITH" = CAN_MASTURBATE_WITH,
+		"MASTURBATE_LINKED_ORGAN" = MASTURBATE_LINKED_ORGAN,
+		"CAN_CLIMAX_WITH" = CAN_CLIMAX_WITH
+		)
+		))
@@ -2,6 +2,12 @@ GLOBAL_VAR_INIT(admin_notice, "") // Admin notice that all clients see when join

 GLOBAL_VAR_INIT(timezoneOffset, 0) // The difference betwen midnight (of the host computer) and 0 world.ticks.

+GLOBAL_VAR_INIT(year, time2text(world.realtime,"YYYY"))
+GLOBAL_VAR_INIT(year_integer, text2num(year)) // = 2013???
+
+
+GLOBAL_VAR_INIT(announcertype, "standard")
+
 	// For FTP requests. (i.e. downloading runtime logs.)
 	// However it'd be ok to use for accessing attack logs and such too, which are even laggier.
 GLOBAL_VAR_INIT(fileaccess_timer, 0)
@@ -24,4 +30,4 @@ GLOBAL_VAR(bible_name)
 GLOBAL_VAR(bible_icon_state)
 GLOBAL_VAR(bible_item_state)
 GLOBAL_VAR(holy_weapon_type)
-GLOBAL_VAR(holy_armor_type)
+GLOBAL_VAR(holy_armor_type)
@@ -49,9 +49,9 @@
 #define ui_storage1 "CENTER+1:18,SOUTH:5"
 #define ui_storage2 "CENTER+2:20,SOUTH:5"

-#define ui_borg_sensor "CENTER-3:16, SOUTH:5"		//borgs
-#define ui_borg_lamp "CENTER-4:16, SOUTH:5"			//borgs
-#define ui_borg_thrusters "CENTER-5:16, SOUTH:5"	//borgs
+#define ui_borg_sensor "CENTER-3:15, SOUTH:5"		//borgs
+#define ui_borg_lamp "CENTER-4:15, SOUTH:5"			//borgs
+#define ui_borg_thrusters "CENTER-5:15, SOUTH:5"	//borgs
 #define ui_inv1 "CENTER-2:16,SOUTH:5"				//borgs
 #define ui_inv2 "CENTER-1  :16,SOUTH:5"				//borgs
 #define ui_inv3 "CENTER  :16,SOUTH:5"				//borgs
@@ -59,7 +59,7 @@
 #define ui_borg_store "CENTER+2:16,SOUTH:5"			//borgs
 #define ui_borg_camera "CENTER+3:21,SOUTH:5"		//borgs
 #define ui_borg_album "CENTER+4:21,SOUTH:5"			//borgs
-#define ui_borg_language_menu "CENTER+4:21,SOUTH+1:5"	//borgs
+#define ui_borg_language_menu "EAST-1:27,SOUTH+2:8"	//borgs

 #define ui_monkey_head "CENTER-5:13,SOUTH:5"	//monkey
 #define ui_monkey_mask "CENTER-4:14,SOUTH:5"	//monkey
@@ -88,6 +88,26 @@
 	var/mob/living/silicon/robot/R = usr
 	R.toggle_ionpulse()

+/obj/screen/robot/sensors
+	name = "Sensor Augmentation"
+	icon_state = "cyborg_sensor"
+
+/obj/screen/robot/sensors/Click()
+	if(..())
+		return
+	var/mob/living/silicon/S = usr
+	S.toggle_sensors()
+
+/obj/screen/robot/language_menu
+	name = "silicon language selection"
+	icon_state = "talk_wheel"
+
+/obj/screen/robot/language_menu/Click()
+	if(..())
+		return
+	var/mob/living/silicon/S = usr
+	S.open_language_menu(usr)
+
 /datum/hud/robot
 	ui_style = 'icons/mob/screen_cyborg.dmi'

@@ -96,7 +116,7 @@
 	var/mob/living/silicon/robot/mymobR = mymob
 	var/obj/screen/using

-	using = new/obj/screen/language_menu
+	using = new/obj/screen/robot/language_menu
 	using.screen_loc = ui_borg_language_menu
 	static_inventory += using

@@ -133,7 +153,7 @@
 	static_inventory += using

 //Sec/Med HUDs
-	using = new /obj/screen/ai/sensors()
+	using = new /obj/screen/robot/sensors()
 	using.screen_loc = ui_borg_sensor
 	static_inventory += using

@@ -82,7 +82,7 @@
 	log_combat(user, M, "attacked", src.name, "(INTENT: [uppertext(user.a_intent)]) (DAMTYPE: [uppertext(damtype)])")
 	add_fingerprint(user)

-	user.adjustStaminaLossBuffered(getweight())//CIT CHANGE - makes attacking things cause stamina loss
+	user.adjustStaminaLossBuffered(getweight()*0.8)//CIT CHANGE - makes attacking things cause stamina loss

 //the equivalent of the standard version of attack() but for object targets.
 /obj/item/proc/attack_obj(obj/O, mob/living/user)
@@ -66,6 +66,10 @@

 /datum/config_entry/flag/disable_human_mood

+/datum/config_entry/flag/disable_borg_flash_knockdown //Should borg flashes be capable of knocking humanoid entities down?
+
+/datum/config_entry/flag/weaken_secborg //Brings secborgs and k9s back in-line with the other borg modules
+
 /datum/config_entry/flag/disable_secborg	// disallow secborg module to be chosen.

 /datum/config_entry/flag/disable_peaceborg
@@ -376,6 +380,22 @@
 	config_entry_value = 6
 	min_val = 1

+/datum/config_entry/number/dynamic_midround_delay_min
+	config_entry_value = 15
+	min_val = 1
+
+/datum/config_entry/number/dynamic_midround_delay_max
+	config_entry_value = 35
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_min
+	config_entry_value = 5
+	min_val = 1
+
+/datum/config_entry/number/dynamic_latejoin_delay_max
+	config_entry_value = 25
+	min_val = 1
+
 /datum/config_entry/keyed_list/dynamic_cost
 	key_mode = KEY_MODE_TEXT
 	value_mode = VALUE_MODE_NUM
@@ -4,7 +4,7 @@ SUBSYSTEM_DEF(job)
 	flags = SS_NO_FIRE

 	var/list/occupations = list()		//List of all jobs
-	var/list/name_occupations = list()	//Dict of all jobs, keys are titles
+	var/list/datum/job/name_occupations = list()	//Dict of all jobs, keys are titles
 	var/list/type_occupations = list()	//Dict of all jobs, keys are types
 	var/list/unassigned = list()		//Players who need jobs
 	var/initial_players_to_assign = 0 	//used for checking against population caps
@@ -14,6 +14,8 @@ SUBSYSTEM_DEF(job)

 	var/overflow_role = "Assistant"

+	var/list/level_order = list(JP_HIGH,JP_MEDIUM,JP_LOW)
+
 /datum/controller/subsystem/job/Initialize(timeofday)
 	SSmapping.HACK_LoadMapConfig()
 	if(!occupations.len)
@@ -119,7 +121,7 @@ SUBSYSTEM_DEF(job)
 		if(player.mind && job.title in player.mind.restricted_roles)
 			JobDebug("FOC incompatible with antagonist role, Player: [player]")
 			continue
-		if(player.client.prefs.job_preferences["[job.title]"] == level)
+		if(player.client.prefs.job_preferences[job.title] == level)
 			JobDebug("FOC pass, Player: [player], Level:[level]")
 			candidates += player
 	return candidates
@@ -181,7 +183,7 @@ SUBSYSTEM_DEF(job)
 //it locates a head or runs out of levels to check
 //This is basically to ensure that there's atleast a few heads in the round
 /datum/controller/subsystem/job/proc/FillHeadPosition()
-	for(var/level = 1 to 3)
+	for(var/level in level_order)
 		for(var/command_position in GLOB.command_positions)
 			var/datum/job/job = GetJob(command_position)
 			if(!job)
@@ -218,7 +220,7 @@ SUBSYSTEM_DEF(job)
 	if(!job)
 		return 0
 	for(var/i = job.total_positions, i > 0, i--)
-		for(var/level = 1 to 3)
+		for(var/level in level_order)
 			var/list/candidates = list()
 			candidates = FindOccupationCandidates(job, level)
 			if(candidates.len)
@@ -304,8 +306,7 @@ SUBSYSTEM_DEF(job)

 	// Loop through all levels from high to low
 	var/list/shuffledoccupations = shuffle(occupations)
-	var/list/levels = list(JP_HIGH,JP_MEDIUM,JP_LOW)
-	for(var/level in levels)
+	for(var/level in level_order)
 		//Check the head jobs first each level
 		CheckHeadPositions(level)

@@ -334,7 +335,7 @@ SUBSYSTEM_DEF(job)
 				if(job.required_playtime_remaining(player.client))
 					JobDebug("DO player not enough xp, Player: [player], Job:[job.title]")
 					continue
-			
+
 				if(!player.client.prefs.pref_species.qualifies_for_rank(job.title, player.client.prefs.features))
 					JobDebug("DO non-human failed, Player: [player], Job:[job.title]")
 					continue
@@ -344,7 +345,7 @@ SUBSYSTEM_DEF(job)
 					continue

 				// If the player wants that job on this level, then try give it to him.
-				if(player.client.prefs.job_preferences["[job.title]"] == level)
+				if(player.client.prefs.job_preferences[job.title] == level)
 					// If the job isn't filled
 					if((job.current_positions < job.spawn_positions) || job.spawn_positions == -1)
 						JobDebug("DO pass, Player: [player], Level:[level], Job:[job.title]")
@@ -475,7 +476,6 @@ SUBSYSTEM_DEF(job)
 			to_chat(M, "<b>[job.custom_spawn_text]</b>")
 		if(CONFIG_GET(number/minimal_access_threshold))
 			to_chat(M, "<span class='notice'><B>As this station was initially staffed with a [CONFIG_GET(flag/jobs_have_minimal_access) ? "full crew, only your job's necessities" : "skeleton crew, additional access may"] have been added to your ID card.</B></span>")
-
 	if(job && H)
 		if(job.dresscodecompliant)// CIT CHANGE - dress code compliance
 			equip_loadout(N, H) // CIT CHANGE - allows players to spawn with loadout items
@@ -551,7 +551,7 @@ SUBSYSTEM_DEF(job)
 			if(job.required_playtime_remaining(player.client))
 				young++
 				continue
-			switch(player.client.prefs.job_preferences["[job.title]"])
+			switch(player.client.prefs.job_preferences[job.title])
 				if(JP_HIGH)
 					high++
 				if(JP_MEDIUM)
@@ -698,4 +698,4 @@ SUBSYSTEM_DEF(job)
 			. |= player.mind

 /datum/controller/subsystem/job/proc/JobDebug(message)
-	log_job_debug(message)
+	log_job_debug(message)
@@ -3,6 +3,7 @@ SUBSYSTEM_DEF(jukeboxes)
 	wait = 5
 	var/list/songs = list()
 	var/list/activejukeboxes = list()
+	var/list/freejukeboxchannels = list()

 /datum/track
 	var/song_name = "generic"
@@ -21,23 +22,39 @@ SUBSYSTEM_DEF(jukeboxes)
 /datum/controller/subsystem/jukeboxes/proc/addjukebox(obj/jukebox, datum/track/T, jukefalloff = 1)
 	if(!istype(T))
 		CRASH("[src] tried to play a song with a nonexistant track")
-	var/channeltoreserve = CHANNEL_JUKEBOX_START + activejukeboxes.len - 1
-	if(channeltoreserve > CHANNEL_JUKEBOX)
+	var/channeltoreserve = pick(freejukeboxchannels)
+	if(!channeltoreserve)
 		return FALSE
+	freejukeboxchannels -= channeltoreserve
+	var/list/youvegotafreejukebox = list(T, channeltoreserve, jukebox, jukefalloff)
 	activejukeboxes.len++
-	activejukeboxes[activejukeboxes.len] = list(T, channeltoreserve, jukebox, jukefalloff)
+	activejukeboxes[activejukeboxes.len] = youvegotafreejukebox
+
+	//Due to changes in later versions of 512, SOUND_UPDATE no longer properly plays audio when a file is defined in the sound datum. As such, we are now required to init the audio before we can actually do anything with it.
+	//Downsides to this? This means that you can *only* hear the jukebox audio if you were present on the server when it started playing, and it means that it's now impossible to add loops to the jukebox track list.
+	var/sound/song_to_init = sound(T.song_path)
+	song_to_init.status = SOUND_MUTE
+	for(var/mob/M in GLOB.player_list)
+		if(!M.client)
+			continue
+		if(!(M.client.prefs.toggles & SOUND_INSTRUMENTS))
+			continue
+
+		M.playsound_local(M, null, 100, channel = youvegotafreejukebox[2], S = song_to_init)
 	return activejukeboxes.len

 /datum/controller/subsystem/jukeboxes/proc/removejukebox(IDtoremove)
 	if(islist(activejukeboxes[IDtoremove]))
+		var/jukechannel = activejukeboxes[IDtoremove][2]
 		for(var/mob/M in GLOB.player_list)
 			if(!M.client)
 				continue
-			M.stop_sound_channel(activejukeboxes[IDtoremove][2])
+			M.stop_sound_channel(jukechannel)
+		freejukeboxchannels |= jukechannel
 		activejukeboxes.Cut(IDtoremove, IDtoremove+1)
 		return TRUE
 	else
-		to_chat(world, "<span class='warning'>If you see this, screenshot it and send it to a dev. Tried to remove jukebox with invalid ID</span>")
+		CRASH("Tried to remove jukebox with invalid ID")

 /datum/controller/subsystem/jukeboxes/proc/findjukeboxindex(obj/jukebox)
 	if(activejukeboxes.len)
@@ -57,6 +74,8 @@ SUBSYSTEM_DEF(jukeboxes)
 		T.song_beat = text2num(L[3])
 		T.song_associated_id = L[4]
 		songs |= T
+	for(var/i in CHANNEL_JUKEBOX_START to CHANNEL_JUKEBOX)
+		freejukeboxchannels |= i
 	return ..()

 /datum/controller/subsystem/jukeboxes/fire()
@@ -64,14 +83,15 @@ SUBSYSTEM_DEF(jukeboxes)
 		return
 	for(var/list/jukeinfo in activejukeboxes)
 		if(!jukeinfo.len)
-			to_chat(world, "<span class='warning'>If you see this, screenshot it and send it to a dev. Active jukebox without any associated metadata</span>")
+			EXCEPTION("Active jukebox without any associated metadata.")
+			continue
 		var/datum/track/juketrack = jukeinfo[1]
 		if(!istype(juketrack))
-			to_chat(world, "<span class='warning'>If you see this, screenshot it and send it to a dev. After jukebox track grabbing</span>")
+			EXCEPTION("Invalid jukebox track datum.")
 			continue
 		var/obj/jukebox = jukeinfo[3]
 		if(!istype(jukebox))
-			to_chat(world, "<span class='warning'>If you see this, screenshot it and send it to a dev. Nonexistant or invalid jukebox in active jukebox list")
+			EXCEPTION("Nonexistant or invalid object associated with jukebox.")
 			continue
 		var/sound/song_played = sound(juketrack.song_path)
 		var/area/currentarea = get_area(jukebox)
@@ -54,6 +54,8 @@ SUBSYSTEM_DEF(mapping)
 		if(!config || config.defaulted)
 			to_chat(world, "<span class='boldannounce'>Unable to load next or default map config, defaulting to Box Station</span>")
 			config = old_config
+	GLOB.year_integer += config.year_offset
+	GLOB.announcertype = (config.announcertype == "standard" ? (prob(1) ? "medibot" : "classic") : config.announcertype)
 	loadWorld()
 	repopulate_sorted_areas()
 	process_teleport_locs()			//Sets up the wizard teleport locations
@@ -1,6 +1,6 @@
 SUBSYSTEM_DEF(npcpool)
 	name = "NPC Pool"
-	flags = SS_POST_FIRE_TIMING|SS_NO_INIT|SS_BACKGROUND
+	flags = SS_KEEP_TIMING | SS_NO_INIT
 	priority = FIRE_PRIORITY_NPC
 	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

@@ -1,4 +1,5 @@
 #define FILE_ANTAG_REP "data/AntagReputation.json"
+#define MAX_RECENT_MAP_RECORD 10

 SUBSYSTEM_DEF(persistence)
 	name = "Persistence"
@@ -11,6 +12,7 @@ SUBSYSTEM_DEF(persistence)
 	var/list/obj/structure/chisel_message/chisel_messages = list()
 	var/list/saved_messages = list()
 	var/list/saved_modes = list(1,2,3)
+	var/list/saved_maps
 	var/list/saved_trophies = list()
 	var/list/spawned_objects = list()
 	var/list/antag_rep = list()
@@ -25,6 +27,7 @@ SUBSYSTEM_DEF(persistence)
 	LoadChiselMessages()
 	LoadTrophies()
 	LoadRecentModes()
+	LoadRecentMaps()
 	LoadPhotoPersistence()
 	if(CONFIG_GET(flag/use_antag_rep))
 		LoadAntagReputation()
@@ -163,6 +166,15 @@ SUBSYSTEM_DEF(persistence)
 		return
 	saved_modes = json["data"]

+/datum/controller/subsystem/persistence/proc/LoadRecentMaps()
+	var/json_file = file("data/RecentMaps.json")
+	if(!fexists(json_file))
+		return
+	var/list/json = json_decode(file2text(json_file))
+	if(!json)
+		return
+	saved_maps = json["maps"]
+
 /datum/controller/subsystem/persistence/proc/LoadAntagReputation()
 	var/json = file2text(FILE_ANTAG_REP)
 	if(!json)
@@ -204,6 +216,7 @@ SUBSYSTEM_DEF(persistence)
 	CollectSecretSatchels()
 	CollectTrophies()
 	CollectRoundtype()
+	RecordMaps()
 	SavePhotoPersistence()						//THIS IS PERSISTENCE, NOT THE LOGGING PORTION.
 	if(CONFIG_GET(flag/use_antag_rep))
 		CollectAntagReputation()
@@ -359,6 +372,15 @@ SUBSYSTEM_DEF(persistence)
 	fdel(json_file)
 	WRITE_FILE(json_file, json_encode(file_data))

+/datum/controller/subsystem/persistence/proc/RecordMaps()
+	saved_maps = saved_maps?.len ? list("[SSmapping.config.map_name]") | saved_maps : list("[SSmapping.config.map_name]")
+	var/json_file = file("data/RecentMaps.json")
+	var/list/file_data = list()
+	file_data["maps"] = saved_maps
+	fdel(json_file)
+	WRITE_FILE(json_file, json_encode(file_data))
+
+
 /datum/controller/subsystem/persistence/proc/CollectAntagReputation()
 	var/ANTAG_REP_MAXIMUM = CONFIG_GET(number/antag_rep_maximum)

@@ -373,7 +373,7 @@ SUBSYSTEM_DEF(shuttle)
 		emergency.setTimer(emergencyDockTime)
 		priority_announce("Hostile environment resolved. \
 			You have 3 minutes to board the Emergency Shuttle.",
-			null, 'sound/ai/shuttledock.ogg', "Priority")
+			null, "shuttledock", "Priority")

 //try to move/request to dockHome if possible, otherwise dockAway. Mainly used for admin buttons
 /datum/controller/subsystem/shuttle/proc/toggleShuttle(shuttleId, dockHome, dockAway, timed)
@@ -43,6 +43,7 @@ SUBSYSTEM_DEF(throwing)
 	var/atom/movable/thrownthing
 	var/atom/target
 	var/turf/target_turf
+	var/target_zone
 	var/init_dir
 	var/maxrange
 	var/speed
@@ -303,7 +303,7 @@ SUBSYSTEM_DEF(ticker)
 	SSdbcore.SetRoundStart()

 	to_chat(world, "<span class='notice'><B>Welcome to [station_name()], enjoy your stay!</B></span>")
-	SEND_SOUND(world, sound('sound/ai/welcome.ogg'))
+	SEND_SOUND(world, sound(get_announcer_sound("welcome")))

 	current_state = GAME_STATE_PLAYING
 	Master.SetRunLevel(RUNLEVEL_GAME)
@@ -208,9 +208,19 @@ SUBSYSTEM_DEF(vote)
 			if("gamemode")
 				choices.Add(config.votable_modes)
 			if("map")
-				choices.Add(config.maplist)
-				for(var/i in choices)//this is necessary because otherwise we'll end up with a bunch of /datum/map_config's as the default vote value instead of 0 as intended
-					choices[i] = 0
+				var/players = GLOB.clients.len
+				var/list/lastmaps = SSpersistence.saved_maps?.len ? list("[SSmapping.config.map_name]") | SSpersistence.saved_maps : list("[SSmapping.config.map_name]")
+				for(var/M in config.maplist) //This is a typeless loop due to the finnicky nature of keyed lists in this kind of context
+					var/datum/map_config/targetmap = config.maplist[M]
+					if(!istype(targetmap))
+						continue
+					if(!targetmap.voteweight)
+						continue
+					if((targetmap.config_min_users && players < targetmap.config_min_users) || (targetmap.config_max_users && players > targetmap.config_max_users))
+						continue
+					if(targetmap.max_round_search_span && count_occurences_of_value(lastmaps, M, targetmap.max_round_search_span) >= targetmap.max_rounds_played)
+						continue
+					choices |= M
 			if("roundtype") //CIT CHANGE - adds the roundstart secret/extended vote
 				choices.Add("secret", "extended")
 			if("custom")
@@ -1,26 +1,48 @@
 /datum/component/anti_magic
 	var/magic = FALSE
 	var/holy = FALSE
+	var/psychic = FALSE
+	var/allowed_slots = ~ITEM_SLOT_BACKPACK
+	var/charges = INFINITY
+	var/blocks_self = TRUE
+	var/datum/callback/reaction
+	var/datum/callback/expire

-/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE)
+/datum/component/anti_magic/Initialize(_magic = FALSE, _holy = FALSE, _psychic = FALSE, _allowed_slots, _charges, _blocks_self = TRUE, datum/callback/_reaction, datum/callback/_expire)
 	if(isitem(parent))
 		RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/on_equip)
 		RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/on_drop)
 	else if(ismob(parent))
-		RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, .proc/can_protect)
+		RegisterSignal(parent, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect)
 	else
 		return COMPONENT_INCOMPATIBLE

 	magic = _magic
 	holy = _holy
+	psychic = _psychic
+	if(_allowed_slots)
+		allowed_slots = _allowed_slots
+	if(!isnull(_charges))
+		charges = _charges
+	blocks_self = _blocks_self
+	reaction = _reaction
+	expire = _expire

 /datum/component/anti_magic/proc/on_equip(datum/source, mob/equipper, slot)
-	RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, .proc/can_protect, TRUE)
+	if(!CHECK_BITFIELD(allowed_slots, slotdefine2slotbit(slot))) //Check that the slot is valid for antimagic
+		UnregisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC)
+		return
+	RegisterSignal(equipper, COMSIG_MOB_RECEIVE_MAGIC, .proc/protect, TRUE)

 /datum/component/anti_magic/proc/on_drop(datum/source, mob/user)
 	UnregisterSignal(user, COMSIG_MOB_RECEIVE_MAGIC)

-/datum/component/anti_magic/proc/can_protect(datum/source, _magic, _holy, list/protection_sources)
-	if((_magic && magic) || (_holy && holy))
+/datum/component/anti_magic/proc/protect(datum/source, mob/user, _magic, _holy, _psychic, chargecost = 1, self, list/protection_sources)
+	if(((_magic && magic) || (_holy && holy) || (_psychic && psychic)) && (!self || blocks_self))
 		protection_sources += parent
+		reaction?.Invoke(user, chargecost)
+		charges -= chargecost
+		if(charges <= 0)
+			expire?.Invoke(user)
+			qdel(src)
 		return COMPONENT_BLOCK_MAGIC
@@ -0,0 +1,45 @@
+/datum/component/bane
+	dupe_mode = COMPONENT_DUPE_ALLOWED
+
+	var/mobtype
+	var/speciestype
+	var/damage_multiplier
+
+/datum/component/bane/Initialize(mobtype, damage_multiplier=1)
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	if(ispath(mobtype, /mob/living))
+		src.mobtype = mobtype
+	else if(ispath(mobtype, /datum/species))
+		speciestype = mobtype
+	else
+		return COMPONENT_INCOMPATIBLE
+
+	src.damage_multiplier = damage_multiplier
+
+/datum/component/bane/RegisterWithParent()
+	if(speciestype)
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/speciesCheck)
+	else
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/mobCheck)
+
+/datum/component/bane/UnregisterFromParent()
+	UnregisterSignal(parent, COMSIG_ITEM_AFTERATTACK)
+
+/datum/component/bane/proc/speciesCheck(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!is_species(target, speciestype))
+		return
+	activate(source, target, user)
+
+/datum/component/bane/proc/mobCheck(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!istype(target, mobtype))
+		return
+	activate(source, target, user)
+
+/datum/component/bane/proc/activate(obj/item/source, mob/living/target, mob/attacker)
+	if(attacker.a_intent != INTENT_HARM)
+		return
+
+	var/extra_damage = max(0, source.force * damage_multiplier)
+	target.apply_damage(extra_damage, source.damtype, attacker.zone_selected)
@@ -65,7 +65,7 @@
 		return FALSE
 	if(!isliving(AM) && !isobj(AM))
 		return FALSE
-	if(is_type_in_typecache(AM, forbidden_types) || AM.throwing || AM.floating)
+	if(is_type_in_typecache(AM, forbidden_types) || AM.throwing || (AM.movement_type & FLOATING))
 		return FALSE
 	//Flies right over the chasm
 	if(ismob(AM))
@@ -0,0 +1,140 @@
+/datum/component/fantasy
+	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
+
+	var/quality
+
+	var/canFail
+	var/announce
+
+	var/originalName
+	var/list/affixes
+	var/list/appliedComponents
+
+	var/static/list/affixListing
+
+/datum/component/fantasy/Initialize(quality, list/affixes = list(), canFail=FALSE, announce=FALSE)
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.quality = quality || randomQuality()
+	src.canFail = canFail
+	src.announce = announce
+
+	src.affixes = affixes
+	appliedComponents = list()
+	randomAffixes()
+
+/datum/component/fantasy/Destroy()
+	unmodify()
+	affixes = null
+	return ..()
+
+/datum/component/fantasy/RegisterWithParent()
+	var/obj/item/master = parent
+	originalName = master.name
+	modify()
+
+/datum/component/fantasy/UnregisterFromParent()
+	unmodify()
+
+/datum/component/fantasy/InheritComponent(datum/component/fantasy/newComp, original, list/arguments)
+	unmodify()
+	if(newComp)
+		quality += newComp.quality
+		canFail = newComp.canFail
+		announce = newComp.announce
+	else
+		arguments.len = 5 // This is done to replicate what happens when an arglist smaller than the necessary arguments is given
+		quality += arguments[1]
+		canFail = arguments[4] || canFail
+		announce = arguments[5] || announce
+	modify()
+
+/datum/component/fantasy/proc/randomQuality()
+	var/quality = pick(1;15, 2;14, 2;13, 2;12, 3;11, 3;10, 3;9, 4;8, 4;7, 4;6, 5;5, 5;4, 5;3, 6;2, 6;1, 6;0)
+	if(prob(50))
+		quality = -quality
+	return quality
+
+/datum/component/fantasy/proc/randomAffixes(force)
+	if(!affixListing)
+		affixListing = list()
+		for(var/T in subtypesof(/datum/fantasy_affix))
+			var/datum/fantasy_affix/affix = new T
+			affixListing[affix] = affix.weight
+
+	if(length(affixes))
+		if(!force)
+			return
+		affixes = list()
+
+	var/alignment
+	if(quality >= 0)
+		alignment |= AFFIX_GOOD
+	if(quality <= 0)
+		alignment |= AFFIX_EVIL
+
+	var/usedSlots = NONE
+	for(var/i in 1 to max(1, abs(quality))) // We want at least 1 affix applied
+		var/datum/fantasy_affix/affix = pickweight(affixListing)
+		if(affix.placement & usedSlots)
+			continue
+		if(!(affix.alignment & alignment))
+			continue
+		if(!affix.validate(src))
+			continue
+		affixes += affix
+		usedSlots |= affix.placement
+
+/datum/component/fantasy/proc/modify()
+	var/obj/item/master = parent
+
+	master.force = max(0, master.force + quality)
+	master.throwforce = max(0, master.throwforce + quality)
+	master.armor = master.armor?.modifyAllRatings(quality)
+
+	var/newName = originalName
+	for(var/i in affixes)
+		var/datum/fantasy_affix/affix = i
+		newName = affix.apply(src, newName)
+
+	if(quality != 0)
+		newName = "[newName] [quality > 0 ? "+" : ""][quality]"
+
+	if(canFail && prob((quality - 9)*10))
+		var/turf/place = get_turf(parent)
+		place.visible_message("<span class='danger'>[parent] <span class='blue'>violently glows blue</span> for a while, then evaporates.</span>")
+		master.burn()
+		return
+	else if(announce)
+		announce()
+
+	master.name = newName
+
+/datum/component/fantasy/proc/unmodify()
+	var/obj/item/master = parent
+
+	for(var/i in affixes)
+		var/datum/fantasy_affix/affix = i
+		affix.remove(src)
+	for(var/i in appliedComponents)
+		qdel(i)
+
+	master.force = max(0, master.force - quality)
+	master.throwforce = max(0, master.throwforce - quality)
+	master.armor = master.armor?.modifyAllRatings(-quality)
+
+	master.name = originalName
+
+/datum/component/fantasy/proc/announce()
+	var/turf/location = get_turf(parent)
+	var/span
+	var/effect_description
+	if(quality >= 0)
+		span = "<span class='notice'>"
+		effect_description = "<span class='heavy_brass'>shimmering golden glow</span>"
+	else
+		span = "<span class='danger'>"
+		effect_description = "<span class='bold'>mottled black glow</span>"
+
+	location.visible_message("[span][originalName] is covered by a [effect_description] and then transforms into [parent]!</span>")
@@ -0,0 +1,13 @@
+/datum/fantasy_affix
+	var/placement // A bitflag of "slots" this affix takes up, for example pre/suffix
+	var/alignment
+	var/weight = 10
+
+// For those occasional affixes which only make sense in certain circumstances
+/datum/fantasy_affix/proc/validate(datum/component/fantasy/comp)
+	return TRUE
+
+/datum/fantasy_affix/proc/apply(datum/component/fantasy/comp, newName)
+	return newName
+
+/datum/fantasy_affix/proc/remove(datum/component/fantasy/comp)
@@ -0,0 +1,68 @@
+/datum/fantasy_affix/cosmetic_prefixes
+	placement = AFFIX_PREFIX
+	alignment = AFFIX_GOOD | AFFIX_EVIL
+
+	var/list/goodPrefixes
+	var/list/badPrefixes
+
+/datum/fantasy_affix/cosmetic_prefixes/New()
+	goodPrefixes = list(
+		"greater",
+		"major",
+		"blessed",
+		"superior",
+		"empowered",
+		"honed",
+		"true",
+		"glorious",
+		"robust",
+		)
+	badPrefixes = list(
+		"lesser",
+		"minor",
+		"blighted",
+		"inferior",
+		"enfeebled",
+		"rusted",
+		"unsteady",
+		"tragic",
+		"gimped",
+		"cursed",
+		)
+
+	weight = (length(goodPrefixes) + length(badPrefixes)) * 10
+
+/datum/fantasy_affix/cosmetic_prefixes/apply(datum/component/fantasy/comp, newName)
+	if(comp.quality > 0 || (comp.quality == 0 && prob(50)))
+		return "[pick(goodPrefixes)] [newName]"
+	else
+		return "[pick(badPrefixes)] [newName]"
+
+/datum/fantasy_affix/tactical
+	placement = AFFIX_PREFIX
+	alignment = AFFIX_GOOD
+	weight = 1 // Very powerful, no one should have such power
+
+/datum/fantasy_affix/tactical/apply(datum/component/fantasy/comp, newName)
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/tactical)
+	return "tactical [newName]"
+
+/datum/fantasy_affix/pyromantic
+	placement = AFFIX_PREFIX
+	alignment = AFFIX_GOOD
+
+/datum/fantasy_affix/pyromantic/apply(datum/component/fantasy/comp, newName)
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/igniter, CLAMP(comp.quality, 1, 10))
+	return "pyromantic [newName]"
+
+/datum/fantasy_affix/vampiric
+	placement = AFFIX_PREFIX
+	alignment = AFFIX_GOOD
+	weight = 5
+
+/datum/fantasy_affix/vampiric/apply(datum/component/fantasy/comp, newName)
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/lifesteal, comp.quality)
+	return "vampiric [newName]"
@@ -0,0 +1,170 @@
+/datum/fantasy_affix/cosmetic_suffixes
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_GOOD | AFFIX_EVIL
+
+	var/list/goodSuffixes
+	var/list/badSuffixes
+
+/datum/fantasy_affix/cosmetic_suffixes/New()
+	goodSuffixes = list(
+		"dexterity",
+		"constitution",
+		"intelligence",
+		"wisdom",
+		"charisma",
+		"the forest",
+		"the hills",
+		"the plains",
+		"the sea",
+		"the sun",
+		"the moon",
+		"the void",
+		"the world",
+		"many secrets",
+		"many tales",
+		"many colors",
+		"rending",
+		"sundering",
+		"the night",
+		"the day",
+		)
+	badSuffixes = list(
+		"draining",
+		"burden",
+		"discomfort",
+		"awkwardness",
+		"poor hygiene",
+		"timidity",
+		)
+
+	weight = (length(goodSuffixes) + length(badSuffixes)) * 10
+
+/datum/fantasy_affix/cosmetic_suffixes/apply(datum/component/fantasy/comp, newName)
+	if(comp.quality > 0 || (comp.quality == 0 && prob(50)))
+		return "[newName] of [pick(goodSuffixes)]"
+	else
+		return "[newName] of [pick(badSuffixes)]"
+
+//////////// Good suffixes
+/datum/fantasy_affix/bane
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_GOOD
+	weight = 20
+
+/datum/fantasy_affix/bane/apply(datum/component/fantasy/comp, newName)
+	. = ..()
+	// This is set up to be easy to add to these lists as I expect it will need modifications
+	var/static/list/possible_mobtypes
+	if(!possible_mobtypes)
+		// The base list of allowed mob/species types
+		possible_mobtypes = typecacheof(list(
+			/mob/living/simple_animal,
+			/mob/living/carbon,
+			/datum/species,
+			))
+		// Some particular types to disallow if they're too broad/abstract
+		possible_mobtypes -= list(
+			/mob/living/simple_animal/hostile,
+			)
+		// Some types to remove them and their subtypes
+		possible_mobtypes -= typecacheof(list(
+			/mob/living/carbon/human/species,
+			))
+
+	var/mob/picked_mobtype = pick(possible_mobtypes)
+	// This works even with the species picks since we're only accessing the name
+
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/bane, picked_mobtype)
+	return "[newName] of [initial(picked_mobtype.name)] slaying"
+
+/datum/fantasy_affix/summoning
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_GOOD
+	weight = 5
+
+/datum/fantasy_affix/summoning/apply(datum/component/fantasy/comp, newName)
+	. = ..()
+	// This is set up to be easy to add to these lists as I expect it will need modifications
+	var/static/list/possible_mobtypes
+	if(!possible_mobtypes)
+		// The base list of allowed mob/species types
+		possible_mobtypes = typecacheof(list(
+			/mob/living/simple_animal,
+			/mob/living/carbon,
+			/datum/species,
+			))
+		// Some particular types to disallow if they're too broad/abstract
+		possible_mobtypes -= list(
+			/mob/living/simple_animal/hostile,
+			)
+		// Some types to remove them and their subtypes
+		possible_mobtypes -= typecacheof(list(
+			/mob/living/carbon/human/species,
+			/mob/living/simple_animal/hostile/megafauna,
+			))
+
+	var/mob/picked_mobtype = pick(possible_mobtypes)
+	// This works even with the species picks since we're only accessing the name
+
+	var/obj/item/master = comp.parent
+	var/max_mobs = max(CEILING(comp.quality/2, 1), 1)
+	var/spawn_delay = 300 - 30 * comp.quality
+	comp.appliedComponents += master.AddComponent(/datum/component/summoning, list(picked_mobtype), 100, max_mobs, spawn_delay)
+	return "[newName] of [initial(picked_mobtype.name)] summoning"
+
+/datum/fantasy_affix/shrapnel
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_GOOD
+
+/datum/fantasy_affix/shrapnel/validate(datum/component/fantasy/comp)
+	if(isgun(comp.parent))
+		return TRUE
+	return FALSE
+
+/datum/fantasy_affix/shrapnel/apply(datum/component/fantasy/comp, newName)
+	. = ..()
+	// higher means more likely
+	var/list/weighted_projectile_types = list(/obj/item/projectile/meteor = 1,
+											  /obj/item/projectile/energy/nuclear_particle = 1,
+											  /obj/item/projectile/beam/pulse = 1,
+											  /obj/item/projectile/bullet/honker = 15,
+											  /obj/item/projectile/temp = 15,
+											  /obj/item/projectile/ion = 15,
+											  /obj/item/projectile/magic/door = 15,
+											  /obj/item/projectile/magic/locker = 15,
+//											  /obj/item/projectile/magic/fetch = 15,
+											  /obj/item/projectile/beam/emitter = 15,
+//											  /obj/item/projectile/magic/flying = 15,
+											  /obj/item/projectile/energy/net = 15,
+											  /obj/item/projectile/bullet/incendiary/c9mm = 15,
+											  /obj/item/projectile/temp/hot = 15,
+											  /obj/item/projectile/beam/disabler = 15)
+
+	var/obj/item/projectile/picked_projectiletype = pickweight(weighted_projectile_types)
+
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/shrapnel, picked_projectiletype)
+	return "[newName] of [initial(picked_projectiletype.name)] shrapnel"
+
+/datum/fantasy_affix/strength
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_GOOD
+
+/datum/fantasy_affix/strength/apply(datum/component/fantasy/comp, newName)
+	. = ..()
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/knockback, CEILING(comp.quality/2, 1), FLOOR(comp.quality/10, 1))
+	return "[newName] of strength"
+
+//////////// Bad suffixes
+
+/datum/fantasy_affix/fool
+	placement = AFFIX_SUFFIX
+	alignment = AFFIX_EVIL
+
+/datum/fantasy_affix/fool/apply(datum/component/fantasy/comp, newName)
+	. = ..()
+	var/obj/item/master = comp.parent
+	comp.appliedComponents += master.AddComponent(/datum/component/squeak, list('sound/items/bikehorn.ogg'=1), 50)
+	return "[newName] of the fool"
@@ -0,0 +1,37 @@
+
+/datum/component/igniter
+	var/fire_stacks
+
+/datum/component/igniter/Initialize(fire_stacks=1)
+	if(!isitem(parent) && !ishostile(parent) && !isgun(parent) && !ismachinery(parent) && !isstructure(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.fire_stacks = fire_stacks
+
+/datum/component/igniter/RegisterWithParent()
+	if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
+		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+	else if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+	else if(ishostile(parent))
+		RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+
+/datum/component/igniter/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
+
+/datum/component/igniter/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!proximity_flag)
+		return
+	do_igniter(target)
+
+/datum/component/igniter/proc/hostile_attackingtarget(mob/living/simple_animal/hostile/attacker, atom/target)
+	do_igniter(target)
+
+/datum/component/igniter/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
+	do_igniter(target)
+
+/datum/component/igniter/proc/do_igniter(atom/target)
+	if(isliving(target))
+		var/mob/living/L = target
+		L.adjust_fire_stacks(fire_stacks)
+		L.IgniteMob()
@@ -0,0 +1,44 @@
+/datum/component/knockback
+	var/throw_distance
+	var/throw_anchored
+
+/datum/component/knockback/Initialize(throw_distance=1)
+	if(!isitem(parent) && !ishostile(parent) && !isgun(parent) && !ismachinery(parent) && !isstructure(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.throw_distance = throw_distance
+	src.throw_anchored = throw_anchored
+
+/datum/component/knockback/RegisterWithParent()
+	if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
+		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+	else if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+	else if(ishostile(parent))
+		RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+
+/datum/component/knockback/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
+
+/datum/component/knockback/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!proximity_flag)
+		return
+	do_knockback(target, user, get_dir(source, target))
+
+/datum/component/knockback/proc/hostile_attackingtarget(mob/living/simple_animal/hostile/attacker, atom/target)
+	do_knockback(target, attacker, get_dir(attacker, target))
+
+/datum/component/knockback/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
+	do_knockback(target, null, angle2dir(Angle))
+
+/datum/component/knockback/proc/do_knockback(atom/target, mob/thrower, throw_dir)
+	if(!ismovableatom(target) || throw_dir == null)
+		return
+	var/atom/movable/throwee = target
+	if(throwee.anchored && !throw_anchored)
+		return
+	if(throw_distance < 0)
+		throw_dir = turn(throw_dir, 180)
+		throw_distance *= -1
+	var/atom/throw_target = get_edge_target_turf(throwee, throw_dir)
+	throwee.safe_throw_at(throw_target, throw_distance, 1, thrower)
@@ -0,0 +1,39 @@
+
+/datum/component/lifesteal
+	var/flat_heal // heals a constant amount every time a hit occurs
+	var/static/list/damage_heal_order = list(BRUTE, BURN, OXY)
+
+/datum/component/lifesteal/Initialize(flat_heal=0)
+	if(!isitem(parent) && !ishostile(parent) && !isgun(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.flat_heal = flat_heal
+
+/datum/component/lifesteal/RegisterWithParent()
+	if(isgun(parent))
+		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+	else if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+	else if(ishostile(parent))
+		RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+
+/datum/component/lifesteal/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
+
+/datum/component/lifesteal/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!proximity_flag)
+		return
+	do_lifesteal(user, target)
+
+/datum/component/lifesteal/proc/hostile_attackingtarget(mob/living/simple_animal/hostile/attacker, atom/target)
+	do_lifesteal(attacker, target)
+
+/datum/component/lifesteal/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
+	do_lifesteal(firer, target)
+
+/datum/component/lifesteal/proc/do_lifesteal(atom/heal_target, atom/damage_target)
+	if(isliving(heal_target) && isliving(damage_target))
+		var/mob/living/healing = heal_target
+		var/mob/living/damaging = damage_target
+		if(damaging.stat != DEAD)
+			healing.heal_ordered_damage(flat_heal, damage_heal_order)
@@ -10,7 +10,6 @@
 	var/mood_modifier = 1 //Modifier to allow certain mobs to be less affected by moodlets
 	var/datum/mood_event/list/mood_events = list()
 	var/insanity_effect = 0 //is the owner being punished for low mood? If so, how much?
-	var/holdmyinsanityeffect = 0 //before we edit our sanity lets take a look
 	var/obj/screen/mood/screen_obj

 /datum/component/mood/Initialize()
@@ -21,8 +20,7 @@

 	RegisterSignal(parent, COMSIG_ADD_MOOD_EVENT, .proc/add_event)
 	RegisterSignal(parent, COMSIG_CLEAR_MOOD_EVENT, .proc/clear_event)
-	RegisterSignal(parent, COMSIG_INCREASE_SANITY, .proc/IncreaseSanity)
-	RegisterSignal(parent, COMSIG_DECREASE_SANITY, .proc/DecreaseSanity)
+	RegisterSignal(parent, COMSIG_MODIFY_SANITY, .proc/modify_sanity)

 	RegisterSignal(parent, COMSIG_MOB_HUD_CREATED, .proc/modify_hud)
 	var/mob/living/owner = parent
@@ -131,31 +129,23 @@

 	switch(mood_level)
 		if(1)
-			DecreaseSanity(src, 0.2)
+			setSanity(sanity-0.2)
 		if(2)
-			DecreaseSanity(src, 0.125, SANITY_CRAZY)
+			setSanity(sanity-0.125, minimum=SANITY_CRAZY)
 		if(3)
-			DecreaseSanity(src, 0.075, SANITY_UNSTABLE)
+			setSanity(sanity-0.075, minimum=SANITY_UNSTABLE)
 		if(4)
-			DecreaseSanity(src, 0.025, SANITY_DISTURBED)
+			setSanity(sanity-0.025, minimum=SANITY_DISTURBED)
 		if(5)
-			IncreaseSanity(src, 0.1)
+			setSanity(sanity+0.1)
 		if(6)
-			IncreaseSanity(src, 0.15)
+			setSanity(sanity+0.15)
 		if(7)
-			IncreaseSanity(src, 0.20)
+			setSanity(sanity+0.20)
 		if(8)
-			IncreaseSanity(src, 0.25, SANITY_GREAT)
+			setSanity(sanity+0.25, maximum=SANITY_GREAT)
 		if(9)
-			IncreaseSanity(src, 0.4, SANITY_GREAT)
-
-/*
-	if(insanity_effect != holdmyinsanityeffect)
-		if(insanity_effect > holdmyinsanityeffect)
-			owner.crit_threshold += (insanity_effect - holdmyinsanityeffect)
-		else
-			owner.crit_threshold -= (holdmyinsanityeffect - insanity_effect)
-*/
+			setSanity(sanity+0.4, maximum=SANITY_GREAT)

 	if(HAS_TRAIT(owner, TRAIT_DEPRESSION))
 		if(prob(0.05))
@@ -166,8 +156,6 @@
 			add_event(null, "jolly", /datum/mood_event/jolly)
 			clear_event(null, "depression")

-	holdmyinsanityeffect = insanity_effect
-
 	HandleNutrition(owner)

 /datum/component/mood/proc/setSanity(amount, minimum=SANITY_INSANE, maximum=SANITY_NEUTRAL)//I'm sure bunging this in here will have no negative repercussions.
@@ -189,7 +177,7 @@
 		sanity = amount

 	switch(sanity)
-		if(SANITY_INSANE to SANITY_CRAZY)
+		if(-INFINITY to SANITY_CRAZY)
 			setInsanityEffect(MAJOR_INSANITY_PEN)
 			master.add_movespeed_modifier(MOVESPEED_ID_SANITY, TRUE, 100, override=TRUE, multiplicative_slowdown=1.5) //Did we change something ? movetypes is runtiming, movetypes=(~FLYING))
 			sanity_level = 6
@@ -222,31 +210,8 @@
 	//master.crit_threshold = (master.crit_threshold - insanity_effect) + newval
 	insanity_effect = newval

-/datum/component/mood/proc/DecreaseSanity(datum/source, amount, minimum = SANITY_INSANE)
-	if(sanity < minimum) //This might make KevinZ stop fucking pinging me.
-		IncreaseSanity(src, 0.5)
-	else
-		sanity = max(minimum, sanity - amount)
-		if(sanity < SANITY_UNSTABLE)
-			if(sanity < SANITY_CRAZY)
-				insanity_effect = (MAJOR_INSANITY_PEN)
-			else
-				insanity_effect = (MINOR_INSANITY_PEN)
-
-/datum/component/mood/proc/IncreaseSanity(datum/source, amount, maximum = SANITY_NEUTRAL)
-	// Disturbed stops you from getting any more sane - I'm just gonna bung this in here
-	var/mob/living/owner = parent
-	if(HAS_TRAIT(owner, TRAIT_UNSTABLE))
-		return
-	if(sanity > maximum)
-		DecreaseSanity(src, 0.5) //Removes some sanity to go back to our current limit.
-	else
-		sanity = min(maximum, sanity + amount)
-		if(sanity > SANITY_CRAZY)
-			if(sanity > SANITY_UNSTABLE)
-				insanity_effect = 0
-			else
-				insanity_effect = MINOR_INSANITY_PEN
+/datum/component/mood/proc/modify_sanity(datum/source, amount, minimum = -INFINITY, maximum = INFINITY)
+	setSanity(sanity + amount, minimum, maximum)

 /datum/component/mood/proc/add_event(datum/source, category, type, param) //Category will override any events in the same category, should be unique unless the event is based on the same thing like hunger.
 	var/datum/mood_event/the_event
@@ -7,33 +7,24 @@
 	var/filter_x
 	var/filter_y
 	var/filter_size
-	var/filter_border
 	var/filter_color

-/datum/component/wearertargeting/phantomthief/Initialize(_x = -2, _y = 0, _size = 0, _border = 0, _color = "#E62111", list/_valid_slots = list(SLOT_GLASSES))
+/datum/component/wearertargeting/phantomthief/Initialize(_x = -2, _y = 0, _size = 0, _color = "#E62111", list/_valid_slots = list(SLOT_GLASSES))
 	. = ..()
 	if(. == COMPONENT_INCOMPATIBLE)
 		return
 	filter_x = _x
 	filter_y = _y
 	filter_size = _size
-	filter_border = _border
 	filter_color = _color
 	valid_slots = _valid_slots

 /datum/component/wearertargeting/phantomthief/proc/handlefilterstuff(datum/source, mob/user, combatmodestate)
-	if(istype(user))
-		var/thefilter = filter(type = "drop_shadow", x = filter_x, y = filter_y, size = filter_size, border = filter_border, color = filter_color)
-		if(!combatmodestate)
-			user.filters -= thefilter
-		else
-			user.filters += thefilter
-
-/datum/component/wearertargeting/phantomthief/proc/stripdesiredfilter(mob/user)
-	if(istype(user))
-		var/thefilter = filter(type = "drop_shadow", x = filter_x, y = filter_y, size = filter_size, border = filter_border, color = filter_color)
-		user.filters -= thefilter
+	if(!combatmodestate)
+		user.remove_filter("phantomthief")
+	else
+		user.add_filter("phantomthief", 4, list(type = "drop_shadow", x = filter_x, y = filter_y, size = filter_size, color = filter_color))

 /datum/component/wearertargeting/phantomthief/on_drop(datum/source, mob/user)
 	. = ..()
-	stripdesiredfilter(user)
+	user.remove_filter("phantomthief")
@@ -18,6 +18,7 @@
 	var/ride_check_rider_incapacitated = FALSE
 	var/ride_check_rider_restrained = FALSE
 	var/ride_check_ridden_incapacitated = FALSE
+	var/list/offhands = list() // keyed list containing all the current riding offsets associated by mob

 /datum/component/riding/Initialize()
 	if(!ismovableatom(parent))
@@ -299,36 +300,34 @@
 	M.throw_at(target, 14, 5, AM)
 	M.Knockdown(60)

-/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, riding_target_override = null)
-	var/atom/movable/AM = parent
-	var/amount_equipped = 0
+/datum/component/riding/proc/equip_buckle_inhands(mob/living/carbon/human/user, amount_required = 1, mob/living/riding_target_override)
+	var/list/equipped
+	var/mob/living/L = riding_target_override ? riding_target_override : user
 	for(var/amount_needed = amount_required, amount_needed > 0, amount_needed--)
-		var/obj/item/riding_offhand/inhand = new /obj/item/riding_offhand(user)
-		if(!riding_target_override)
-			inhand.rider = user
-		else
-			inhand.rider = riding_target_override
-		inhand.parent = AM
-		if(user.put_in_hands(inhand, TRUE))
-			amount_equipped++
-		else
+		var/obj/item/riding_offhand/inhand = new
+		inhand.rider = L
+		inhand.parent = parent
+		if(!user.put_in_hands(inhand, TRUE))
+			qdel(inhand) // it isn't going to be added to offhands anyway
 			break
+		LAZYADD(equipped, src)
+	var/amount_equipped = LAZYLEN(equipped)
+	if(amount_equipped)
+		LAZYADD(offhands[L], amount_equipped)
 	if(amount_equipped >= amount_required)
 		return TRUE
-	else
-		unequip_buckle_inhands(user)
-		return FALSE
+	unequip_buckle_inhands(L)
+	return FALSE

 /datum/component/riding/proc/unequip_buckle_inhands(mob/living/carbon/user)
-	var/atom/movable/AM = parent
-	for(var/obj/item/riding_offhand/O in user.contents)
-		if(O.parent != AM)
-			CRASH("RIDING OFFHAND ON WRONG MOB")
-			continue
-		if(O.selfdeleting)
-			continue
-		else
-			qdel(O)
+	for(var/a in offhands[user])
+		LAZYREMOVE(offhands[user], a)
+		if(a) //edge cases null entries
+			var/obj/item/riding_offhand/O = a
+			if(O.parent != parent)
+				CRASH("RIDING OFFHAND ON WRONG MOB")
+			else if(!O.selfdeleting)
+				qdel(O)
 	return TRUE

 /obj/item/riding_offhand
@@ -145,7 +145,7 @@
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)
-		rotcomp.HandRot(usr,ROTATION_CLOCKWISE)
+		rotcomp.HandRot(null,usr,ROTATION_CLOCKWISE)

 /atom/movable/proc/simple_rotate_counterclockwise()
 	set name = "Rotate Counter-Clockwise"
@@ -153,7 +153,7 @@
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)
-		rotcomp.HandRot(usr,ROTATION_COUNTERCLOCKWISE)
+		rotcomp.HandRot(null,usr,ROTATION_COUNTERCLOCKWISE)

 /atom/movable/proc/simple_rotate_flip()
 	set name = "Flip"
@@ -161,4 +161,4 @@
 	set src in oview(1)
 	var/datum/component/simple_rotation/rotcomp = GetComponent(/datum/component/simple_rotation)
 	if(rotcomp)
-		rotcomp.HandRot(usr,ROTATION_FLIP)
+		rotcomp.HandRot(null,usr,ROTATION_FLIP)
@@ -0,0 +1,39 @@
+
+/datum/component/shrapnel
+	var/projectile_type
+	var/radius // shoots a projectile for every turf on this radius from the hit target
+	var/override_projectile_range
+
+/datum/component/shrapnel/Initialize(projectile_type, radius=1, override_projectile_range)
+	if(!isgun(parent) && !ismachinery(parent) && !isstructure(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.projectile_type = projectile_type
+	src.radius = radius
+	src.override_projectile_range = override_projectile_range
+
+/datum/component/shrapnel/RegisterWithParent()
+	if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
+		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+
+/datum/component/shrapnel/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_PROJECTILE_ON_HIT))
+
+/datum/component/shrapnel/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
+	do_shrapnel(firer, target)
+
+/datum/component/shrapnel/proc/do_shrapnel(mob/firer, atom/target)
+	if(radius < 1)
+		return
+	var/turf/target_turf = get_turf(target)
+	for(var/turf/shootat_turf in RANGE_TURFS(radius, target) - RANGE_TURFS(radius-1, target))
+		var/obj/item/projectile/P = new projectile_type(target_turf)
+
+		//Shooting Code:
+		P.range = radius+1
+		if(override_projectile_range)
+			P.range = override_projectile_range
+		P.preparePixelProjectile(shootat_turf, target)
+		P.firer = firer // don't hit ourself that would be really annoying
+		P.permutated += target // don't hit the target we hit already with the flak
+		P.fire()
@@ -57,6 +57,10 @@
 	var/screen_start_x = 4								//These two are where the storage starts being rendered, screen_loc wise.
 	var/screen_start_y = 2
 	//End
+	
+	var/limited_random_access = FALSE					//Quick if statement in accessible_items to determine if we care at all about what people can access at once.
+	var/limited_random_access_stack_position = 0					//If >0, can only access top <x> items
+	var/limited_random_access_stack_bottom_up = FALSE				//If TRUE, above becomes bottom <x> items

 /datum/component/storage/Initialize(datum/component/storage/concrete/master)
 	if(!isatom(parent))
@@ -146,6 +150,19 @@
 	var/datum/component/storage/concrete/master = master()
 	return master? master.real_location() : null

+//What players can access
+//this proc can probably eat a refactor at some point.
+/datum/component/storage/proc/accessible_items(random_access = TRUE)
+	var/list/contents = contents()
+	if(contents)
+		if(limited_random_access && random_access)
+			if(limited_random_access_stack_position && (length(contents) > limited_random_access_stack_position))
+				if(limited_random_access_stack_bottom_up)
+					contents.Cut(1, limited_random_access_stack_position + 1)
+				else
+					contents.Cut(1, length(contents) - limited_random_access_stack_position + 1)
+	return contents
+
 /datum/component/storage/proc/canreach_react(datum/source, list/next)
 	var/datum/component/storage/concrete/master = master()
 	if(!master)
@@ -284,8 +301,7 @@

 /datum/component/storage/proc/_process_numerical_display()
 	. = list()
-	var/atom/real_location = real_location()
-	for(var/obj/item/I in real_location.contents)
+	for(var/obj/item/I in accessible_items())
 		if(QDELETED(I))
 			continue
 		if(!.[I.type])
@@ -296,8 +312,8 @@

 //This proc determines the size of the inventory to be displayed. Please touch it only if you know what you're doing.
 /datum/component/storage/proc/orient2hud(mob/user, maxcolumns)
-	var/atom/real_location = real_location()
-	var/adjusted_contents = real_location.contents.len
+	var/list/accessible_contents = accessible_items()
+	var/adjusted_contents = length(accessible_contents)

 	//Numbered contents display
 	var/list/datum/numbered_display/numbered_contents
@@ -329,8 +345,7 @@
 				if(cy - screen_start_y >= rows)
 					break
 	else
-		var/atom/real_location = real_location()
-		for(var/obj/O in real_location)
+		for(var/obj/O in accessible_items())
 			if(QDELETED(O))
 				continue
 			O.mouse_opacity = MOUSE_OPACITY_OPAQUE //This is here so storage items that spawn with contents correctly have the "click around item to equip"
@@ -351,9 +366,8 @@
 		return FALSE
 	var/list/cview = getviewsize(M.client.view)
 	var/maxallowedscreensize = cview[1]-8
-	var/atom/real_location = real_location()
 	if(M.active_storage != src && (M.stat == CONSCIOUS))
-		for(var/obj/item/I in real_location)
+		for(var/obj/item/I in accessible_items())
 			if(I.on_found(M))
 				return FALSE
 	if(M.active_storage)
@@ -361,7 +375,7 @@
 	orient2hud(M, (isliving(M) ? maxallowedscreensize : 7))
 	M.client.screen |= boxes
 	M.client.screen |= closer
-	M.client.screen |= real_location.contents
+	M.client.screen |= accessible_items()
 	M.active_storage = src
 	LAZYOR(is_using, M)
 	return TRUE
@@ -0,0 +1,69 @@
+
+/datum/component/summoning
+	var/list/mob_types = list()
+	var/spawn_chance // chance for the mob to spawn on hit in percent
+	var/max_mobs
+	var/spawn_delay // delay in spawning between mobs (deciseconds)
+	var/spawn_text
+	var/spawn_sound
+	var/list/faction
+
+	var/last_spawned_time = 0
+	var/list/spawned_mobs = list()
+
+/datum/component/summoning/Initialize(mob_types, spawn_chance=100, max_mobs=3, spawn_delay=100, spawn_text="appears out of nowhere", spawn_sound='sound/magic/summon_magic.ogg', faction)
+	if(!isitem(parent) && !ishostile(parent) && !isgun(parent) && !ismachinery(parent) && !isstructure(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.mob_types = mob_types
+	src.spawn_chance = spawn_chance
+	src.max_mobs = max_mobs
+	src.spawn_delay = spawn_delay
+	src.spawn_text = spawn_text
+	src.spawn_sound = spawn_sound
+	src.faction = faction
+
+/datum/component/summoning/RegisterWithParent()
+	if(ismachinery(parent) || isstructure(parent) || isgun(parent)) // turrets, etc
+		RegisterSignal(parent, COMSIG_PROJECTILE_ON_HIT, .proc/projectile_hit)
+	else if(isitem(parent))
+		RegisterSignal(parent, COMSIG_ITEM_AFTERATTACK, .proc/item_afterattack)
+	else if(ishostile(parent))
+		RegisterSignal(parent, COMSIG_HOSTILE_ATTACKINGTARGET, .proc/hostile_attackingtarget)
+
+/datum/component/summoning/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ITEM_AFTERATTACK, COMSIG_HOSTILE_ATTACKINGTARGET, COMSIG_PROJECTILE_ON_HIT))
+
+/datum/component/summoning/proc/item_afterattack(obj/item/source, atom/target, mob/user, proximity_flag, click_parameters)
+	if(!proximity_flag)
+		return
+	do_spawn_mob(get_turf(target), user)
+
+/datum/component/summoning/proc/hostile_attackingtarget(mob/living/simple_animal/hostile/attacker, atom/target)
+	do_spawn_mob(get_turf(target), attacker)
+
+/datum/component/summoning/proc/projectile_hit(atom/fired_from, atom/movable/firer, atom/target, Angle)
+	do_spawn_mob(get_turf(target), firer)
+
+/datum/component/summoning/proc/do_spawn_mob(atom/spawn_location, summoner)
+	if(spawned_mobs.len >= max_mobs)
+		return 0
+	if(last_spawned_time > world.time)
+		return 0
+	if(!prob(spawn_chance))
+		return 0
+	last_spawned_time = world.time + spawn_delay
+	var/chosen_mob_type = pick(mob_types)
+	var/mob/living/simple_animal/L = new chosen_mob_type(spawn_location)
+	if(ishostile(L))
+		var/mob/living/simple_animal/hostile/H = L
+		H.friends += summoner // do not attack our summon boy
+	spawned_mobs += L
+	if(faction != null)
+		L.faction = faction
+	RegisterSignal(L, COMSIG_MOB_DEATH, .proc/on_spawned_death) // so we can remove them from the list, etc (for mobs with corpses)
+	playsound(spawn_location,spawn_sound, 50, 1)
+	spawn_location.visible_message("<span class='danger'>[L] [spawn_text].</span>")
+
+/datum/component/summoning/proc/on_spawned_death(mob/killed, gibbed)
+	spawned_mobs -= killed
@@ -0,0 +1,42 @@
+
+/datum/component/tactical
+	var/allowed_slot
+
+/datum/component/tactical/Initialize(allowed_slot)
+	if(!isitem(parent))
+		return COMPONENT_INCOMPATIBLE
+
+	src.allowed_slot = allowed_slot
+
+/datum/component/tactical/RegisterWithParent()
+	RegisterSignal(parent, COMSIG_ITEM_EQUIPPED, .proc/modify)
+	RegisterSignal(parent, COMSIG_ITEM_DROPPED, .proc/unmodify)
+
+/datum/component/tactical/UnregisterFromParent()
+	UnregisterSignal(parent, list(COMSIG_ITEM_EQUIPPED, COMSIG_ITEM_DROPPED))
+	unmodify()
+
+/datum/component/fantasy/Destroy()
+	unmodify()
+	return ..()
+
+/datum/component/tactical/proc/modify(obj/item/source, mob/user, slot)
+	if(allowed_slot && slot != allowed_slot)
+		unmodify()
+		return
+
+	var/obj/item/master = parent
+	var/image/I = image(icon = master.icon, icon_state = master.icon_state, loc = user)
+	I.copy_overlays(master)
+	I.override = TRUE
+	source.add_alt_appearance(/datum/atom_hud/alternate_appearance/basic/everyone, "sneaking_mission", I)
+	I.layer = ABOVE_MOB_LAYER
+
+/datum/component/tactical/proc/unmodify(obj/item/source, mob/user)
+	var/obj/item/master = source || parent
+	if(!user)
+		if(!ismob(master.loc))
+			return
+		user = master.loc
+
+	user.remove_alt_appearance("sneaking_mission")
@@ -79,7 +79,7 @@
 	if(M.getToxLoss() && prob(5))
 		to_chat(M, "<span class='notice'>Your skin tingles as the starlight seems to heal you.</span>")

-	M.adjustToxLoss(-(4 * heal_amt)) //most effective on toxins
+	M.adjustToxLoss(-(4 * heal_amt), forced = TRUE) //most effective on toxins

 	var/list/parts = M.get_damaged_bodyparts(1,1)

@@ -368,7 +368,7 @@
 	level = 8
 	passive_message = "<span class='notice'>You feel an odd attraction to plasma.</span>"
 	var/temp_rate = 1
-	threshold_desc = "<b>Transmission 6:</b> Increases temperature adjustment rate.<br>\
+	threshold_desc = "<b>Transmission 6:</b> Increases temperature adjustment rate and heals toxin lovers.<br>\
 					  <b>Stage Speed 7:</b> Increases healing speed."

 /datum/symptom/heal/plasma/Start(datum/disease/advance/A)
@@ -410,7 +410,7 @@
 		if(prob(5))
 			to_chat(M, "<span class='notice'>You feel warmer.</span>")

-	M.adjustToxLoss(-heal_amt)
+	M.adjustToxLoss(-heal_amt, forced = (temp_rate == 4))

 	var/list/parts = M.get_damaged_bodyparts(1,1)
 	if(!parts.len)
@@ -435,7 +435,7 @@
 	symptom_delay_max = 1
 	passive_message = "<span class='notice'>Your skin glows faintly for a moment.</span>"
 	var/cellular_damage = FALSE
-	threshold_desc = "<b>Transmission 6:</b> Additionally heals cellular damage.<br>\
+	threshold_desc = "<b>Transmission 6:</b> Additionally heals cellular damage and toxin lovers.<br>\
 					  <b>Resistance 7:</b> Increases healing speed."

 /datum/symptom/heal/radiation/Start(datum/disease/advance/A)
@@ -468,7 +468,7 @@
 	if(cellular_damage)
 		M.adjustCloneLoss(-heal_amt * 0.5)

-	M.adjustToxLoss(-(2 * heal_amt))
+	M.adjustToxLoss(-(2 * heal_amt), forced = cellular_damage)

 	var/list/parts = M.get_damaged_bodyparts(1,1)

@@ -11,6 +11,8 @@
 	var/config_max_users = 0
 	var/config_min_users = 0
 	var/voteweight = 1
+	var/max_round_search_span = 0 //If this is nonzero, then if the map has been played more than max_rounds_played within the search span (max determined by define in persistence.dm), this map won't be available.
+	var/max_rounds_played = 0

 	// Config actually from the JSON - should default to Box
 	var/map_name = "Box Station"
@@ -23,6 +25,10 @@

 	var/minetype = "lavaland"

+	var/maptype = MAP_TYPE_STATION //This should be used to adjust ingame behavior depending on the specific type of map being played. For instance, if an overmap were added, it'd be appropriate for it to only generate with a MAP_TYPE_SHIP
+
+	var/announcertype = "standard" //Determines the announcer the map uses. standard uses the default announcer, classic, but has a random chance to use other similarly-themed announcers, like medibot
+
 	var/allow_custom_shuttles = TRUE
 	var/shuttles = list(
 		"cargo" = "cargo_box",
@@ -30,6 +36,8 @@
 		"whiteship" = "whiteship_box",
 		"emergency" = "emergency_box")

+	var/year_offset = 540 //The offset of ingame year from the actual IRL year. You know you want to make a map that takes place in the 90's. Don't lie.
+
 /proc/load_map_config(filename = "data/next_map.json", default_to_box, delete_after, error_if_missing = TRUE)
 	var/datum/map_config/config = new
 	if (default_to_box)
@@ -122,8 +130,21 @@
 		log_world("map_config space_empty_levels is not a number!")
 		return

+	temp = json["year_offset"]
+	if (isnum(temp))
+		year_offset = temp
+	else if (!isnull(temp))
+		log_world("map_config year_offset is not a number!")
+		return
+
 	if ("minetype" in json)
 		minetype = json["minetype"]
+	
+	if ("maptype" in json)
+		maptype = json["maptype"]
+
+	if ("announcertype" in json)
+		announcertype = json["announcertype"]

 	allow_custom_shuttles = json["allow_custom_shuttles"] != FALSE

@@ -155,7 +155,7 @@

 /datum/status_effect/belligerent/proc/do_movement_toggle(force_damage)
 	var/number_legs = owner.get_num_legs(FALSE)
-	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check() && number_legs)
+	if(iscarbon(owner) && !is_servant_of_ratvar(owner) && !owner.anti_magic_check(chargecost = 0) && number_legs)
 		if(force_damage || owner.m_intent != MOVE_INTENT_WALK)
 			if(GLOB.ratvar_awakens)
 				owner.Knockdown(20)
@@ -248,7 +248,7 @@
 		if(owner.confused)
 			owner.confused = 0
 		severity = 0
-	else if(!owner.anti_magic_check() && owner.stat != DEAD && severity)
+	else if(!owner.anti_magic_check(chargecost = 0) && owner.stat != DEAD && severity)
 		var/static/hum = get_sfx('sound/effects/screech.ogg') //same sound for every proc call
 		if(owner.getToxLoss() > MANIA_DAMAGE_TO_CONVERT)
 			if(is_eligible_servant(owner))
@@ -94,6 +94,51 @@
 	lose_text = "<span class='notice'>You don't feel as prudish as before.</span>"
 	medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin."

+/datum/quirk/libido
+	name = "Nymphomania"
+	desc = "You're always feeling a bit in heat. Also, you get aroused faster than usual."
+	value = 0
+	mob_trait = TRAIT_NYMPHO
+	gain_text = "<span class='notice'>You are feeling extra wild.</span>"
+	lose_text = "<span class='notice'>You don't feel that burning sensation anymore.</span>"
+
+/datum/quirk/libido/add()
+	var/mob/living/M = quirk_holder
+	M.min_arousal = 16
+	M.arousal_rate = 3
+
+/datum/quirk/libido/remove()
+	var/mob/living/M = quirk_holder
+	M.min_arousal = initial(M.min_arousal)
+	M.arousal_rate = initial(M.arousal_rate)
+
+/datum/quirk/maso
+	name = "Masochism"
+	desc = "You are aroused by pain."
+	value = 0
+	mob_trait = TRAIT_MASO
+	gain_text = "<span class='notice'>You desire to be hurt.</span>"
+	lose_text = "<span class='notice'>Pain has become less exciting for you.</span>"
+
+/datum/quirk/exhibitionism
+	name = "Exhibitionism"
+	desc = "You don't mind showing off your bare body to strangers, in fact you find it quite satistying."
+	value = 0
+	medical_record_text = "Patient has been diagnosed with exhibitionistic disorder."
+	mob_trait = TRAIT_EXHIBITIONIST
+	gain_text = "<span class='notice'>You feel like exposing yourself to the world.</span>"
+	lose_text = "<span class='notice'>Indecent exposure doesn't sound as charming to you anymore.</span>"
+
+/datum/quirk/pharmacokinesis //Prevents unwanted organ additions.
+	name = "Acute hepatic pharmacokinesis"
+	desc = "You've a rare genetic disorder that causes Incubus draft and Sucubus milk to be absorbed by your liver instead."
+	value = 0
+	mob_trait = TRAIT_PHARMA
+	lose_text = "<span class='notice'>Your liver feels different.</span>"
+	var/active = FALSE
+	var/power = 0
+	var/cachedmoveCalc = 1
+
 /datum/quirk/assblastusa
 	name = "Buns of Steel"
 	desc = "You've never skipped ass day. With this trait, you are completely immune to all forms of ass slapping and anyone who tries to slap your rock hard ass usually gets a broken hand."
@@ -829,7 +829,7 @@ Proc for attack log creation, because really why not
 		return filters[filter_data.Find(name)]

 /atom/movable/proc/remove_filter(name)
-	if(filter_data[name])
+	if(filter_data && filter_data[name])
 		filter_data -= name
 		update_filters()
 		return TRUE
@@ -27,7 +27,6 @@
 	glide_size = 8
 	appearance_flags = TILE_BOUND|PIXEL_SCALE
 	var/datum/forced_movement/force_moving = null	//handled soley by forced_movement.dm
-	var/floating = FALSE
 	var/movement_type = GROUND		//Incase you have multiple types, you automatically use the most useful one. IE: Skating on ice, flippers on water, flying over chasm/space, etc.
 	var/atom/movable/pulling
 	var/grab_state = 0
@@ -422,6 +421,9 @@
 		var/atom/movable/AM = item
 		AM.onTransitZ(old_z,new_z)

+/atom/movable/proc/setMovetype(newval)
+	movement_type = newval
+
 //Called whenever an object moves and by mobs when they attempt to move themselves through space
 //And when an object or action applies a force on src, see newtonian_move() below
 //Return 0 to have src start/keep drifting in a no-grav area and 1 to stop/not start drifting
@@ -518,6 +520,8 @@
 	TT.thrower = thrower
 	TT.diagonals_first = diagonals_first
 	TT.callback = callback
+	if(!QDELETED(thrower))
+		TT.target_zone = thrower.zone_selected

 	var/dist_x = abs(target.x - src.x)
 	var/dist_y = abs(target.y - src.y)
@@ -684,14 +688,14 @@
 /atom/movable/proc/float(on)
 	if(throwing)
 		return
-	if(on && !floating)
+	if(on && !(movement_type & FLOATING))
 		animate(src, pixel_y = pixel_y + 2, time = 10, loop = -1)
 		sleep(10)
 		animate(src, pixel_y = pixel_y - 2, time = 10, loop = -1)
-		floating = TRUE
-	else if (!on && floating)
+		setMovetype(movement_type | FLOATING)
+	else if (!on && (movement_type & FLOATING))
 		animate(src, pixel_y = initial(pixel_y), time = 10)
-		floating = FALSE
+		setMovetype(movement_type & ~FLOATING)

 /* Language procs */
 /atom/movable/proc/get_language_holder(shadow=TRUE)
@@ -267,6 +267,7 @@
 	operation_req_access = list(ACCESS_SYNDICATE)
 	wreckage = /obj/structure/mecha_wreckage/honker/dark
 	max_equip = 3
+	spawn_tracked = FALSE

 /obj/mecha/combat/honker/dark/GrantActions(mob/living/user, human_occupant = 0)
 	..()
@@ -111,6 +111,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 	..()
 	pop_per_requirement = CONFIG_GET(number/dynamic_pop_per_requirement)
 	GLOB.dynamic_high_pop_limit = CONFIG_GET(number/dynamic_high_pop_limit)
+	GLOB.dynamic_latejoin_delay_min = CONFIG_GET(number/dynamic_latejoin_delay_min)*600
+	GLOB.dynamic_latejoin_delay_max = CONFIG_GET(number/dynamic_latejoin_delay_max)*600
+	GLOB.dynamic_midround_delay_min = CONFIG_GET(number/dynamic_midround_delay_min)*600
+	GLOB.dynamic_midround_delay_max = CONFIG_GET(number/dynamic_midround_delay_max)*600

 /datum/game_mode/dynamic/admin_panel()
 	var/list/dat = list("<html><head><title>Game Mode Panel</title></head><body><h1><B>Game Mode Panel</B></h1>")
@@ -221,7 +225,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1)
 			. += G.get_report()

 	print_command_report(., "Central Command Status Summary", announce=FALSE)
-	priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", 'sound/ai/intercept.ogg')
+	priority_announce("A summary has been copied and printed to all communications consoles.", "Security level elevated.", "intercept")
 	if(GLOB.security_level < SEC_LEVEL_BLUE)
 		set_security_level(SEC_LEVEL_BLUE)

@@ -263,7 +263,7 @@
 	M.mind.special_role = antag_flag
 	M.mind.add_antag_datum(AI)
 	if(prob(ion_announce))
-		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", 'sound/ai/ionstorm.ogg')
+		priority_announce("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert", "ionstorm")
 		if(prob(removeDontImproveChance))
 			M.replace_random_law(generate_ion_law(), list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
 		else
@@ -1,5 +1,5 @@
 /proc/power_failure()
-	priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", 'sound/ai/poweroff.ogg')
+	priority_announce("Abnormal activity detected in [station_name()]'s powernet. As a precautionary measure, the station's power will be shut off for an indeterminate duration.", "Critical Power Failure", "poweroff")
 	for(var/obj/machinery/power/smes/S in GLOB.machines)
 		if(istype(get_area(S), /area/ai_monitored/turret_protected) || !is_station_level(S.z))
 			continue
@@ -48,7 +48,7 @@

 /proc/power_restore()

-	priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
+	priority_announce("Power has been restored to [station_name()]. We apologize for the inconvenience.", "Power Systems Nominal", "poweron")
 	for(var/obj/machinery/power/apc/C in GLOB.machines)
 		if(C.cell && is_station_level(C.z))
 			C.cell.charge = C.cell.maxcharge
@@ -70,7 +70,7 @@

 /proc/power_restore_quick()

-	priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", 'sound/ai/poweron.ogg')
+	priority_announce("All SMESs on [station_name()] have been recharged. We apologize for the inconvenience.", "Power Systems Nominal", "poweron")
 	for(var/obj/machinery/power/smes/S in GLOB.machines)
 		if(!is_station_level(S.z))
 			continue
@@ -29,4 +29,4 @@
 /datum/game_mode/extended/announced/send_intercept(report = 0)
 	if(flipseclevel) //CIT CHANGE - allows the sec level to be flipped roundstart
 		return ..()
-	priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/ai/commandreport.ogg')
+	priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", "commandreport")
@@ -258,7 +258,7 @@

 /datum/game_mode/proc/send_intercept()
 	if(flipseclevel && !(config_tag == "extended"))//CIT CHANGE - lets the security level be flipped roundstart
-		priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", 'sound/ai/commandreport.ogg')
+		priority_announce("Thanks to the tireless efforts of our security and intelligence divisions, there are currently no credible threats to [station_name()]. All station construction projects have been authorized. Have a secure shift!", "Security Report", "commandreport")
 		return
 	var/intercepttext = "<b><i>Central Command Status Summary</i></b><hr>"
 	intercepttext += "<b>Central Command has intercepted and partially decoded a Syndicate transmission with vital information regarding their movements. The following report outlines the most \
@@ -288,7 +288,7 @@
 			intercepttext += G.get_report()

 	print_command_report(intercepttext, "Central Command Status Summary", announce=FALSE)
-	priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", 'sound/ai/intercept.ogg')
+	priority_announce("A summary has been copied and printed to all communications consoles.", "Enemy communication intercepted. Security level elevated.", "intercept")
 	if(GLOB.security_level < SEC_LEVEL_BLUE)
 		set_security_level(SEC_LEVEL_BLUE)

@@ -34,9 +34,9 @@
 /obj/machinery/computer/ratvar_act()
 	if(!clockwork)
 		clockwork = TRUE
-		icon_screen = "ratvar[rand(1, 4)]"
-		icon_keyboard = "ratvar_key[rand(1, 6)]"
-		icon_state = "ratvarcomputer[rand(1, 4)]"
+		icon_screen = "ratvar[rand(1, 3)]"
+		icon_keyboard = "ratvar_key[rand(1, 2)]"
+		icon_state = "ratvarcomputer"
 		update_icon()

 /obj/machinery/computer/narsie_act()
@@ -1,8 +1,7 @@
 #define ARCADE_WEIGHT_TRICK 4
 #define ARCADE_WEIGHT_USELESS 2
 #define ARCADE_WEIGHT_RARE 1
-#define ARCADE_WEIGHT_PLUSH 65
-
+#define ARCADE_RATIO_PLUSH 0.20 // average 1 out of 6 wins is a plush.

 /obj/machinery/computer/arcade
 	name = "random arcade"
@@ -27,7 +26,6 @@
 		/obj/item/toy/katana = ARCADE_WEIGHT_TRICK,
 		/obj/item/toy/minimeteor = ARCADE_WEIGHT_TRICK,
 		/obj/item/toy/nuke = ARCADE_WEIGHT_TRICK,
-		/obj/item/toy/plush/random = ARCADE_WEIGHT_PLUSH,
 		/obj/item/toy/redbutton = ARCADE_WEIGHT_TRICK,
 		/obj/item/toy/spinningtoy = ARCADE_WEIGHT_TRICK,
 		/obj/item/toy/sword = ARCADE_WEIGHT_TRICK,
@@ -88,8 +86,12 @@
 								/obj/item/circuitboard/computer/arcade/amputation = 2)
 		var/thegame = pickweight(gameodds)
 		var/obj/item/circuitboard/CB = new thegame()
-		new CB.build_path(loc, CB)
+		var/obj/machinery/computer/arcade/A = new CB.build_path(loc, CB)
+		A.setDir(dir)
 		return INITIALIZE_HINT_QDEL
+	//The below object acts as a spawner with a wide array of possible picks, most being uninspired references to past/current player characters.
+	//Nevertheless, this keeps its ratio constant with the sum of all the others prizes.
+	prizes[/obj/item/toy/plush/random] = counterlist_sum(prizes) * ARCADE_RATIO_PLUSH
 	Reset()

 /obj/machinery/computer/arcade/proc/prizevend(mob/user, list/rarity_classes)
@@ -17,7 +17,7 @@
 		network += lowertext(i)

 /obj/machinery/computer/security/check_eye(mob/user)
-	if( (stat & (NOPOWER|BROKEN)) || user.incapacitated() || user.eye_blind )
+	if(CHECK_BITFIELD(stat, NOPOWER|BROKEN) || is_blind(user) || !in_view_range(user, src) || !user.canUseTopic(src, !issilicon(user), FALSE))
 		user.unset_machine()
 		return
 	if(!(user in watchers))
@@ -30,14 +30,6 @@
 	if(!C.can_use())
 		user.unset_machine()
 		return
-	if(!issilicon(user))
-		if(!Adjacent(user))
-			user.unset_machine()
-			return
-	else if(iscyborg(user))
-		var/list/viewing = viewers(src)
-		if(!viewing.Find(user))
-			user.unset_machine()

 /obj/machinery/computer/security/on_unset_machine(mob/user)
 	watchers.Remove(user)
@@ -97,36 +89,22 @@
 		user.unset_machine()
 		playsound(src, 'sound/machines/terminal_off.ogg', 25, 0)
 		return
-	if(C)
-		var/camera_fail = 0
-		if(!C.can_use() || user.machine != src || user.eye_blind || user.incapacitated())
-			camera_fail = 1
-		else if(iscyborg(user))
-			var/list/viewing = viewers(src)
-			if(!viewing.Find(user))
-				camera_fail = 1
-		else if(!issilicon(user))
-			if(!Adjacent(user))
-				camera_fail = 1
-
-		if(camera_fail)
-			user.unset_machine()
-			return 0
-
-		playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
-		if(isAI(user))
-			var/mob/living/silicon/ai/A = user
-			A.eyeobj.setLoc(get_turf(C))
-			A.client.eye = A.eyeobj
-		else
-			user.reset_perspective(C)
-			user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
-			user.clear_fullscreen("flash", 5)
-		watchers[user] = C
-		use_power(50)
-		addtimer(CALLBACK(src, .proc/use_camera_console, user), 5)
-	else
+	if(!C || !C.can_use() || CHECK_BITFIELD(stat, NOPOWER|BROKEN) || is_blind(user) || !in_view_range(user, src) || !user.canUseTopic(src, !issilicon(user), FALSE))
 		user.unset_machine()
+		return FALSE
+
+	playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 25, 0)
+	if(isAI(user))
+		var/mob/living/silicon/ai/A = user
+		A.eyeobj.setLoc(get_turf(C))
+		A.client.eye = A.eyeobj
+	else
+		user.reset_perspective(C)
+		user.overlay_fullscreen("flash", /obj/screen/fullscreen/flash/static)
+		user.clear_fullscreen("flash", 5)
+	watchers[user] = C
+	use_power(50)
+	addtimer(CALLBACK(src, .proc/use_camera_console, user), 5)

 //returns the list of cameras accessible from this computer
 /obj/machinery/computer/security/proc/get_available_cameras()
@@ -298,13 +298,15 @@
 		src.updateUsrDialog()
 		playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0)
 		say("Initiating scan...")
-
+		var/prev_locked = scanner.locked
+		scanner.locked = TRUE
 		spawn(20)
 			src.scan_occupant(scanner.occupant)

 			loading = 0
 			src.updateUsrDialog()
 			playsound(src, 'sound/machines/terminal_prompt_confirm.ogg', 50, 0)
+			scanner.locked = prev_locked


 		//No locking an open scanner.
@@ -335,7 +335,7 @@
 				Nuke_request(input, usr)
 				to_chat(usr, "<span class='notice'>Request sent.</span>")
 				usr.log_message("has requested the nuclear codes from CentCom", LOG_SAY)
-				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested",'sound/ai/commandreport.ogg')
+				priority_announce("The codes for the on-station nuclear self-destruct have been requested by [usr]. Confirmation or denial of this request will be sent shortly.", "Nuclear Self Destruct Codes Requested","commandreport")
 				CM.lastTimeUsed = world.time


@@ -484,7 +484,7 @@
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []<BR>[]", authenticated, rank, STATION_TIME_TIMESTAMP("hh:mm:ss"), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1)
+				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []<BR>[]", authenticated, rank, STATION_TIME_TIMESTAMP("hh:mm:ss"), time2text(world.realtime, "MMM DD"), GLOB.year_integer, t1)

 			else if(href_list["del_c"])
 				if((istype(active2, /datum/data/record) && active2.fields[text("com_[]", href_list["del_c"])]))
@@ -455,7 +455,7 @@ What a mess.*/
 				var/counter = 1
 				while(active2.fields[text("com_[]", counter)])
 					counter++
-				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []<BR>[]", src.authenticated, src.rank, STATION_TIME_TIMESTAMP("hh:mm:ss"), time2text(world.realtime, "MMM DD"), GLOB.year_integer+540, t1)
+				active2.fields[text("com_[]", counter)] = text("Made by [] ([]) on [] [], []<BR>[]", src.authenticated, src.rank, STATION_TIME_TIMESTAMP("hh:mm:ss"), time2text(world.realtime, "MMM DD"), GLOB.year_integer, t1)

 			if("Delete Record (ALL)")
 				if(active1)
@@ -90,6 +90,7 @@
 		say("Processing hub calibration to target...")

 		calibrating = 1
+		power_station.update_icon()
 		spawn(50 * (3 - power_station.teleporter_hub.accurate)) //Better parts mean faster calibration
 			calibrating = 0
 			if(check_hub_connection())
@@ -97,6 +98,7 @@
 				say("Calibration complete.")
 			else
 				say("Error: Unable to detect hub.")
+			power_station.update_icon()
 			updateDialog()

 	updateDialog()
@@ -74,7 +74,8 @@
 			to_chat(user, "<span class='notice'>You start adding [I] to [src]...</span>")
 			if(do_after(user, 50, target=src))
 				W.use(5)
-				new /turf/closed/wall/mineral/wood/nonmetal(get_turf(src))
+				var/turf/T = get_turf(src)
+				T.PlaceOnTop(/turf/closed/wall/mineral/wood/nonmetal)
 				qdel(src)
 				return
 	return ..()
@@ -24,6 +24,8 @@ Possible to do for anyone motivated enough:
 * Holopad
 */

+GLOBAL_LIST_EMPTY(network_holopads)
+
 #define HOLOPAD_PASSIVE_POWER_USAGE 1
 #define HOLOGRAM_POWER_USAGE 2

@@ -55,7 +57,6 @@ Possible to do for anyone motivated enough:
 	var/record_user			//user that inititiated the recording
 	var/obj/effect/overlay/holo_pad_hologram/replay_holo	//replay hologram
 	var/static/force_answer_call = FALSE	//Calls will be automatically answered after a couple rings, here for debugging
-	var/static/list/holopads = list()
 	var/obj/effect/overlay/holoray/ray
 	var/ringing = FALSE
 	var/offset = FALSE
@@ -96,7 +97,7 @@ Possible to do for anyone motivated enough:
 /obj/machinery/holopad/Initialize()
 	. = ..()
 	if(on_network)
-		holopads += src
+		GLOB.network_holopads += src

 /obj/machinery/holopad/Destroy()
 	if(outgoing_call)
@@ -116,7 +117,7 @@ Possible to do for anyone motivated enough:

 	QDEL_NULL(disk)

-	holopads -= src
+	GLOB.network_holopads -= src
 	return ..()

 /obj/machinery/holopad/power_change()
@@ -260,7 +261,7 @@ Possible to do for anyone motivated enough:
 		temp += "<A href='?src=[REF(src)];mainmenu=1'>Main Menu</A>"
 		if(usr.loc == loc)
 			var/list/callnames = list()
-			for(var/I in holopads)
+			for(var/I in GLOB.network_holopads)
 				var/area/A = get_area(I)
 				if(A)
 					LAZYADD(callnames[A], I)
@@ -474,7 +475,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/
 	var/obj/effect/overlay/holo_pad_hologram/h = masters[holo_owner]
 	if(!h || h.HC) //Holocalls can't change source.
 		return FALSE
-	for(var/pad in holopads)
+	for(var/pad in GLOB.network_holopads)
 		var/obj/machinery/holopad/another = pad
 		if(another == src)
 			continue
@@ -562,6 +562,7 @@
 	//Shooting Code:
 	A.preparePixelProjectile(target, T)
 	A.firer = src
+	A.fired_from = src
 	A.fire()
 	return A

@@ -209,5 +209,7 @@
 		icon_state = "controller-o"
 	else if(stat & (BROKEN|NOPOWER))
 		icon_state = "controller-p"
+	else if(teleporter_console && teleporter_console.calibrating)
+		icon_state = "controller-c"
 	else
 		icon_state = "controller"
@@ -3,3 +3,9 @@
 	internal_damage_threshold = 50
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 15, "energy" = 20, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
 	mouse_pointer = 'icons/mecha/mecha_mouse.dmi'
+	var/spawn_tracked = TRUE
+
+/obj/mecha/combat/Initialize()
+	. = ..()
+	if(spawn_tracked)
+		trackers += new /obj/item/mecha_parts/mecha_tracking(src)
@@ -19,7 +19,3 @@
 /obj/mecha/combat/durand/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	defense_action.Remove(user)
-
-/obj/mecha/combat/Initialize()
-	. = ..()
-	trackers += new /obj/item/mecha_parts/mecha_tracking(src)
@@ -29,6 +29,7 @@
 	operation_req_access = list(ACCESS_SYNDICATE)
 	wreckage = /obj/structure/mecha_wreckage/gygax/dark
 	max_equip = 4
+	spawn_tracked = FALSE

 /obj/mecha/combat/gygax/dark/loaded/Initialize()
 	. = ..()
@@ -48,7 +49,6 @@
 		return
 	cell = new /obj/item/stock_parts/cell/hyper(src)

-
 /obj/mecha/combat/gygax/GrantActions(mob/living/user, human_occupant = 0)
 	..()
 	overload_action.Grant(user, src)
@@ -65,7 +65,3 @@
 /obj/mecha/combat/gygax/dark/RemoveActions(mob/living/user, human_occupant = 0)
 	..()
 	thrusters_action.Remove(user)
-
-/obj/mecha/combat/Initialize()
-	. = ..()
-	trackers += new /obj/item/mecha_parts/mecha_tracking(src)
--- a/Show More
+++ b/Show More