Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528

2017-05-28 21:49:30 -05:00
parent 4191e1f7fd 745437e0eb
commit 77b4be8b3f
261 changed files with 2122 additions and 2804 deletions
@@ -726,7 +726,7 @@
 	},
 /area/ruin/powered/syndicate_lava_base)
 "bM" = (
-/obj/machinery/smartfridge/chemistry/virology,
+/obj/machinery/smartfridge/chemistry/virology/preloaded,
 /turf/open/floor/plasteel/podhatch{
 	tag = "icon-podhatch (EAST)";
 	icon_state = "podhatch";
@@ -8,185 +8,81 @@
 	},
 /obj/structure/alien/resin/wall,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "c" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /obj/structure/alien/resin/wall,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "d" = (
 /obj/structure/alien/resin/wall,
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "e" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
 	},
 /obj/structure/alien/egg/burst,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "f" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "g" = (
 /obj/structure/alien/weeds,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "h" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "i" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "j" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /mob/living/simple_animal/hostile/alien,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "k" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /obj/structure/alien/egg/burst,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "l" = (
 /obj/structure/alien/weeds/node,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "m" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
 	},
 /obj/structure/bed/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "n" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /obj/structure/bed/nest,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "o" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -198,43 +94,19 @@
 	},
 /obj/item/weapon/gun/ballistic/automatic/pistol,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "p" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "q" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "r" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
@@ -242,112 +114,48 @@
 /obj/structure/alien/resin/wall,
 /obj/structure/alien/resin/wall,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "s" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /obj/structure/alien/egg,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "t" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /mob/living/simple_animal/hostile/alien/sentinel,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "u" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
 	},
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "v" = (
 /obj/structure/alien/weeds/node,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "w" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "x" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg/burst,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "y" = (
 /obj/structure/alien/weeds/node,
 /obj/structure/alien/resin/wall,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "z" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
@@ -364,28 +172,12 @@
 /obj/item/weapon/melee/baton/loaded,
 /obj/item/clothing/head/helmet,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "A" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "B" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
@@ -393,59 +185,27 @@
 /obj/structure/alien/egg/burst,
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "C" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/egg/burst,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "D" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /obj/effect/decal/cleanable/blood/gibs,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "E" = (
 /obj/structure/alien/weeds,
 /mob/living/simple_animal/hostile/alien/drone{
 	plants_off = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "F" = (
 /obj/structure/alien/weeds,
 /mob/living/simple_animal/hostile/alien/queen/large{
@@ -455,15 +215,7 @@
 	plants_off = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "G" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
@@ -472,28 +224,12 @@
 	plants_off = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "H" = (
 /obj/structure/alien/weeds,
 /obj/effect/decal/cleanable/blood,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "I" = (
 /obj/structure/alien/weeds,
 /obj/structure/bed/nest,
@@ -507,56 +243,24 @@
 /obj/item/clothing/under/syndicate,
 /obj/item/clothing/glasses/night,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "J" = (
 /obj/structure/alien/weeds,
 /mob/living/simple_animal/hostile/alien/sentinel,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "K" = (
 /obj/structure/alien/weeds/node,
 /mob/living/simple_animal/hostile/alien,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "L" = (
 /obj/structure/alien/weeds/node,
 /mob/living/simple_animal/hostile/alien/drone{
 	plants_off = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "M" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds1"
@@ -573,15 +277,7 @@
 	stat = 2
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "N" = (
 /obj/structure/alien/weeds,
 /obj/structure/alien/resin/wall,
@@ -590,15 +286,7 @@
 "O" = (
 /obj/structure/alien/weeds/node,
 /turf/template_noop,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "P" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
@@ -615,41 +303,17 @@
 	plants_off = 1
 	},
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "R" = (
 /obj/structure/alien/weeds,
 /turf/template_noop,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "S" = (
 /obj/structure/alien/weeds{
 	icon_state = "weeds2"
 	},
 /turf/template_noop,
-/area/awaycontent/a5{
-	always_unpowered = 1;
-	has_gravity = 1;
-	name = "The Hive";
-	power_environ = 0;
-	power_equip = 0;
-	power_light = 0;
-	poweralm = 0
-	})
+/area/ruin/xenonest)
 "T" = (
 /obj/structure/alien/weeds/node,
 /obj/structure/alien/resin/wall,
@@ -1142,6 +1142,10 @@
 /obj/effect/turf_decal/bot{
 	dir = 2
 	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
 /turf/open/floor/plasteel{
 	dir = 2
 	},
@@ -1338,6 +1342,13 @@
 /obj/effect/turf_decal/bot{
 	dir = 2
 	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
 /turf/open/floor/plasteel{
 	dir = 2
 	},
@@ -1356,6 +1367,13 @@
 /obj/effect/turf_decal/bot{
 	dir = 2
 	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
+/obj/structure/window/reinforced{
+	dir = 8
+	},
 /turf/open/floor/plasteel{
 	dir = 2
 	},
@@ -53772,6 +53790,10 @@
 /obj/effect/turf_decal/bot{
 	dir = 2
 	},
+/obj/structure/window/reinforced{
+	dir = 1;
+	layer = 2.9
+	},
 /turf/open/floor/plasteel{
 	dir = 2
 	},
@@ -112232,11 +112254,11 @@ btp
 cbv
 ccq
 bns
-cjD
-cjD
-cjD
-cjD
-cnj
+aof
+aof
+aof
+aof
+amw
 aaa
 aaa
 aaa
@@ -112489,13 +112511,13 @@ ckS
 bky
 ccq
 cds
-cjD
+aof
 ckt
 cly
 cmw
-cnj
-cnj
-cnj
+amw
+amw
+amw
 aaa
 aaa
 aaf
@@ -113003,13 +113025,13 @@ cbg
 bTr
 cct
 cdu
-cjG
+aqx
 cku
 clz
 cmx
-cnj
-cnj
-cnj
+amw
+amw
+amw
 aaa
 aaa
 aaf
@@ -113260,11 +113282,11 @@ bky
 bky
 bky
 bky
-cjD
-cjD
-cjD
-cjD
-cnj
+aof
+aof
+aof
+aof
+amw
 aaa
 aaa
 aaa
@@ -1,3 +0,0 @@
-"a" = ()
-
-(1,1,1, 1,1,1) = {""}
@@ -123,6 +123,7 @@
 	},
 /area/shuttle/escape)
 "aw" = (
+/obj/machinery/light,
 /turf/open/floor/plasteel/darkblue/side,
 /area/shuttle/escape)
 "ax" = (
@@ -168,6 +169,10 @@
 "aE" = (
 /obj/structure/table/reinforced,
 /obj/item/weapon/defibrillator/loaded,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 4
 	},
@@ -216,6 +221,9 @@
 	id = "shuttleflash";
 	pixel_y = -23
 	},
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel/darkblue/side{
 	tag = "icon-darkblue (NORTH)";
 	dir = 1
@@ -232,6 +240,9 @@
 	},
 /area/shuttle/escape)
 "aM" = (
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel/darkblue/side{
 	tag = "icon-darkblue (NORTH)";
 	dir = 1
@@ -412,6 +423,9 @@
 	pixel_y = 9
 	},
 /obj/structure/closet/crate/internals,
+/obj/machinery/light{
+	dir = 1
+	},
 /turf/open/floor/plasteel/darkyellow/side{
 	tag = "icon-darkyellow (NORTHEAST)";
 	icon_state = "darkyellow";
@@ -516,6 +530,9 @@
 	pixel_y = 8
 	},
 /obj/structure/table/reinforced,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel/darkpurple/side{
 	dir = 8
 	},
@@ -918,6 +935,9 @@
 /area/shuttle/escape)
 "ch" = (
 /obj/structure/reagent_dispensers/fueltank,
+/obj/machinery/light{
+	dir = 8
+	},
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 9;
 	icon_state = "darkgreen";
@@ -926,6 +946,10 @@
 /area/shuttle/escape)
 "ci" = (
 /obj/structure/reagent_dispensers/watertank,
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 5
 	},
@@ -1040,9 +1064,9 @@
 	name = "Bridge Blast Shutters";
 	pixel_x = 0;
 	pixel_y = -26;
-	req_access_txt = "150";
-	pixel_x = 0
+	req_access_txt = "19"
 	},
+/obj/machinery/light,
 /turf/open/floor/plasteel/darkblue/side,
 /area/shuttle/escape)
 "cA" = (
@@ -1482,10 +1506,146 @@
 	pixel_x = 24;
 	pixel_y = 0
 	},
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
 /turf/open/floor/plasteel/darkgreen/side{
 	dir = 4
 	},
 /area/shuttle/escape)
+"eC" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/open/floor/plasteel/darkpurple/side{
+	dir = 4
+	},
+/area/shuttle/escape)
+"eD" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium/brig{
+	dir = 8;
+	floor_tile = /obj/item/stack/tile/plasteel;
+	icon_state = "darkred"
+	},
+/area/shuttle/escape)
+"eE" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	tag = "icon-darkgreen (NORTH)";
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/shuttle/escape)
+"eF" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 8
+	},
+/area/shuttle/escape)
+"eG" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	tag = "icon-darkgreen (NORTH)";
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/shuttle/escape)
+"eH" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkgreen/side,
+/area/shuttle/escape)
+"eI" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkgreen/side,
+/area/shuttle/escape)
+"eJ" = (
+/obj/machinery/button/flasher{
+	id = "cockpit_flasher";
+	pixel_x = 6;
+	pixel_y = -24
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium/blue,
+/area/space)
+"eK" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	tag = "icon-darkgreen (NORTH)";
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/shuttle/escape)
+"eL" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	tag = "icon-darkgreen (NORTH)";
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/shuttle/escape)
+"eM" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	tag = "icon-darkgreen (NORTH)";
+	icon_state = "darkgreen";
+	dir = 1
+	},
+/area/shuttle/escape)
+"eN" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 4
+	},
+/area/shuttle/escape)
+"eO" = (
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 8
+	},
+/area/shuttle/escape)
+"eP" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkgreen/side,
+/area/shuttle/escape)
+"eQ" = (
+/obj/machinery/light{
+	dir = 4;
+	icon_state = "tube1"
+	},
+/turf/open/floor/plasteel/darkgreen/side{
+	dir = 4
+	},
+/area/shuttle/escape)
+"eR" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkgreen/side,
+/area/shuttle/escape)
+"eS" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/darkgreen/side,
+/area/shuttle/escape)

 (1,1,1) = {"
 aa
@@ -1531,7 +1691,7 @@ cs
 ar
 aW
 bc
-bc
+eD
 bc
 bc
 bc
@@ -1545,7 +1705,7 @@ cu
 bF
 be
 be
-be
+eO
 be
 be
 cd
@@ -1604,19 +1764,19 @@ cu
 cu
 cs
 ar
-br
+eG
 aC
-bz
+eH
 ar
 bT
 bo
-br
+eK
 bZ
 ca
 aC
 bZ
 ca
-bz
+eR
 ab
 ch
 ar
@@ -1636,7 +1796,7 @@ be
 be
 be
 be
-be
+eF
 be
 bG
 aC
@@ -1712,13 +1872,13 @@ bP
 ar
 bU
 bo
-br
+eL
 bZ
 ca
 aC
 bZ
 ca
-bz
+eS
 ab
 ci
 ar
@@ -1742,7 +1902,7 @@ bz
 cs
 bH
 bG
-bz
+eI
 cs
 cs
 cs
@@ -1771,7 +1931,7 @@ bb
 bf
 bk
 cs
-br
+eE
 bz
 cs
 bI
@@ -1884,9 +2044,9 @@ aa
 cs
 cs
 cs
-br
+eM
 aC
-bz
+eP
 cs
 cs
 cs
@@ -1946,7 +2106,7 @@ bB
 cu
 ad
 ad
-ad
+eJ
 ad
 cu
 br
@@ -2004,7 +2164,7 @@ ar
 aE
 aI
 aO
-aV
+eC
 aV
 bi
 bm
@@ -2020,9 +2180,9 @@ cs
 bW
 aZ
 aZ
+eN
 aZ
-aZ
-aZ
+eQ
 aZ
 aZ
 ce
@@ -14,6 +14,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define NOBLUDGEON		4		// when an item has this it produces no "X has been hit by Y with Z" message in the default attackby()
 #define MASKINTERNALS	8		// mask allows internals
 #define HEAR 			16		// This flag is what recursive_hear_check() uses to determine wether to add an item to the hearer list or not.
+#define CHECK_RICOCHET	32		// Projectiels will check ricochet on things impacted that have this.
 #define CONDUCT			64		// conducts electricity (metal etc.)
 #define ABSTRACT    	128		// for all things that are technically items but used for various different stuff, made it 128 because it could conflict with other flags other way
 #define NODECONSTRUCT  	128		// For machines and structures that should not break into parts, eg, holodeck stuff
@@ -57,6 +58,7 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 #define UNUSED_TRANSIT_TURF 2
 #define CAN_BE_DIRTY 4 //If a turf can be made dirty at roundstart. This is also used in areas.
 #define NO_DEATHRATTLE 16 // Do not notify deadchat about any deaths that occur on this turf.
+//#define CHECK_RICOCHET	32		//Same thing as atom flag.

 /*
 	These defines are used specifically with the atom/pass_flags bitmask
@@ -0,0 +1,18 @@
+//Investigate logging defines
+#define INVESTIGATE_ATMOS	         "atmos"
+#define INVESTIGATE_BOTANY 	         "botany"
+#define INVESTIGATE_CARGO 	         "cargo"
+#define INVESTIGATE_EXPERIMENTOR 	 "experimentor"
+#define INVESTIGATE_GRAVITY 	     "gravity"
+#define INVESTIGATE_RECORDS 	     "records"
+#define INVESTIGATE_SINGULO          "singulo"
+#define INVESTIGATE_SUPERMATTER      "supermatter"
+#define INVESTIGATE_TELESCI          "telesci"
+#define INVESTIGATE_WIRES            "wires"
+
+//Individual logging defines
+#define INDIVIDUAL_ATTACK_LOG   "Attack log"
+#define INDIVIDUAL_SAY_LOG      "Say log"
+#define INDIVIDUAL_EMOTE_LOG    "Emote log"
+#define INDIVIDUAL_OOC_LOG      "OOC log"
+#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
@@ -411,3 +411,9 @@ GLOBAL_LIST_INIT(ghost_others_options, list(GHOST_OTHERS_SIMPLE, GHOST_OTHERS_DE
 #define NO_FIELD 0
 #define FIELD_TURF 1
 #define FIELD_EDGE 2
+
+//gibtonite state defines
+#define GIBTONITE_UNSTRUCK 0
+#define GIBTONITE_ACTIVE 1
+#define GIBTONITE_STABLE 2
+#define GIBTONITE_DETONATE 3
@@ -114,13 +114,6 @@
 #define SNPC_MARTYR 3
 #define SNPC_PSYCHO 4

-//Individual logging defines
-#define INDIVIDUAL_ATTACK_LOG "Attack log"
-#define INDIVIDUAL_SAY_LOG "Say log"
-#define INDIVIDUAL_EMOTE_LOG "Emote log"
-#define INDIVIDUAL_OOC_LOG "OOC log"
-#define INDIVIDUAL_SHOW_ALL_LOG "All logs"
-
 #define TK_MAXRANGE 15

 #define NO_SLIP_WHEN_WALKING 1
@@ -131,3 +124,8 @@
 #define MAX_CHICKENS 50

 #define UNHEALING_EAR_DAMAGE 100
+
+
+#define INCORPOREAL_MOVE_BASIC 1
+#define INCORPOREAL_MOVE_SHADOW 2 // leaves a trail of shadows
+#define INCORPOREAL_MOVE_JAUNT 3 // is blocked by holy water/salt
@@ -39,6 +39,7 @@


 // Subsystem init_order, from highest priority to lowest priority
+// Subsystems shutdown in the reverse of the order they initialize in
 // The numbers just define the ordering, they are meaningless otherwise.

 #define INIT_ORDER_SERVER_MAINT 16
@@ -71,4 +72,4 @@
 #define RUNLEVEL_GAME 4
 #define RUNLEVEL_POSTGAME 8

-#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)
+#define RUNLEVELS_DEFAULT (RUNLEVEL_SETUP | RUNLEVEL_GAME | RUNLEVEL_POSTGAME)
@@ -167,23 +167,14 @@
 				underlay_appearance.icon = fixed_underlay["icon"]
 				underlay_appearance.icon_state = fixed_underlay["icon_state"]
 		else
-			var/turf/T = get_step(src, turn(adjacencies, 180))
-			if(T && (T.density || T.smooth))
+			var/turned_adjacency = turn(adjacencies, 180)
+			var/turf/T = get_step(src, turned_adjacency)
+			if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
 				T = get_step(src, turn(adjacencies, 135))
-				if(T && (T.density || T.smooth))
+				if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
 					T = get_step(src, turn(adjacencies, 225))
-
-			if(isspaceturf(T) && !istype(T, /turf/open/space/transit))
-				underlay_appearance.icon = 'icons/turf/space.dmi'
-				underlay_appearance.icon_state = SPACE_ICON_STATE
-				underlay_appearance.plane = PLANE_SPACE
-			else if(T && !T.density && !T.smooth)
-				underlay_appearance.icon = T.icon
-				underlay_appearance.icon_state = T.icon_state
-			else if(baseturf && !initial(baseturf.density) && !initial(baseturf.smooth))
-				underlay_appearance.icon = initial(baseturf.icon)
-				underlay_appearance.icon_state = initial(baseturf.icon_state)
-			else
+			//if all else fails, ask our own turf
+			if(!T.get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency) && !get_smooth_underlay_icon(underlay_appearance, src, turned_adjacency))
 				underlay_appearance.icon = DEFAULT_UNDERLAY_ICON
 				underlay_appearance.icon_state = DEFAULT_UNDERLAY_ICON_STATE
 		underlays = U
@@ -130,6 +130,22 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
 	var/t = round((val - min) / d)
 	return val - (t * d)

+#define NORM_ROT(rot) ((((rot % 360) + (rot - round(rot, 1))) > 0) ? ((rot % 360) + (rot - round(rot, 1))) : (((rot % 360) + (rot - round(rot, 1))) + 360))
+
+/proc/get_angle_of_incidence(face_angle, angle_in, auto_normalize = TRUE)
+
+	var/angle_in_s = NORM_ROT(angle_in)
+	var/face_angle_s = NORM_ROT(face_angle)
+	var/incidence = face_angle_s - angle_in_s
+	var/incidence_s = incidence
+	while(incidence_s < -90)
+		incidence_s += 180
+	while(incidence_s > 90)
+		incidence_s -= 180
+	if(auto_normalize)
+		return incidence_s
+	else
+		return incidence

 //A logarithm that converts an integer to a number scaled between 0 and 1 (can be tweaked to be higher).
 //Currently, this is used for hydroponics-produce sprite transforming, but could be useful for other transform functions.
@@ -141,8 +157,6 @@ GLOBAL_LIST_INIT(sqrtTable, list(1, 1, 1, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 4,
 		return size_factor + scaling_modifier //scale mod of 0 results in a number from 0 to 1. A scale modifier of +0.5 returns 0.5 to 1.5
 		//to_chat(world, "Transform multiplier of [src] is [size_factor + scaling_modifer]")

-
-
 //converts a uniform distributed random number into a normal distributed one
 //since this method produces two random numbers, one is saved for subsequent calls
 //(making the cost negligble for every second call)
@@ -92,7 +92,7 @@
 	if(next_move > world.time) // in the year 2000...
 		return

-	if(A.IsObscured())
+	if(!modifiers["catcher"] && A.IsObscured())
 		return

 	if(istype(loc,/obj/mecha))
@@ -119,7 +119,7 @@
 	//User itself, current loc, and user inventory
 	if(DirectAccess(A))
 		if(W)
-			melee_item_attack_chain(src,W,A,params)
+			W.melee_attack_chain(src, A, params)
 		else
 			if(ismob(A))
 				changeNext_move(CLICK_CD_MELEE)
@@ -133,7 +133,7 @@
 	//Standard reach turf to turf or reaching inside storage
 	if(CanReach(A,W))
 		if(W)
-			melee_item_attack_chain(src,W,A,params)
+			W.melee_attack_chain(src, A, params)
 		else
 			if(ismob(A))
 				changeNext_move(CLICK_CD_MELEE)
@@ -325,8 +325,6 @@

 /mob/living/carbon/human/CtrlClick(mob/user)
 	if(ishuman(user) && Adjacent(user))
-		if(world.time < user.next_move)
-			return FALSE
 		var/mob/living/carbon/human/H = user
 		H.dna.species.grab(H, src, H.mind.martial_art)
 		H.changeNext_move(CLICK_CD_MELEE)
@@ -448,6 +446,7 @@
 		C.swap_hand()
 	else
 		var/turf/T = params2turf(modifiers["screen-loc"], get_turf(usr))
+		params += "&catcher=1"
 		if(T)
 			T.Click(location, control, params)
 	. = 1
@@ -466,4 +465,4 @@
 			view = -1
 		else
 			view = 1
-		add_view_range(view)
+		add_view_range(view)
@@ -71,7 +71,7 @@

 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc in contents)
 	if(A == loc || (A in loc) || (A in contents))
-		melee_item_attack_chain(src, W, A, params)
+		W.melee_attack_chain(src, A, params)
 		return

 	if(!isturf(loc))
@@ -80,7 +80,7 @@
 	// cyborgs are prohibited from using storage items so we can I think safely remove (A.loc && isturf(A.loc.loc))
 	if(isturf(A) || isturf(A.loc))
 		if(A.Adjacent(src)) // see adjacent.dm
-			melee_item_attack_chain(src, W, A, params)
+			W.melee_attack_chain(src, A, params)
 			return
 		else
 			W.afterattack(A, src, 0, params)
@@ -271,8 +271,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."

 /obj/screen/alert/bloodsense/Initialize()
 	. = ..()
-	if(!narnar)
-		narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
+	narnar = new('icons/mob/screen_alert.dmi', "mini_nar")
 	START_PROCESSING(SSprocessing, src)

 /obj/screen/alert/bloodsense/Destroy()
@@ -1,10 +1,10 @@

-/proc/melee_item_attack_chain(mob/user, obj/item/I, atom/target, params)
-	if(I.pre_attackby(target, user, params))
+/obj/item/proc/melee_attack_chain(mob/user, atom/target, params)
+	if(pre_attackby(target, user, params))
 		// Return 1 in attackby() to prevent afterattack() effects (when safely moving items for example)
-		var/resolved = target.attackby(I,user,params)
-		if(!resolved && target && I)
-			I.afterattack(target, user, 1, params) // 1: clicking something Adjacent
+		var/resolved = target.attackby(src, user, params)
+		if(!resolved && target && !QDELETED(src))
+			afterattack(target, user, 1, params) // 1: clicking something Adjacent


 // Called when the item is in the active hand, and clicked; alternately, there is an 'activate held object' verb or you can hit pagedown.
@@ -124,7 +124,8 @@

 	if(!isturf(target) && istype(focus,/obj/item) && target.Adjacent(focus))
 		apply_focus_overlay()
-		melee_item_attack_chain(tk_user, focus, target, params) //isn't copying the attack chain fun. we should do it more often.
+		var/obj/item/I = focus
+		I.melee_attack_chain(tk_user, target, params) //isn't copying the attack chain fun. we should do it more often.
 		if(check_if_focusable(focus))
 			focus.do_attack_animation(target, null, focus)
 	else
@@ -1,8 +1,8 @@
 SUBSYSTEM_DEF(blackbox)
 	name = "Blackbox"
 	wait = 6000
-	flags = SS_NO_TICK_CHECK | SS_NO_INIT
-	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME
+	flags = SS_NO_TICK_CHECK | SS_NO_INIT
+	runlevels = RUNLEVEL_GAME | RUNLEVEL_POSTGAME

 	var/list/msg_common = list()
 	var/list/msg_science = list()
@@ -86,12 +86,11 @@ SUBSYSTEM_DEF(blackbox)

 	if (!SSdbcore.Connect())
 		return
-    
+
 	var/list/sqlrowlist = list()

 	for (var/datum/feedback_variable/FV in feedback)
-		sqlrowlist += list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" =  "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'")
-
+		sqlrowlist += list(list("time" = "Now()", "round_id" = GLOB.round_id, "var_name" =  "'[sanitizeSQL(FV.get_variable())]'", "var_value" = FV.get_value(), "details" = "'[sanitizeSQL(FV.get_details())]'"))
 	if (!length(sqlrowlist))
 		return

@@ -23,7 +23,8 @@ SUBSYSTEM_DEF(dbcore)
 	var/failed_connections = 0

 /datum/controller/subsystem/dbcore/PreInit()
-	_db_con = _dm_db_new_con()
+	if(!_db_con)
+		_db_con = _dm_db_new_con()

 /datum/controller/subsystem/dbcore/Recover()
 	_db_con = SSdbcore._db_con
@@ -164,8 +164,8 @@ SUBSYSTEM_DEF(garbage)
 	if (time > highest_del_time)
 		highest_del_time = time
 	if (time > 10)
-		log_game("Error: [type]([refID]) took longer then 1 second to delete (took [time/10] seconds to delete)")
-		message_admins("Error: [type]([refID]) took longer then 1 second to delete (took [time/10] seconds to delete).")
+		log_game("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete)")
+		message_admins("Error: [type]([refID]) took longer than 1 second to delete (took [time/10] seconds to delete).")
 		postpone(time/5)
 	
 /datum/controller/subsystem/garbage/proc/HardQueue(datum/A)
@@ -15,14 +15,15 @@ SUBSYSTEM_DEF(lighting)


 /datum/controller/subsystem/lighting/Initialize(timeofday)
-	if (config.starlight)
-		for(var/I in GLOB.sortedAreas)
-			var/area/A = I
-			if (A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT)
-				A.luminosity = 0
+	if(!initialized)
+		if (config.starlight)
+			for(var/I in GLOB.sortedAreas)
+				var/area/A = I
+				if (A.dynamic_lighting == DYNAMIC_LIGHTING_IFSTARLIGHT)
+					A.luminosity = 0

-	create_all_lighting_objects()
-	initialized = TRUE
+		create_all_lighting_objects()
+		initialized = TRUE
 	
 	fire(FALSE, TRUE)

@@ -55,9 +55,8 @@
 	else if(isbrain(current) || isclockmob(current))
 		to_chat(current, "<span class='nezbere'>You can communicate with other servants by using the Hierophant Network action button in the upper left.</span>")
 	..()
-	if(istype(SSticker.mode, /datum/game_mode/clockwork_cult))
-		var/datum/game_mode/clockwork_cult/C = SSticker.mode
-		C.present_tasks(owner) //Memorize the objectives
+	to_chat(current, "<b>This is Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]")
+	owner.memory += "<b>Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]<br>" //Memorize the objectives

 /datum/antagonist/clockcult/apply_innate_effects(mob/living/mob_override)
 	. = ..()
@@ -1,34 +1,37 @@
 /datum/getrev
-	var/parentcommit
+	var/originmastercommit
 	var/commit
 	var/list/testmerge = list()
 	var/has_pr_details = FALSE	//example data in a testmerge entry when this is true: https://api.github.com/repositories/3234987/pulls/22586
 	var/date

 /datum/getrev/New()
-	var/head_file = file2text(".git/logs/HEAD")
 	if(SERVERTOOLS && fexists("..\\prtestjob.lk"))
 		var/list/tmp = world.file2list("..\\prtestjob.lk")
 		for(var/I in tmp)
 			if(I)
 				testmerge |= I
-	var/testlen = max(testmerge.len - 1, 0)
-	var/regex/head_log = new("(\\w{40}) .+> (\\d{10}).+(?=(\n.*(\\w{40}).*){[testlen]}\n*\\Z)")
-	head_log.Find(head_file)
-	parentcommit = head_log.group[1]
-	date = unix2date(text2num(head_log.group[2]))
-	commit = head_log.group[4]
+
 	log_world("Running /tg/ revision:")
-	log_world("[date]")
+	var/list/logs = world.file2list(".git/logs/HEAD")
+	if(logs)
+		logs = splittext(logs[logs.len - 1], " ")
+		date = unix2date(text2num(logs[5]))
+		commit = logs[2]
+		log_world("[date]")
+	logs = world.file2list(".git/logs/refs/remotes/origin/master")
+	if(logs)
+		originmastercommit = splittext(logs[logs.len - 1], " ")[2]
+
 	if(testmerge.len)
 		log_world(commit)
 		for(var/line in testmerge)
 			if(line)
 				log_world("Test merge active of PR #[line]")
 				SSblackbox.add_details("testmerged_prs","[line]")
-		log_world("Based off master commit [parentcommit]")
+		log_world("Based off origin/master commit [originmastercommit]")
 	else
-		log_world(parentcommit)
+		log_world(originmastercommit)

 /datum/getrev/proc/DownloadPRDetails()
 	if(!config.githubrepoid)
@@ -73,13 +76,13 @@
 	set name = "Show Server Revision"
 	set desc = "Check the current server code revision"

-	if(GLOB.revdata.parentcommit)
+	if(GLOB.revdata.originmastercommit)
 		to_chat(src, "<b>Server revision compiled on:</b> [GLOB.revdata.date]")
 		var/prefix = ""
 		if(GLOB.revdata.testmerge.len)
 			to_chat(src, GLOB.revdata.GetTestMergeInfo())
-			prefix = "Based off master commit: "
-		var/pc = GLOB.revdata.parentcommit
+			prefix = "Based off origin/master commit: "
+		var/pc = GLOB.revdata.originmastercommit
 		to_chat(src, "[prefix]<a href='[config.githuburl]/commit/[pc]'>[copytext(pc, 1, min(length(pc), 7))]</a>")
 	else
 		to_chat(src, "Revision unknown")
@@ -46,7 +46,7 @@
 	user.reset_perspective()
 	if(user.client)
 		for(var/datum/camerachunk/chunk in eye.visibleCameraChunks)
-			user.client.images -= chunk.obscured
+			chunk.remove(eye)
 	user.remote_control = null
 	QDEL_NULL(eye)
 	
@@ -1,6 +1,4 @@
 /datum/riding
-	var/generic_pixel_x = 0 //All dirs show this pixel_x for the driver
-	var/generic_pixel_y = 0 //All dirs show this pixel_y for the driver, use these vars if the pixel shift is stable across all dir, override handle_vehicle_offsets otherwise.
 	var/next_vehicle_move = 0 //used for move delays
 	var/vehicle_move_delay = 2 //tick delay between movements, lower = faster, higher = slower
 	var/keytype = null
@@ -34,16 +32,29 @@
 /datum/riding/proc/force_dismount(mob/living/M)
 	ridden.unbuckle_mob(M)

-//Override this to set your vehicle's various pixel offsets
-//if they differ between directions, otherwise use the
-//generic variables
 /datum/riding/proc/handle_vehicle_offsets()
+	var/ridden_dir = "[ridden.dir]"
+	var/passindex = 0
 	if(ridden.has_buckled_mobs())
 		for(var/m in ridden.buckled_mobs)
+			passindex++
 			var/mob/living/buckled_mob = m
-			buckled_mob.setDir(ridden.dir)
-			buckled_mob.pixel_x = generic_pixel_x
-			buckled_mob.pixel_y = generic_pixel_y
+			var/list/offsets = get_offsets(passindex)
+			dir_loop:
+				for(var/offsetdir in offsets)
+					if(offsetdir == ridden_dir)
+						var/list/diroffsets = offsets[offsetdir]
+						buckled_mob.pixel_x = diroffsets[1]
+						if(diroffsets.len == 2)
+							buckled_mob.pixel_y = diroffsets[2]
+						if(diroffsets.len == 3)
+							buckled_mob.layer = diroffsets[3]
+						break dir_loop
+
+
+//Override this to set your vehicle's various pixel offsets
+/datum/riding/proc/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 0), "[SOUTH]" = list(0, 0), "[EAST]" = list(0, 0), "[WEST]" = list(0, 0))

 //KEYS
 /datum/riding/proc/keycheck(mob/user)
@@ -100,10 +111,12 @@
 //atv
 /datum/riding/atv
 	keytype = /obj/item/key
-	generic_pixel_x = 0
-	generic_pixel_y = 4
 	vehicle_move_delay = 1

+/datum/riding/atv/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(0, 4), "[EAST]" = list(0, 4), "[WEST]" = list( 0, 4))
+
+
 /datum/riding/atv/handle_vehicle_layer()
 	if(ridden.dir == SOUTH)
 		ridden.layer = ABOVE_MOB_LAYER
@@ -150,24 +163,9 @@
 	keytype = /obj/item/key/janitor


-/datum/riding/janicart/handle_vehicle_offsets()
-	..()
-	if(ridden.has_buckled_mobs())
-		for(var/m in ridden.buckled_mobs)
-			var/mob/living/buckled_mob = m
-			switch(buckled_mob.dir)
-				if(NORTH)
-					buckled_mob.pixel_x = 0
-					buckled_mob.pixel_y = 4
-				if(EAST)
-					buckled_mob.pixel_x = -12
-					buckled_mob.pixel_y = 7
-				if(SOUTH)
-					buckled_mob.pixel_x = 0
-					buckled_mob.pixel_y = 7
-				if(WEST)
-					buckled_mob.pixel_x = 12
-					buckled_mob.pixel_y = 7
+/datum/riding/janicart/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(-12, 7), "[EAST]" = list(0, 7), "[WEST]" = list( 12, 7))
+
 //scooter
 /datum/riding/scooter/handle_vehicle_layer()
 	if(ridden.dir == SOUTH)
@@ -175,20 +173,14 @@
 	else
 		ridden.layer = OBJ_LAYER

+/datum/riding/scooter/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0), "[SOUTH]" = list(-2), "[EAST]" = list(0), "[WEST]" = list( 2))
+
 /datum/riding/scooter/handle_vehicle_offsets()
 	..()
 	if(ridden.has_buckled_mobs())
 		for(var/m in ridden.buckled_mobs)
 			var/mob/living/buckled_mob = m
-			switch(buckled_mob.dir)
-				if(NORTH)
-					buckled_mob.pixel_x = 0
-				if(EAST)
-					buckled_mob.pixel_x = -2
-				if(SOUTH)
-					buckled_mob.pixel_x = 0
-				if(WEST)
-					buckled_mob.pixel_x = 2
 			if(buckled_mob.get_num_legs() > 0)
 				buckled_mob.pixel_y = 5
 			else
@@ -209,16 +201,18 @@
 //secway
 /datum/riding/secway
 	keytype = /obj/item/key/security
-	generic_pixel_x = 0
-	generic_pixel_y = 4
+
+/datum/riding/secway/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(0, 4), "[EAST]" = list(0, 4), "[WEST]" = list( 0, 4))

 //i want to ride my
 /datum/riding/bicycle
 	keytype = null
-	generic_pixel_x = 0
-	generic_pixel_y = 4
 	vehicle_move_delay = 0

+/datum/riding/bicycle/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(0, 4), "[EAST]" = list(0, 4), "[WEST]" = list( 0, 4))
+
 //speedbike
 /datum/riding/space/speedbike
 	keytype = null
@@ -233,54 +227,28 @@
 			ridden.pixel_x = -18
 			ridden.pixel_y = 0

-/datum/riding/space/speedbike/handle_vehicle_offsets()
-	if(ridden.has_buckled_mobs())
-		for(var/m in ridden.buckled_mobs)
-			var/mob/living/buckled_mob = m
-			buckled_mob.setDir(ridden.dir)
-			switch(ridden.dir)
-				if(NORTH)
-					buckled_mob.pixel_x = 0
-					buckled_mob.pixel_y = -8
-				if(SOUTH)
-					buckled_mob.pixel_x = 0
-					buckled_mob.pixel_y = 4
-				if(EAST)
-					buckled_mob.pixel_x = -10
-					buckled_mob.pixel_y = 5
-				if(WEST)
-					buckled_mob.pixel_x = 10
-					buckled_mob.pixel_y = 5
+/datum/riding/space/speedbike/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, -8), "[SOUTH]" = list(0, 4), "[EAST]" = list(-10, 5), "[WEST]" = list( 10, 5))

 //SPEEDUWAGON

 /datum/riding/space/speedwagon
 	vehicle_move_delay = 0

-/datum/riding/space/speedwagon/handle_vehicle_offsets()
-	if(ridden.has_buckled_mobs())
-		for(var/m in ridden.buckled_mobs)
-			var/mob/living/buckled_mob = m
-			buckled_mob.setDir(ridden.dir)
-			ridden.pixel_x = -48
-			ridden.pixel_y = -48
-			switch(ridden.dir)
-				if(NORTH)
-					buckled_mob.pixel_x = -10
-					buckled_mob.pixel_y = -3
-				if(SOUTH)
-					buckled_mob.pixel_x = 16
-					buckled_mob.pixel_y = 3
-				if(EAST)
-					buckled_mob.pixel_x = -4
-					buckled_mob.pixel_y = 30
-				if(WEST)
-					buckled_mob.pixel_x = 4
-					buckled_mob.pixel_y = -1
-
 /datum/riding/space/speedwagon/handle_vehicle_layer()
 	ridden.layer = BELOW_MOB_LAYER

+/datum/riding/space/speedwagon/get_offsets(pass_index) // list(dir = x, y, layer)
+	switch(pass_index)
+		if(1)
+			return list("[NORTH]" = list(-10, -4), "[SOUTH]" = list(16, 3), "[EAST]" = list(-4, 30), "[WEST]" = list(4, -3))
+		if(2)
+			return list("[NORTH]" = list(19, -5, 4), "[SOUTH]" = list(-13, 3, 4), "[EAST]" = list(-4, -3, 4.1), "[WEST]" = list(4, 28, 3.9))
+		if(3)
+			return list("[NORTH]" = list(-10, -18, 4.2), "[SOUTH]" = list(16, 25, 3.9), "[EAST]" = list(-22, 30), "[WEST]" = list(22, -3, 4.1))
+		if(4)
+			return list("[NORTH]" = list(19, -18, 4.2), "[SOUTH]" = list(-13, 25, 3.9), "[EAST]" = list(-22, 3, 3.9), "[WEST]" = list(22, 28))
+
 ///////////////BOATS////////////
 /datum/riding/boat
 	keytype = /obj/item/weapon/oar
@@ -297,17 +265,15 @@

 /datum/riding/boat/dragon
 	keytype = null
-	generic_pixel_y = 2
-	generic_pixel_x = 1
 	vehicle_move_delay = 1

+/datum/riding/boat/dragon/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(1, 2), "[SOUTH]" = list(1, 2), "[EAST]" = list(1, 2), "[WEST]" = list( 1, 2))

 ///////////////ANIMALS////////////
 //general animals
 /datum/riding/animal
 	keytype = null
-	generic_pixel_x = 0
-	generic_pixel_y = 4

 /datum/riding/animal/handle_ride(mob/user, direction)
 	if(user.incapacitated())
@@ -335,7 +301,7 @@
 /datum/riding/human/ride_check(mob/living/M)
 	var/mob/living/carbon/human/H = ridden	//IF this runtimes I'm blaming the admins.
 	if(M.incapacitated(FALSE, TRUE) || H.incapacitated(FALSE, TRUE))
-		M.visible_message("<span class='warning'>[M] falls off [ridden]!</span>")
+		M.visible_message("<span class='boldwarning'>[M] falls off of [ridden]!</span>")
 		Unbuckle(M)
 		return FALSE
 	if(M.restrained(TRUE))
@@ -345,22 +311,8 @@
 	if(H.pulling == M)
 		H.stop_pulling()

-/datum/riding/human/handle_vehicle_offsets()
-	for(var/mob/living/M in ridden.buckled_mobs)
-		M.setDir(ridden.dir)
-		switch(ridden.dir)
-			if(NORTH)
-				M.pixel_x = 0
-				M.pixel_y = 6
-			if(SOUTH)
-				M.pixel_x = 0
-				M.pixel_y = 6
-			if(EAST)
-				M.pixel_x = -6
-				M.pixel_y = 4
-			if(WEST)
-				M.pixel_x = 6
-				M.pixel_y = 4
+/datum/riding/human/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 6), "[SOUTH]" = list(0, 6), "[EAST]" = list(-6, 4), "[WEST]" = list( 6, 4))

 /datum/riding/human/handle_vehicle_layer()
 	if(ridden.buckled_mobs && ridden.buckled_mobs.len)
@@ -375,7 +327,7 @@
 	ridden.unbuckle_mob(user)
 	user.Weaken(3)
 	user.Stun(3)
-	user.visible_message("<span class='warning'>[ridden] pushes [user] off of them!</span>")
+	user.visible_message("<span class='boldwarning'>[ridden] pushes [user] off of them!</span>")

 /datum/riding/cyborg
 	keytype = null
@@ -407,6 +359,9 @@
 	else
 		ridden.layer = MOB_LAYER

+/datum/riding/cyborg/get_offsets(pass_index) // list(dir = x, y, layer)
+	return list("[NORTH]" = list(0, 4), "[SOUTH]" = list(0, 4), "[EAST]" = list(-6, 3), "[WEST]" = list( 6, 3))
+
 /datum/riding/cyborg/handle_vehicle_offsets()
 	if(ridden.has_buckled_mobs())
 		for(var/mob/living/M in ridden.buckled_mobs)
@@ -417,26 +372,14 @@
 					M.pixel_x = R.module.ride_offset_x[dir2text(ridden.dir)]
 					M.pixel_y = R.module.ride_offset_y[dir2text(ridden.dir)]
 			else
-				switch(ridden.dir)
-					if(NORTH)
-						M.pixel_x = 0
-						M.pixel_y = 4
-					if(SOUTH)
-						M.pixel_x = 0
-						M.pixel_y = 4
-					if(EAST)
-						M.pixel_x = -6
-						M.pixel_y = 3
-					if(WEST)
-						M.pixel_x = 6
-						M.pixel_y = 3
+				..()

 /datum/riding/cyborg/force_dismount(mob/living/M)
 	ridden.unbuckle_mob(M)
 	var/turf/target = get_edge_target_turf(ridden, ridden.dir)
 	var/turf/targetm = get_step(get_turf(ridden), ridden.dir)
 	M.Move(targetm)
-	M.visible_message("<span class='warning'>[M] is thrown clear of [ridden]!</span>")
+	M.visible_message("<span class='boldwarning'>[M] is thrown clear of [ridden]!</span>")
 	M.throw_at(target, 14, 5, ridden)
 	M.Weaken(3)

@@ -181,6 +181,7 @@
 		marked_underlay.pixel_x = -owner.pixel_x
 		marked_underlay.pixel_y = -owner.pixel_y
 		owner.underlays += marked_underlay
+		return TRUE
 	return FALSE

 /datum/status_effect/crusher_mark/Destroy()
@@ -86,6 +86,7 @@
 /area/lavaland
 	icon_state = "mining"
 	has_gravity = 1
+	flags = NONE

 /area/lavaland/surface
 	name = "Lavaland"
@@ -123,4 +124,4 @@
 	icon_state = "danger"

 /area/lavaland/surface/outdoors/explored
-	name = "Lavaland Labor Camp"
+	name = "Lavaland Labor Camp"
@@ -5,6 +5,7 @@
 	icon_state = "away"
 	has_gravity = 1
 	hidden = TRUE
+	dynamic_lighting = DYNAMIC_LIGHTING_FORCED


 /area/ruin/unpowered
@@ -199,3 +200,15 @@
 /area/ruin/abandonedzoo
 	name = "Abandoned Zoo"
 	icon_state = "green"
+	
+	
+//Xeno Nest
+	
+/area/ruin/xenonest
+	name = "The Hive"
+	always_unpowered = 1
+	power_environ = 0
+	power_equip = 0
+	power_light = 0
+	poweralm = 0
+	
@@ -104,6 +104,9 @@

 	return ..()

+/atom/proc/handle_ricochet(obj/item/projectile/P)
+	return
+
 /atom/proc/CanPass(atom/movable/mover, turf/target, height=1.5)
 	return (!density || !height)

@@ -171,14 +171,6 @@ Credit where due:
 		return TRUE
 	return FALSE

-/datum/game_mode/clockwork_cult/proc/present_tasks(mob/living/L) //Memorizes and displays the clockwork cult's objective
-	if(!L || !istype(L) || !L.mind)
-		return 0
-	var/datum/mind/M = L.mind
-	to_chat(M.current, "<b>This is Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]")
-	M.memory += "<b>Ratvar's will:</b> [CLOCKCULT_OBJECTIVE]<br>"
-	return 1
-
 /datum/game_mode/clockwork_cult/proc/check_clockwork_victory()
 	if(GLOB.clockwork_gateway_activated)
 		SSticker.news_report = CLOCK_PROSELYTIZATION //failure, technically, but we have the station
@@ -375,8 +375,8 @@
 	desc = "Used by veteran cultists to instantly transport items to their needful bretheren."
 	w_class = WEIGHT_CLASS_SMALL
 	brightness_on = 1
-	icon_state = "torch-on"
-	item_state = "torch-on"
+	icon_state = "torch"
+	item_state = "torch"
 	color = "#ff0000"
 	on_damage = 15
 	slot_flags = null
@@ -53,7 +53,6 @@
 		/datum/gang_item/weapon/ammo/uzi_ammo,
 		/datum/gang_item/equipment/sharpener,
 		/datum/gang_item/equipment/spraycan,
-		/datum/gang_item/equipment/sharpener,
 		/datum/gang_item/equipment/emp,
 		/datum/gang_item/equipment/c4,
 		/datum/gang_item/equipment/frag,
@@ -91,7 +90,6 @@
 		/datum/gang_item/weapon/ammo/uzi_ammo,
 		/datum/gang_item/equipment/sharpener,
 		/datum/gang_item/equipment/spraycan,
-		/datum/gang_item/equipment/sharpener,
 		/datum/gang_item/equipment/emp,
 		/datum/gang_item/equipment/c4,
 		/datum/gang_item/equipment/frag,
@@ -422,7 +422,7 @@
 			return FALSE

 	if(dominator_excessive_walls(user))
-		to_chat(user, "span class='warning'>The <b>dominator</b> will not function here! The <b>dominator</b> requires a sizable open space within three standard units so that walls do not interfere with the signal.</span>")
+		to_chat(user, "<span class='warning'>The <b>dominator</b> will not function here! The <b>dominator</b> requires a sizable open space within three standard units so that walls do not interfere with the signal.</span>")
 		return FALSE

 	if(!(usrarea.type in gang.territory|gang.territory_new))
@@ -70,12 +70,12 @@
 	origin.vest_mode_action.Remove(C)
 	origin.vest_disguise_action.Remove(C)
 	origin.set_droppoint_action.Remove(C)
-	remote_eye.eye_user = null
 	C.reset_perspective(null)
 	if(C.client)
 		C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-			C.client.images -= chunk.obscured
+			chunk.remove(remote_eye)
+	remote_eye.eye_user = null
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)
@@ -15,7 +15,7 @@
 	var/icon_stun = "revenant_stun"
 	var/icon_drain = "revenant_draining"
 	var/stasis = FALSE
-	incorporeal_move = 3
+	incorporeal_move = INCORPOREAL_MOVE_JAUNT
 	invisibility = INVISIBILITY_REVENANT
 	health = INFINITY //Revenants don't use health, they use essence instead
 	maxHealth = INFINITY
@@ -102,7 +102,7 @@
 	if(unreveal_time && world.time >= unreveal_time)
 		unreveal_time = 0
 		revealed = FALSE
-		incorporeal_move = 3
+		incorporeal_move = INCORPOREAL_MOVE_JAUNT
 		invisibility = INVISIBILITY_REVENANT
 		to_chat(src, "<span class='revenboldnotice'>You are once more concealed.</span>")
 	if(unstun_time && world.time >= unstun_time)
@@ -222,7 +222,7 @@
 	R.essence = max(reforming_essence - 15 * perfectsouls, 75) //minus any perfect souls
 	R.client_to_revive = client //If the essence reforms, the old revenant is put back in the body
 	R.revenant = src
-	invisibility = INVISIBILITY_ABSTRACT 
+	invisibility = INVISIBILITY_ABSTRACT
 	revealed = FALSE
 	ghostize(0)//Don't re-enter invisible corpse
 	return
@@ -236,7 +236,7 @@
 		return
 	revealed = TRUE
 	invisibility = 0
-	incorporeal_move = 0
+	incorporeal_move = FALSE
 	if(!unreveal_time)
 		to_chat(src, "<span class='revendanger'>You have been revealed!</span>")
 		unreveal_time = world.time + time
@@ -309,12 +309,12 @@

 /mob/living/simple_animal/revenant/proc/death_reset()
 	revealed = FALSE
-	unreveal_time = 0 
+	unreveal_time = 0
 	notransform = 0
 	unstun_time = 0
 	inhibited = FALSE
 	draining = FALSE
-	incorporeal_move = 3
+	incorporeal_move = INCORPOREAL_MOVE_JAUNT
 	invisibility = INVISIBILITY_REVENANT
 	alpha=255
 	stasis = FALSE
@@ -1,6 +1,8 @@
 #define PINPOINTER_MINIMUM_RANGE 15 
 #define PINPOINTER_EXTRA_RANDOM_RANGE 10
 #define PINPOINTER_PING_TIME 40
+#define PROB_ACTUAL_TRAITOR 20
+#define TRAITOR_AGENT_ROLE "Syndicate External Affairs Agent"

 /datum/game_mode/traitor/internal_affairs
 	name = "Internal Affairs"
@@ -171,7 +173,10 @@
 			if(!objective.check_completion())
 				traitored = FALSE
 				return
-		to_chat(owner.current,"<span class='userdanger'> All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.</span>")
+		if(owner.special_role == TRAITOR_AGENT_ROLE)
+			to_chat(owner.current,"<span class='userdanger'> All the loyalist agents are dead, and no more is required of you. Die a glorious death, agent. </span>")
+		else
+			to_chat(owner.current,"<span class='userdanger'> All the other agents are dead, and you're the last loose end. Stage a Syndicate terrorist attack to cover up for today's events. You no longer have any limits on collateral damage.</span>")
 		replace_escape_objective(owner)
 		
 			
@@ -194,7 +199,10 @@
 				if(objective.stolen)
 					var/fail_msg = "<span class='userdanger'>Your sensors tell you that [objective.target.current.real_name], one of the targets you were meant to have killed, pulled one over on you, and is still alive - do the job properly this time! </span>"
 					if(traitored)
-						fail_msg += "<span class='userdanger'> The truth could still slip out!</font><B><font size=5 color=red> Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated.</span>"
+						if(owner.special_role == TRAITOR_AGENT_ROLE)
+							fail_msg += "<span class='userdanger'> You no longer have permission to die. </span>"
+						else
+							fail_msg += "<span class='userdanger'> The truth could still slip out!</font><B><font size=5 color=red> Cease any terrorist actions as soon as possible, unneeded property damage or loss of employee life will lead to your contract being terminated.</span>"
 						reinstate_escape_objective(owner)
 						traitored = FALSE
 					to_chat(owner.current, fail_msg)
@@ -238,6 +246,10 @@
 		state.add_steal_targets_timer()
 		if(!issilicon(traitor.current))
 			give_pinpointer(traitor)
+		//Optional traitor objective
+		if(prob(PROB_ACTUAL_TRAITOR))
+			traitor.special_role = TRAITOR_AGENT_ROLE
+			forge_single_objective(traitor)	

 	else
 		..() // Give them standard objectives.
@@ -289,11 +301,18 @@

 /datum/game_mode/traitor/internal_affairs/greet_traitor(datum/mind/traitor)
 	var/crime = pick("distribution of contraband" , "unauthorized erotic action on duty", "embezzlement", "piloting under the influence", "dereliction of duty", "syndicate collaboration", "mutiny", "multiple homicides", "corporate espionage", "recieving bribes", "malpractice", "worship of prohbited life forms", "possession of profane texts", "murder", "arson", "insulting their manager", "grand theft", "conspiracy", "attempting to unionize", "vandalism", "gross incompetence")
-	to_chat(traitor.current, "<span class='userdanger'>You are the [traitor_name].</span>")
-	to_chat(traitor.current, "<span class='userdanger'>Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.</span>")
-	to_chat(traitor.current, "<B><font size=5 color=red>While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.</font></B>")
-	to_chat(traitor.current, "<span class='userdanger'>For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.</span>")
-	to_chat(traitor.current, "<span class='userdanger'>Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.</span>")
+	if(traitor.special_role == TRAITOR_AGENT_ROLE)
+		to_chat(traitor.current, "<span class='userdanger'>You are the [TRAITOR_AGENT_ROLE].</span>")
+		to_chat(traitor.current, "<span class='userdanger'>Your target has been framed for [crime], and you have been tasked with eliminating them to prevent them defending themselves in court.</span>")
+		to_chat(traitor.current, "<B><font size=5 color=red>Any damage you cause will be a further embarrassment to Nanotrasen, so you have no limits on collateral damage.</font></B>")
+		to_chat(traitor.current, "<span class='userdanger'> You have been provided with a standard uplink to accomplish your task. </span>")
+		to_chat(traitor.current, "<span class='userdanger'>Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.</span>")
+	else
+		to_chat(traitor.current, "<span class='userdanger'>You are the [traitor_name].</span>")
+		to_chat(traitor.current, "<span class='userdanger'>Your target is suspected of [crime], and you have been tasked with eliminating them by any means necessary to avoid a costly and embarrassing public trial.</span>")
+		to_chat(traitor.current, "<B><font size=5 color=red>While you have a license to kill, unneeded property damage or loss of employee life will lead to your contract being terminated.</font></B>")
+		to_chat(traitor.current, "<span class='userdanger'>For the sake of plausible deniability, you have been equipped with an array of captured Syndicate weaponry available via uplink.</span>")
+		to_chat(traitor.current, "<span class='userdanger'>Finally, watch your back. Your target has friends in high places, and intel suggests someone may have taken out a contract of their own to protect them.</span>")
 	traitor.announce_objectives()


@@ -301,6 +320,8 @@
 /datum/game_mode/traitor/internal_affairs/give_codewords(mob/living/traitor_mob)
 	return

+#undef PROB_ACTUAL_TRAITOR
 #undef PINPOINTER_EXTRA_RANDOM_RANGE
 #undef PINPOINTER_MINIMUM_RANGE
 #undef PINPOINTER_PING_TIME
+
@@ -85,40 +85,65 @@
 	character.make_Traitor()


+/datum/game_mode/proc/forge_single_objective(datum/mind/traitor) //Returns how many objectives are added
+	.=1
+	if(issilicon(traitor.current))
+		var/special_pick = rand(1,4)
+		switch(special_pick)
+			if(1)
+				var/datum/objective/block/block_objective = new
+				block_objective.owner = traitor
+				traitor.objectives += block_objective
+			if(2)
+				var/datum/objective/purge/purge_objective = new
+				purge_objective.owner = traitor
+				traitor.objectives += purge_objective
+			if(3)
+				var/datum/objective/robot_army/robot_objective = new
+				robot_objective.owner = traitor
+				traitor.objectives += robot_objective
+			if(4) //Protect and strand a target
+				var/datum/objective/protect/yandere_one = new
+				yandere_one.owner = traitor
+				traitor.objectives += yandere_one
+				yandere_one.find_target()
+				var/datum/objective/maroon/yandere_two = new
+				yandere_two.owner = traitor
+				yandere_two.target = yandere_one.target
+				yandere_two.update_explanation_text() // normally called in find_target()
+				traitor.objectives += yandere_two
+				.=2
+	else
+		if(prob(50))
+			var/list/active_ais = active_ais()
+			if(active_ais.len && prob(100/GLOB.joined_player_list.len))
+				var/datum/objective/destroy/destroy_objective = new
+				destroy_objective.owner = traitor
+				destroy_objective.find_target()
+				traitor.objectives += destroy_objective
+			else if(prob(30))
+				var/datum/objective/maroon/maroon_objective = new
+				maroon_objective.owner = traitor
+				maroon_objective.find_target()
+				traitor.objectives += maroon_objective
+			else
+				var/datum/objective/assassinate/kill_objective = new
+				kill_objective.owner = traitor
+				kill_objective.find_target()
+				traitor.objectives += kill_objective
+		else
+			var/datum/objective/steal/steal_objective = new
+			steal_objective.owner = traitor
+			steal_objective.find_target()
+			traitor.objectives += steal_objective
+	
+
 /datum/game_mode/proc/forge_traitor_objectives(datum/mind/traitor)
 	if(issilicon(traitor.current))
 		var/objective_count = 0

 		if(prob(30))
-			var/special_pick = rand(1,4)
-			switch(special_pick)
-				if(1)
-					var/datum/objective/block/block_objective = new
-					block_objective.owner = traitor
-					traitor.objectives += block_objective
-					objective_count++
-				if(2)
-					var/datum/objective/purge/purge_objective = new
-					purge_objective.owner = traitor
-					traitor.objectives += purge_objective
-					objective_count++
-				if(3)
-					var/datum/objective/robot_army/robot_objective = new
-					robot_objective.owner = traitor
-					traitor.objectives += robot_objective
-					objective_count++
-				if(4) //Protect and strand a target
-					var/datum/objective/protect/yandere_one = new
-					yandere_one.owner = traitor
-					traitor.objectives += yandere_one
-					yandere_one.find_target()
-					objective_count++
-					var/datum/objective/maroon/yandere_two = new
-					yandere_two.owner = traitor
-					yandere_two.target = yandere_one.target
-					yandere_two.update_explanation_text() // normally called in find_target()
-					traitor.objectives += yandere_two
-					objective_count++
+			objective_count+=forge_single_objective(traitor)

 		for(var/i = objective_count, i < config.traitor_objectives_amount, i++)
 			var/datum/objective/assassinate/kill_objective = new
@@ -142,29 +167,8 @@
 				assign_exchange_role(exchange_red)
 				assign_exchange_role(exchange_blue)
 			objective_count += 1					//Exchange counts towards number of objectives
-		var/list/active_ais = active_ais()
 		for(var/i = objective_count, i < config.traitor_objectives_amount, i++)
-			if(prob(50))
-				if(active_ais.len && prob(100/GLOB.joined_player_list.len))
-					var/datum/objective/destroy/destroy_objective = new
-					destroy_objective.owner = traitor
-					destroy_objective.find_target()
-					traitor.objectives += destroy_objective
-				else if(prob(30))
-					var/datum/objective/maroon/maroon_objective = new
-					maroon_objective.owner = traitor
-					maroon_objective.find_target()
-					traitor.objectives += maroon_objective
-				else
-					var/datum/objective/assassinate/kill_objective = new
-					kill_objective.owner = traitor
-					kill_objective.find_target()
-					traitor.objectives += kill_objective
-			else
-				var/datum/objective/steal/steal_objective = new
-				steal_objective.owner = traitor
-				steal_objective.find_target()
-				traitor.objectives += steal_objective
+			forge_single_objective(traitor)

 		if(is_hijacker && objective_count <= config.traitor_objectives_amount) //Don't assign hijack if it would exceed the number of objectives set in config.traitor_objectives_amount
 			if (!(locate(/datum/objective/hijack) in traitor.objectives))
@@ -3,6 +3,7 @@
 	icon = 'icons/obj/wizard.dmi'
 	icon_state = "soulstone"
 	item_state = "electronic"
+	layer = HIGH_OBJ_LAYER
 	desc = "A fragment of the legendary treasure known simply as the 'Soul Stone'. The shard still flickers with a fraction of the full artefact's power."
 	w_class = WEIGHT_CLASS_TINY
 	slot_flags = SLOT_BELT
@@ -213,12 +214,12 @@
 	var/obj/screen/alert/bloodsense/BS
 	if(newstruct.mind && ((stoner && iscultist(stoner)) || cultoverride) && SSticker && SSticker.mode)
 		SSticker.mode.add_cultist(newstruct.mind, 0)
-		BS = newstruct.alerts.Find("bloodsense")
 	if(iscultist(stoner) || cultoverride)
 		to_chat(newstruct, "<b>You are still bound to serve the cult[stoner ? " and [stoner]":""], follow their orders and help them complete their goals at all costs.</b>")
 	else if(stoner)
 		to_chat(newstruct, "<b>You are still bound to serve your creator, [stoner], follow their orders and help them complete their goals at all costs.</b>")
-		BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
+	newstruct.clear_alert("bloodsense")
+	BS = newstruct.throw_alert("bloodsense", /obj/screen/alert/bloodsense)
 	if(BS)
 		BS.Cviewer = newstruct
 	newstruct.cancel_camera()
@@ -44,8 +44,8 @@
 		"corazone", // prevents cardiac arrest damage
 		"mimesbane") // stops them gasping from lack of air.

-/obj/machinery/clonepod/New()
-	..()
+/obj/machinery/clonepod/Initialize()
+	. = ..()
 	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/clonepod(null)
 	B.apply_default_parts(src)

@@ -358,8 +358,12 @@
 /obj/machinery/clonepod/proc/go_out()
 	countdown.stop()
 	var/mob/living/mob_occupant = occupant
+	var/turf/T = get_turf(src)

 	if(mess) //Clean that mess and dump those gibs!
+		for(var/obj/fl in unattached_flesh)
+			fl.forceMove(T)
+		unattached_flesh.Cut()
 		mess = FALSE
 		new /obj/effect/gibspawner/generic(loc)
 		audible_message("<span class='italics'>You hear a splat.</span>")
@@ -375,10 +379,12 @@
 		to_chat(occupant, "<span class='notice'><b>There is a bright flash!</b><br><i>You feel like a new being.</i></span>")
 		mob_occupant.flash_act()

-	var/turf/T = get_turf(src)
 	occupant.forceMove(T)
 	icon_state = "pod_0"
 	mob_occupant.domutcheck(1) //Waiting until they're out before possible monkeyizing. The 1 argument forces powers to manifest.
+	for(var/fl in unattached_flesh)
+		qdel(fl)
+	unattached_flesh.Cut()

 	occupant = null

@@ -389,8 +395,7 @@
 		SPEAK("Critical error! Please contact a Thinktronic Systems \
 			technician, as your warranty may be affected.")
 		mess = TRUE
-		for(var/obj/item/O in unattached_flesh)
-			qdel(O)
+		maim_clone(mob_occupant)	//Remove every bit that's grown back so far to drop later, also destroys bits that haven't grown yet
 		icon_state = "pod_g"
 		if(mob_occupant.mind != clonemind)
 			clonemind.transfer_to(mob_occupant)
@@ -450,9 +455,10 @@
 	var/static/list/zones = list("r_arm", "l_arm", "r_leg", "l_leg")
 	for(var/zone in zones)
 		var/obj/item/bodypart/BP = H.get_bodypart(zone)
-		BP.drop_limb()
-		BP.forceMove(src)
-		unattached_flesh += BP
+		if(BP)
+			BP.drop_limb()
+			BP.forceMove(src)
+			unattached_flesh += BP

 	for(var/o in H.internal_organs)
 		var/obj/item/organ/organ = o
@@ -178,7 +178,7 @@
 /obj/item/weapon/circuitboard/computer/xenobiology
 	name = "circuit board (Xenobiology Console)"
 	build_path = /obj/machinery/computer/camera_advanced/xenobio
-	origin_tech = "programming=3;bio=3"
+	origin_tech = "programming=3;biotech=3"
 /obj/item/weapon/circuitboard/computer/base_construction
 	name = "circuit board (Aux Mining Base Construction Console)"
 	build_path = /obj/machinery/computer/camera_advanced/base_construction
@@ -151,13 +151,13 @@ obj/machinery/computer/camera_advanced/attack_ai(mob/user)
 	var/mob/camera/aiEye/remote/remote_eye = C.remote_control
 	remote_eye.origin.current_user = null
 	remote_eye.origin.jump_action.Remove(C)
-	remote_eye.eye_user = null
 	if(C.client)
 		C.reset_perspective(null)
 		if(remote_eye.visible_icon)
 			C.client.images -= remote_eye.user_image
 		for(var/datum/camerachunk/chunk in remote_eye.visibleCameraChunks)
-			C.client.images -= chunk.obscured
+			chunk.remove(remote_eye)
+	remote_eye.eye_user = null
 	C.remote_control = null
 	C.unset_machine()
 	Remove(C)
@@ -54,7 +54,7 @@
 /obj/machinery/computer/communications/Topic(href, href_list)
 	if(..())
 		return
-	if (src.z > ZLEVEL_CENTCOM) //Can only use on centcom and SS13
+	if (z != ZLEVEL_STATION && z != ZLEVEL_CENTCOM) //Can only use on centcom and SS13
 		to_chat(usr, "<span class='boldannounce'>Unable to establish a connection</span>: \black You're too far away from the station!")
 		return
 	usr.set_machine(src)
@@ -292,7 +292,7 @@
 				src.temp = text("Are you sure you wish to delete all records?<br>\n\t<A href='?src=\ref[];temp=1;del_all2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)

 			else if(href_list["del_all2"])
-				investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", "records")
+				investigate_log("[usr.name] ([usr.key]) has deleted all medical records.", INVESTIGATE_RECORDS)
 				GLOB.data_core.medical.Cut()
 				src.temp = "All records deleted."

@@ -458,7 +458,7 @@
 					src.temp = text("Are you sure you wish to delete the record (Medical Portion Only)?<br>\n\t<A href='?src=\ref[];temp=1;del_r2=1'>Yes</A><br>\n\t<A href='?src=\ref[];temp=1'>No</A><br>", src, src)

 			else if(href_list["del_r2"])
-				investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", "records")
+				investigate_log("[usr.name] ([usr.key]) has deleted the medical records for [active1.fields["name"]].", INVESTIGATE_RECORDS)
 				if(active2)
 					qdel(active2)
 					active2 = null
@@ -452,7 +452,7 @@ What a mess.*/
 				temp += "<a href='?src=\ref[src];choice=Clear Screen'>No</a>"

 			if("Purge All Records")
-				investigate_log("[usr.name] ([usr.key]) has purged all the security records.", "records")
+				investigate_log("[usr.name] ([usr.key]) has purged all the security records.", INVESTIGATE_RECORDS)
 				for(var/datum/data/record/R in GLOB.data_core.security)
 					qdel(R)
 				GLOB.data_core.security.Cut()
@@ -696,18 +696,18 @@ What a mess.*/
 									active2.fields["criminal"] = "Parolled"
 								if("released")
 									active2.fields["criminal"] = "Discharged"
-							investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", "records")
+							investigate_log("[active1.fields["name"]] has been set from [old_field] to [active2.fields["criminal"]] by [usr.name] ([usr.key]).", INVESTIGATE_RECORDS)
 							for(var/mob/living/carbon/human/H in GLOB.mob_list) //thanks for forcing me to do this, whoever wrote this shitty records system
 								H.sec_hud_set_security_status()
 					if("Delete Record (Security) Execute")
-						investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", "records")
+						investigate_log("[usr.name] ([usr.key]) has deleted the security records for [active1.fields["name"]].", INVESTIGATE_RECORDS)
 						if(active2)
 							qdel(active2)
 							active2 = null

 					if("Delete Record (ALL) Execute")
 						if(active1)
-							investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", "records")
+							investigate_log("[usr.name] ([usr.key]) has deleted all records for [active1.fields["name"]].", INVESTIGATE_RECORDS)
 							for(var/datum/data/record/R in GLOB.data_core.medical)
 								if((R.fields["name"] == active1.fields["name"] || R.fields["id"] == active1.fields["id"]))
 									qdel(R)
@@ -317,7 +317,7 @@


 /obj/machinery/disco/proc/dance(var/mob/living/M) //Show your moves
-
+	set waitfor = FALSE
 	switch(rand(0,9))
 		if(0 to 1)
 			dance2(M)
@@ -97,7 +97,14 @@
 	var/static/list/airlock_overlays = list()

 /obj/machinery/door/airlock/Initialize()
-	..()
+	. = ..()
+	
+	if (cyclelinkeddir)
+		cyclelinkairlock()
+	if(frequency)
+		set_frequency(frequency)
+	update_icon()
+	
 	wires = new /datum/wires/airlock(src)
 	if(src.closeOtherId != null)
 		spawn (5)
@@ -120,14 +127,6 @@
 	diag_hud.add_to_hud(src)
 	diag_hud_set_electrified()

-/obj/machinery/door/airlock/Initialize()
-	..()
-	if (cyclelinkeddir)
-		cyclelinkairlock()
-	if(frequency)
-		set_frequency(frequency)
-	update_icon()
-
 /obj/machinery/door/airlock/proc/cyclelinkairlock()
 	if (cyclelinkedairlock)
 		cyclelinkedairlock.cyclelinkedairlock = null
@@ -199,14 +198,11 @@
 	qdel(src)

 /obj/machinery/door/airlock/Destroy()
-	qdel(wires)
-	wires = null
+	QDEL_NULL(wires)
 	if(charge)
 		qdel(charge)
 		charge = null
-	if(electronics)
-		qdel(electronics)
-		electronics = null
+	QDEL_NULL(electronics)
 	if (cyclelinkedairlock)
 		if (cyclelinkedairlock.cyclelinkedairlock == src)
 			cyclelinkedairlock.cyclelinkedairlock = null
@@ -143,7 +143,7 @@
 	else
 		log_msg += "nothing"
 	log_msg += " [sending ? "to" : "from"] [target_x], [target_y], [z] ([A ? A.name : "null area"])"
-	investigate_log(log_msg.Join(), "telesci")
+	investigate_log(log_msg.Join(), INVESTIGATE_TELESCI)
 	updateDialog()

 //Starts in the briefcase. Don't spawn this directly, or it will runtime when closing.
@@ -227,7 +227,6 @@
 				update_icon()


-
 /obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params)
 	if(stat & BROKEN)
 		if(istype(I, /obj/item/weapon/crowbar))
@@ -553,6 +552,7 @@
 	use_power = 0
 	has_cover = 0
 	scan_range = 9
+	req_access = list(GLOB.access_syndicate)
 	stun_projectile = /obj/item/projectile/bullet
 	lethal_projectile = /obj/item/projectile/bullet
 	lethal_projectile_sound = 'sound/weapons/Gunshot.ogg'
@@ -569,6 +569,8 @@
 	return 10 //Syndicate turrets shoot everything not in their faction

 /obj/machinery/porta_turret/syndicate/pod
+	max_integrity = 40
+	integrity_failure = 20
 	obj_integrity = 40
 	stun_projectile = /obj/item/projectile/bullet/weakbullet3
 	lethal_projectile = /obj/item/projectile/bullet/weakbullet3
@@ -944,6 +946,7 @@
 	var/atom/target
 	var/turf/target_turf
 	var/warned = FALSE
+	var/mouseparams

 //BUCKLE HOOKS

@@ -987,8 +990,8 @@
 	icon = 'icons/obj/weapons.dmi'
 	icon_state = "offhand"
 	w_class = WEIGHT_CLASS_HUGE
-	flags = ABSTRACT | NODROP
-	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON
+	flags = ABSTRACT | NODROP | NOBLUDGEON
+	resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF
 	var/obj/machinery/manned_turret/turret

 /obj/item/gun_control/New(obj/machinery/manned_turret/MT)
@@ -1000,11 +1003,22 @@
 /obj/item/gun_control/CanItemAutoclick()
 	return 1

-/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user)
+/obj/item/gun_control/attack_obj(obj/O, mob/living/user)
+	user.changeNext_move(CLICK_CD_MELEE)
+	O.attacked_by(src, user)
+
+/obj/item/gun_control/attack(mob/living/M, mob/living/user)
+	user.lastattacked = M
+	M.lastattacker = user
+	M.attacked_by(src, user)
+	add_fingerprint(user)
+
+/obj/item/gun_control/afterattack(atom/targeted_atom, mob/user, flag, params)
 	..()
 	var/obj/machinery/manned_turret/E = user.buckled
 	E.setDir(get_dir(E,targeted_atom))
 	user.setDir(E.dir)
+	E.mouseparams = params
 	switch(E.dir)
 		if(NORTH)
 			E.layer = BELOW_MOB_LAYER
@@ -1052,15 +1066,15 @@
 	else
 		cooldown = world.time + cooldown_duration
 		warned = FALSE
-		INVOKE_ASYNC(src, /obj/machinery/manned_turret/.proc/volley)
+		volley(user)

-/obj/machinery/manned_turret/proc/volley()
+/obj/machinery/manned_turret/proc/volley(mob/user)
 	target_turf = get_turf(target)
 	for(var/i in 1 to number_of_shots)
-		addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper), i*rate_of_fire)
+		addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)


-/obj/machinery/manned_turret/proc/fire_helper()
+/obj/machinery/manned_turret/proc/fire_helper(mob/user)
 	if(!src)
 		return
 	var/turf/targets_from = get_turf(src)
@@ -1069,11 +1083,10 @@
 	var/obj/item/projectile/P = new projectile_type(targets_from)
 	P.current = targets_from
 	P.starting = targets_from
-	P.firer = src
+	P.firer = user
 	P.original = target
 	playsound(src, 'sound/weapons/Gunshot_smg.ogg', 75, 1)
-	P.yo = target.y - targets_from.y + rand(-1,1)
-	P.xo = target.x - targets_from.x + rand(-1,1)
+	P.preparePixelProjectile(target, target_turf, user, mouseparams, rand(-9, 9))
 	P.fire()

 /obj/machinery/manned_turret/ultimate  // Admin-only proof of concept for autoclicker automatics
@@ -10,6 +10,7 @@
 /obj/effect/forcefield/cult
 	desc = "An unholy shield that blocks all attacks."
 	name = "glowing wall"
+	icon = 'icons/effects/cult_effects.dmi'
 	icon_state = "cultshield"

 ///////////Mimewalls///////////
@@ -632,7 +632,14 @@ GLOBAL_LIST_EMPTY(PDAs)
 		L = get(src, /mob/living/silicon)

 	if(L && L.stat != UNCONSCIOUS)
-		to_chat(L, "\icon[src] <b>Message from [source.owner] ([source.ownjob]), </b>\"[msg.message]\"[msg.get_photo_ref()] (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[source]'>Reply</a>)")
+
+		var/hrefstart
+		var/hrefend
+		if (isAI(L))
+			hrefstart = "<a href='?src=\ref[L];track=[html_encode(source.owner)]'>"
+			hrefend = "</a>"
+
+		to_chat(L, "\icon[src.icon] <b>Message from [hrefstart][source.owner] ([source.ownjob])[hrefend], </b>\"[msg.message]\"[msg.get_photo_ref()] (<a href='byond://?src=\ref[src];choice=Message;skiprefresh=1;target=\ref[source]'>Reply</a>)")

 	update_icon()
 	add_overlay(icon_alert)
@@ -504,6 +504,8 @@
 		S.change_head_color(color2)
 		dropped = TRUE

+#define PKBORG_DAMPEN_CYCLE_DELAY 20
+
 //Peacekeeper Cyborg Projectile Dampenening Field
 /obj/item/borg/projectile_dampen
 	name = "Hyperkinetic Dampening projector"
@@ -526,6 +528,7 @@
 	var/image/projectile_effect
 	var/field_radius = 3
 	var/active = FALSE
+	var/cycle_delay = 0

 /obj/item/borg/projectile_dampen/debug
 	maxenergy = 50000
@@ -545,29 +548,31 @@
 	return ..()

 /obj/item/borg/projectile_dampen/attack_self(mob/user)
-	if(!istype(dampening_field))
-		activate_field()
-		active = TRUE
+	if(cycle_delay > world.time)
+		to_chat(user, "<span class='boldwarning'>\the [src] is still recycling its projectors!</span>")
+		return
+	cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY
+	active = !active
+	if(active)
+		activate_field(user)
 	else
 		deactivate_field()
-		active = FALSE
+	update_icon()
 	to_chat(user, "<span class='boldnotice'>You [active? "activate":"deactivate"] the [src].</span>")

 /obj/item/borg/projectile_dampen/update_icon()
-	. = ..()
 	icon_state = "[initial(icon_state)][active]"

 /obj/item/borg/projectile_dampen/proc/activate_field()
-	if(!istype(dampening_field))
-		dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
-	update_icon()
+	if(istype(dampening_field))
+		QDEL_NULL(dampening_field)
+	dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))

 /obj/item/borg/projectile_dampen/proc/deactivate_field()
 	QDEL_NULL(dampening_field)
-	visible_message("<span class='warning'>The [src] shuts off!</span>")
-	for(var/obj/item/projectile/P in tracked)
+	visible_message("<span class='warning'>\The [src] shuts off!</span>")
+	for(var/P in tracked)
 		restore_projectile(P)
-	update_icon()

 /obj/item/borg/projectile_dampen/dropped()
 	. = ..()
@@ -196,13 +196,6 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 		user.visible_message("[user] starts cutting hair off \the [src].", "<span class='notice'>You start cutting the hair off \the [src]...</span>", "<span class='italics'>You hear the sound of a knife rubbing against flesh.</span>")
 		if(do_after(user,50, target = src))
 			to_chat(user, "<span class='notice'>You cut the hair from this [src.singular_name].</span>")
-			//Try locating an exisitng stack on the tile and add to there if possible
-			for(var/obj/item/stack/sheet/hairlesshide/HS in user.loc)
-				if(HS.amount < 50)
-					HS.amount++
-					use(1)
-					break
-			//If it gets to here it means it did not find a suitable stack on the tile.
 			var/obj/item/stack/sheet/hairlesshide/HS = new(user.loc)
 			HS.amount = 1
 			use(1)
@@ -230,3 +223,9 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
 			HS.amount = 1
 			wetness = initial(wetness)
 			src.use(1)
+
+/obj/item/stack/sheet/wetleather/microwave_act(obj/machinery/microwave/MW)
+	..()
+	var/obj/item/stack/sheet/leather/L = new(loc)
+	L.amount = amount
+	qdel(src)
@@ -83,6 +83,14 @@
 	var/list/access = list()
 	var/registered_name = null // The name registered_name on the card
 	var/assignment = null
+	var/access_txt // mapping aid
+
+
+
+/obj/item/weapon/card/id/Initialize(mapload)
+	. = ..()
+	if(mapload && access_txt)
+		access = text2access(access_txt)

 /obj/item/weapon/card/id/attack_self(mob/user)
 	user.visible_message("<span class='notice'>[user] shows you: \icon[src] [src.name].</span>", \
@@ -54,10 +54,10 @@
 	var/obj/effect/chrono_field/field = null
 	var/turf/startpos = null

-/obj/item/weapon/gun/energy/chrono_gun/New(var/obj/item/weapon/chrono_eraser/T)
+/obj/item/weapon/gun/energy/chrono_gun/Initialize()
 	. = ..()
-	if(istype(T))
-		TED = T
+	if(istype(loc, /obj/item/weapon/chrono_eraser))
+		TED = loc
 	else //admin must have spawned it
 		TED = new(src.loc)
 		qdel(src)
@@ -622,6 +622,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	icon = 'icons/obj/clothing/masks.dmi'
 	icon_state = null
 	item_state = null
+	w_class = WEIGHT_CLASS_TINY
 	var/chem_volume = 100
 	var/vapetime = 0 //this so it won't puff out clouds every tick
 	var/screw = 0 // kinky
@@ -633,8 +634,8 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	return (TOXLOSS|OXYLOSS)


-/obj/item/clothing/mask/vape/New(loc, var/param_color = null)
-	..()
+/obj/item/clothing/mask/vape/Initialize(mapload, param_color)
+	. = ..()
 	create_reagents(chem_volume)
 	reagents.set_reacting(FALSE) // so it doesn't react until you light it
 	reagents.add_reagent("nicotine", 50)
@@ -23,14 +23,14 @@
 	var/combat = 0 //can we revive through space suits?
 	var/grab_ghost = FALSE // Do we pull the ghost back into their body?

-/obj/item/weapon/defibrillator/New() //starts without a cell for rnd
-	..()
+/obj/item/weapon/defibrillator/Initialize() //starts without a cell for rnd
+	. = ..()
 	paddles = make_paddles()
 	update_icon()
 	return

-/obj/item/weapon/defibrillator/loaded/New() //starts with hicap
-	..()
+/obj/item/weapon/defibrillator/loaded/Initialize() //starts with hicap
+	. = ..()
 	paddles = make_paddles()
 	bcell = new(src)
 	update_icon()
@@ -237,8 +237,8 @@
 	if(slot == user.getBeltSlot())
 		return 1

-/obj/item/weapon/defibrillator/compact/loaded/New()
-	..()
+/obj/item/weapon/defibrillator/compact/loaded/Initialize()
+	. = ..()
 	paddles = make_paddles()
 	bcell = new(src)
 	update_icon()
@@ -249,8 +249,8 @@
 	combat = 1
 	safety = 0

-/obj/item/weapon/defibrillator/compact/combat/loaded/New()
-	..()
+/obj/item/weapon/defibrillator/compact/combat/loaded/Initialize()
+	. = ..()
 	paddles = make_paddles()
 	bcell = new /obj/item/weapon/stock_parts/cell/infinite(src)
 	update_icon()
@@ -235,7 +235,7 @@

 	to_chat(user, "<span class='notice'>You start planting the bomb...</span>")

-	if(do_after(user, 50, target = AM))
+	if(do_after(user, 30, target = AM))
 		if(!user.temporarilyRemoveItemFromInventory(src))
 			return
 		src.target = AM
@@ -65,6 +65,7 @@
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
 	sharpness = IS_SHARP_ACCURATE
 	armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
+	var/bayonet = FALSE	//Can this be attached to a gun?

 /obj/item/weapon/kitchen/knife/attack(mob/living/carbon/M, mob/living/carbon/user)
 	if(user.zone_selected == "eyes")
@@ -107,7 +108,7 @@
 	throwforce = 20
 	origin_tech = "materials=3;combat=4"
 	attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "cut")
-
+	bayonet = TRUE

 /obj/item/weapon/kitchen/knife/combat/survival
 	name = "survival knife"
@@ -115,6 +116,7 @@
 	desc = "A hunting grade survival knife."
 	force = 15
 	throwforce = 15
+	bayonet = TRUE

 /obj/item/weapon/kitchen/knife/combat/bone
 	name = "bone dagger"
@@ -270,4 +270,4 @@

 /obj/item/weapon/pneumatic_cannon/pie/selfcharge/process()
 	if(++charge_tick >= charge_ticks)
-		fill_with_type(/obj/item/weapon/reagent_containers/food/snacks/pie, charge_amount)
+		fill_with_type(/obj/item/weapon/reagent_containers/food/snacks/pie/cream, charge_amount)
@@ -69,7 +69,7 @@
 		var/safety = alert(user, "Doing this will have extremely dire consequences for the station and its crew. Be sure you know what you're doing.", "Put in [name]?", "Proceed", "Abort")
 		if(safety == "Abort" || !in_range(src, user) || !src || !W || user.incapacitated())
 			return
-		investigate_log("has become a singularity. Caused by [user.key]","singulo")
+		investigate_log("has become a singularity. Caused by [user.key]", INVESTIGATE_SINGULO)
 		to_chat(user, "<span class='danger'>The Bluespace interfaces of the two devices catastrophically malfunction!</span>")
 		qdel(W)
 		var/obj/singularity/singulo = new /obj/singularity (get_turf(src))
@@ -21,10 +21,9 @@
 	user.visible_message("<span class='suicide'>[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return (FIRELOSS)

-/obj/item/weapon/melee/baton/New()
-	..()
+/obj/item/weapon/melee/baton/Initialize()
+	. = ..()
 	update_icon()
-	return

 /obj/item/weapon/melee/baton/throw_impact(atom/hit_atom)
 	..()
@@ -32,10 +31,9 @@
 	if(status && prob(throw_hit_chance) && iscarbon(hit_atom))
 		baton_stun(hit_atom)

-/obj/item/weapon/melee/baton/loaded/New() //this one starts with a cell pre-installed.
-	..()
+/obj/item/weapon/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
 	bcell = new(src)
-	update_icon()
+	. = ..()

 /obj/item/weapon/melee/baton/proc/deductcharge(chrgdeductamt)
 	if(bcell)
@@ -188,8 +186,8 @@
 	slot_flags = SLOT_BACK
 	var/obj/item/device/assembly/igniter/sparkler = 0

-/obj/item/weapon/melee/baton/cattleprod/New()
-	..()
+/obj/item/weapon/melee/baton/cattleprod/Initialize()
+	. = ..()
 	sparkler = new (src)

 /obj/item/weapon/melee/baton/cattleprod/baton_stun()
@@ -48,6 +48,8 @@
 	take_damage(tforce, BRUTE, "melee", 1, get_dir(src, AM))

 /obj/ex_act(severity, target)
+	if(resistance_flags & INDESTRUCTIBLE)
+		return
 	..() //contents explosion
 	if(target == src)
 		qdel(src)
@@ -256,4 +258,4 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
 	if(can_break && integrity_failure && current_integrity <= integrity_failure)
 		obj_break(damage_type)
 		return TRUE
-	return FALSE
+	return FALSE
@@ -5,7 +5,7 @@

 /obj/structure/easel
 	name = "easel"
-	desc = "only for the finest of art!"
+	desc = "Only for the finest of art!"
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "easel"
 	density = 1
@@ -49,7 +49,7 @@ GLOBAL_LIST_INIT(globalBlankCanvases, new(AMT_OF_CANVASES))

 /obj/item/weapon/canvas
 	name = "canvas"
-	desc = "draw out your soul on this canvas!"
+	desc = "Draw out your soul on this canvas!"
 	icon = 'icons/obj/artstuff.dmi'
 	icon_state = "11x11"
 	resistance_flags = FLAMMABLE
@@ -161,7 +161,16 @@
 	anchored = 0
 	buildstacktype = /obj/item/stack/sheet/mineral/wood
 	buildstackamount = 10
+	var/mob/living/owner = null

+/obj/structure/bed/dogbed/proc/update_owner(mob/living/M)
+	owner = M
+	name = "[M]'s bed"
+	desc = "[M]'s bed! Looks comfy."
+
+/obj/structure/bed/dogbed/buckle_mob(mob/living/M, force, check_loc)
+	. = ..()
+	update_owner(M)

 /obj/structure/bed/alien
 	name = "resting contraption"
@@ -146,49 +146,49 @@

 /obj/structure/sign/biohazard
 	name = "\improper BIOHAZARD"
-	desc = "A warning sign which reads 'BIOHAZARD'"
+	desc = "A warning sign which reads 'BIOHAZARD'."
 	icon_state = "bio"

 /obj/structure/sign/electricshock
 	name = "\improper HIGH VOLTAGE"
-	desc = "A warning sign which reads 'HIGH VOLTAGE'"
+	desc = "A warning sign which reads 'HIGH VOLTAGE'."
 	icon_state = "shock"

 /obj/structure/sign/examroom
 	name = "\improper EXAM ROOM"
-	desc = "A guidance sign which reads 'EXAM ROOM'"
+	desc = "A guidance sign which reads 'EXAM ROOM'."
 	icon_state = "examroom"

 /obj/structure/sign/vacuum
 	name = "\improper HARD VACUUM AHEAD"
-	desc = "A warning sign which reads 'HARD VACUUM AHEAD'"
+	desc = "A warning sign which reads 'HARD VACUUM AHEAD'."
 	icon_state = "space"

 /obj/structure/sign/deathsposal
 	name = "\improper DISPOSAL: LEADS TO SPACE"
-	desc = "A warning sign which reads 'DISPOSAL: LEADS TO SPACE'"
+	desc = "A warning sign which reads 'DISPOSAL: LEADS TO SPACE'."
 	icon_state = "deathsposal"

 /obj/structure/sign/pods
 	name = "\improper ESCAPE PODS"
-	desc = "A warning sign which reads 'ESCAPE PODS'"
+	desc = "A warning sign which reads 'ESCAPE PODS'."
 	icon_state = "pods"

 /obj/structure/sign/fire
 	name = "\improper DANGER: FIRE"
-	desc = "A warning sign which reads 'DANGER: FIRE'"
+	desc = "A warning sign which reads 'DANGER: FIRE'."
 	icon_state = "fire"


 /obj/structure/sign/nosmoking_1
 	name = "\improper NO SMOKING"
-	desc = "A warning sign which reads 'NO SMOKING'"
+	desc = "A warning sign which reads 'NO SMOKING'."
 	icon_state = "nosmoking"


 /obj/structure/sign/nosmoking_2
 	name = "\improper NO SMOKING"
-	desc = "A warning sign which reads 'NO SMOKING'"
+	desc = "A warning sign which reads 'NO SMOKING'."
 	icon_state = "nosmoking2"

 /obj/structure/sign/radiation
@@ -223,7 +223,7 @@

 /obj/structure/sign/nanotrasen
 	name = "\improper NanoTrasen Logo "
-	desc = "A sign with the Nanotrasen Logo on it.  Glory to Nanotrasen!"
+	desc = "A sign with the Nanotrasen Logo on it. Glory to Nanotrasen!"
 	icon_state = "nanotrasen"

 /obj/structure/sign/science			//These 3 have multiple types, just var-edit the icon_state to whatever one you want on the map
@@ -246,6 +246,12 @@
 	desc = "A sign labelling an area as a place where xenobiological entities are researched."
 	icon_state = "xenobio"

+/obj/structure/sign/xeno_warning_mining
+	name = "DANGEROUS ALIEN LIFE"
+	desc = "A sign that warns would-be travellers of hostile alien life in the vicinity."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "xeno_warning"
+
 /obj/structure/sign/enginesafety
 	name = "\improper ENGINEERING SAFETY"
 	desc = "A sign detailing the various safety protocols when working on-site to ensure a safe shift."
@@ -5,6 +5,9 @@
 	density = 1
 	blocks_air = 1

+/turf/closed/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	return FALSE
+
 /turf/closed/indestructible
 	name = "wall"
 	icon = 'icons/turf/walls.dmi'
@@ -24,9 +27,6 @@
 /turf/closed/indestructible/oldshuttle/corner
 	icon_state = "corner"

-
-
-
 /turf/closed/indestructible/splashscreen
 	name = "Space Station 13"
 	icon = 'config/title_screens/images/blank.png'
@@ -111,6 +111,11 @@
 	explosion_block = 50
 	baseturf = /turf/closed/indestructible/necropolis

+/turf/closed/indestructible/necropolis/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "necro1"
+	return TRUE
+
 /turf/closed/indestructible/riveted/hierophant
 	name = "wall"
 	desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
@@ -45,6 +45,9 @@

 /turf/open/indestructible/hierophant/two

+/turf/open/indestructible/hierophant/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	return FALSE
+
 /turf/open/indestructible/paper
 	name = "notebook floor"
 	desc = "A floor made of invulnerable notebook paper."
@@ -22,6 +22,10 @@
 	if(!drop_stuff())
 		STOP_PROCESSING(SSobj, src)

+/turf/open/chasm/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "basalt"
+	return TRUE

 /turf/open/chasm/attackby(obj/item/C, mob/user, params, area/area_restriction)
 	..()
@@ -171,6 +175,11 @@
 	planetary_atmos = TRUE
 	initial_gas_mix = "o2=14;n2=23;TEMP=300"

+/turf/open/chasm/jungle/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "dirt"
+	return TRUE
+
 /turf/open/chasm/straight_down/jungle
 	icon = 'icons/turf/floors/junglechasm.dmi'
 	planetary_atmos = TRUE
@@ -140,7 +140,7 @@
 	floor_tile = /obj/item/stack/tile/carpet
 	broken_states = list("damaged")
 	smooth = SMOOTH_TRUE
-	canSmoothWith = list(/turf/open/floor/carpet, /turf/open/chasm)
+	canSmoothWith = list(/turf/open/floor/carpet)
 	flags = NONE

 /turf/open/floor/carpet/Initialize()
@@ -175,15 +175,22 @@
 	burnt = 1
 	update_icon()

+/turf/open/floor/carpet/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	return FALSE


-turf/open/floor/fakepit
+/turf/open/floor/fakepit
 	desc = "A clever illusion designed to look like a bottomless pit."
 	smooth = SMOOTH_TRUE | SMOOTH_BORDER | SMOOTH_MORE
-	canSmoothWith = list(/turf/open/floor/fakepit, /turf/open/chasm)
+	canSmoothWith = list(/turf/open/floor/fakepit)
 	icon = 'icons/turf/floors/Chasms.dmi'
 	icon_state = "smooth"

+/turf/open/floor/fakepit/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "basalt"
+	return TRUE
+
 /turf/open/floor/fakespace
 	icon = 'icons/turf/space.dmi'
 	icon_state = "0"
@@ -193,4 +200,10 @@ turf/open/floor/fakepit

 /turf/open/floor/fakespace/Initialize()
 	..()
-	icon_state = "[rand(0,25)]"
+	icon_state = SPACE_ICON_STATE
+
+/turf/open/floor/fakespace/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/space.dmi'
+	underlay_appearance.icon_state = SPACE_ICON_STATE
+	underlay_appearance.plane = PLANE_SPACE
+	return TRUE
@@ -38,6 +38,11 @@
 /turf/open/floor/plating/lava/make_plating()
 	return

+/turf/open/floor/plating/lava/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/floors.dmi'
+	underlay_appearance.icon_state = "basalt"
+	return TRUE
+
 /turf/open/floor/plating/lava/GetHeatCapacity()
 	. = 700000

@@ -26,7 +26,7 @@

 /turf/closed/mineral/Initialize()
 	if (!canSmoothWith)
-		canSmoothWith = list(/turf/closed)
+		canSmoothWith = list(/turf/closed/mineral, /turf/closed/indestructible)
 	pixel_y = -4
 	pixel_x = -4
 	icon = smooth_icon
@@ -42,6 +42,13 @@
 	setDir(angle2dir(rotation+dir2angle(dir)))
 	queue_smooth(src)

+/turf/closed/mineral/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	if(turf_type)
+		underlay_appearance.icon = initial(turf_type.icon)
+		underlay_appearance.icon_state = initial(turf_type.icon_state)
+		return TRUE
+	return ..()
+

 /turf/closed/mineral/attackby(obj/item/weapon/pickaxe/P, mob/user, params)
 	if (!user.IsAdvancedToolUser())
@@ -379,7 +386,7 @@
 	spread = 0
 	scan_state = "rock_Gibtonite"
 	var/det_time = 8 //Countdown till explosion, but also rewards the player for how close you were to detonation when you defuse it
-	var/stage = 0 //How far into the lifecycle of gibtonite we are, 0 is untouched, 1 is active and attempting to detonate, 2 is benign and ready for extraction
+	var/stage = GIBTONITE_UNSTRUCK //How far into the lifecycle of gibtonite we are
 	var/activated_ckey = null //These are to track who triggered the gibtonite deposit for logging purposes
 	var/activated_name = null
 	var/mutable_appearance/activated_overlay
@@ -395,12 +402,12 @@
 	..()

 /turf/closed/mineral/gibtonite/proc/explosive_reaction(mob/user = null, triggered_by_explosion = 0)
-	if(stage == 0)
+	if(stage == GIBTONITE_UNSTRUCK)
 		activated_overlay = mutable_appearance('icons/turf/smoothrocks.dmi', "rock_Gibtonite_active", ON_EDGED_TURF_LAYER)
 		add_overlay(activated_overlay)
 		name = "gibtonite deposit"
 		desc = "An active gibtonite reserve. Run!"
-		stage = 1
+		stage = GIBTONITE_ACTIVE
 		visible_message("<span class='danger'>There was gibtonite inside! It's going to explode!</span>")
 		var/turf/bombturf = get_turf(src)
 		var/area/A = get_area(bombturf)
@@ -422,38 +429,38 @@

 /turf/closed/mineral/gibtonite/proc/countdown(notify_admins = 0)
 	set waitfor = 0
-	while(istype(src, /turf/closed/mineral/gibtonite) && stage == 1 && det_time > 0 && mineralAmt >= 1)
+	while(istype(src, /turf/closed/mineral/gibtonite) && stage == GIBTONITE_ACTIVE && det_time > 0 && mineralAmt >= 1)
 		det_time--
 		sleep(5)
 	if(istype(src, /turf/closed/mineral/gibtonite))
-		if(stage == 1 && det_time <= 0 && mineralAmt >= 1)
+		if(stage == GIBTONITE_ACTIVE && det_time <= 0 && mineralAmt >= 1)
 			var/turf/bombturf = get_turf(src)
 			mineralAmt = 0
-			stage = 3
+			stage = GIBTONITE_DETONATE
 			explosion(bombturf,1,3,5, adminlog = notify_admins)

 /turf/closed/mineral/gibtonite/proc/defuse()
-	if(stage == 1)
+	if(stage == GIBTONITE_ACTIVE)
 		cut_overlay(activated_overlay)
 		activated_overlay.icon_state = "rock_Gibtonite_inactive"
 		add_overlay(activated_overlay)
 		desc = "An inactive gibtonite reserve. The ore can be extracted."
-		stage = 2
+		stage = GIBTONITE_STABLE
 		if(det_time < 0)
 			det_time = 0
 		visible_message("<span class='notice'>The chain reaction was stopped! The gibtonite had [src.det_time] reactions left till the explosion!</span>")

 /turf/closed/mineral/gibtonite/gets_drilled(mob/user, triggered_by_explosion = 0)
-	if(stage == 0 && mineralAmt >= 1) //Gibtonite deposit is activated
+	if(stage == GIBTONITE_UNSTRUCK && mineralAmt >= 1) //Gibtonite deposit is activated
 		playsound(src,'sound/effects/hit_on_shattered_glass.ogg',50,1)
 		explosive_reaction(user, triggered_by_explosion)
 		return
-	if(stage == 1 && mineralAmt >= 1) //Gibtonite deposit goes kaboom
+	if(stage == GIBTONITE_ACTIVE && mineralAmt >= 1) //Gibtonite deposit goes kaboom
 		var/turf/bombturf = get_turf(src)
 		mineralAmt = 0
-		stage = 3
+		stage = GIBTONITE_DETONATE
 		explosion(bombturf,1,2,5, adminlog = 0)
-	if(stage == 2) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
+	if(stage == GIBTONITE_STABLE) //Gibtonite deposit is now benign and extractable. Depending on how close you were to it blowing up before defusing, you get better quality ore.
 		var/obj/item/weapon/twohanded/required/gibtonite/G = new /obj/item/weapon/twohanded/required/gibtonite/(src)
 		if(det_time <= 0)
 			G.quality = 3
@@ -175,6 +175,7 @@
 	desc = "A light-weight titanium wall used in shuttles."
 	icon = 'icons/turf/walls/shuttle_wall.dmi'
 	icon_state = "map-shuttle"
+	flags = CAN_BE_DIRTY | CHECK_RICOCHET
 	sheet_type = /obj/item/stack/sheet/mineral/titanium
 	smooth = SMOOTH_MORE|SMOOTH_DIAGONAL
 	canSmoothWith = list(/turf/closed/wall/mineral/titanium, /obj/machinery/door/airlock/shuttle, /obj/machinery/door/airlock/, /turf/closed/wall/shuttle, /obj/structure/window/shuttle, /obj/structure/shuttle/engine/heater, /obj/structure/falsewall/titanium)
@@ -28,6 +28,20 @@
 /turf/closed/wall/attack_tk()
 	return

+/turf/closed/wall/handle_ricochet(obj/item/projectile/P)			//A huge pile of shitcode!
+	var/turf/p_turf = get_turf(P)
+	var/face_direction = get_dir(src, p_turf)
+	var/face_angle = dir2angle(face_direction)
+	var/incidence_s = get_angle_of_incidence(face_angle, P.Angle)
+	var/new_angle = face_angle + incidence_s
+	var/new_angle_s = new_angle
+	while(new_angle_s > 180)	// Translate to regular projectile degrees
+		new_angle_s -= 360
+	while(new_angle_s < -180)
+		new_angle_s += 360
+	P.Angle = new_angle_s
+	return TRUE
+
 /turf/closed/wall/proc/dismantle_wall(devastated=0, explode=0)
 	if(devastated)
 		devastate_wall()
@@ -160,6 +160,12 @@
 /turf/open/space/acid_act(acidpwr, acid_volume)
 	return 0

+/turf/open/space/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = 'icons/turf/space.dmi'
+	underlay_appearance.icon_state = SPACE_ICON_STATE
+	underlay_appearance.plane = PLANE_SPACE
+	return TRUE
+

 /turf/open/space/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd)
 	if(!CanBuildHere())
@@ -4,6 +4,11 @@
 	baseturf = /turf/open/space/transit
 	flags = NOJAUNT //This line goes out to every wizard that ever managed to escape the den. I'm sorry.

+/turf/open/space/transit/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	. = ..()
+	underlay_appearance.icon_state = "speedspace_ns_[get_transit_state(asking_turf)]"
+	underlay_appearance.transform = turn(matrix(), get_transit_angle(asking_turf))
+
 /turf/open/space/transit/south
 	dir = SOUTH

@@ -69,25 +74,32 @@
 		throw_atom(AM)

 /turf/open/space/transit/proc/update_icon()
-	var/p = 9
-	var/angle = 0
-	var/state = 1
-	switch(dir)
-		if(NORTH)
-			angle = 180
-			state = ((-p*x+y) % 15) + 1
-			if(state < 1)
-				state += 15
-		if(EAST)
-			angle = 90
-			state = ((x+p*y) % 15) + 1
-		if(WEST)
-			angle = -90
-			state = ((x-p*y) % 15) + 1
-			if(state < 1)
-				state += 15
-		else
-			state =	((p*x+y) % 15) + 1
+	icon_state = "speedspace_ns_[get_transit_state(src)]"
+	transform = turn(matrix(), get_transit_angle(src))

-	icon_state = "speedspace_ns_[state]"
-	transform = turn(matrix(), angle)
+/proc/get_transit_state(turf/T)
+	var/p = 9
+	. = 1
+	switch(T.dir)
+		if(NORTH)
+			. = ((-p*T.x+T.y) % 15) + 1
+			if(. < 1)
+				. += 15
+		if(EAST)
+			. = ((T.x+p*T.y) % 15) + 1
+		if(WEST)
+			. = ((T.x-p*T.y) % 15) + 1
+			if(. < 1)
+				. += 15
+		else
+			. = ((p*T.x+T.y) % 15) + 1
+
+/proc/get_transit_angle(turf/T)
+	. = 0
+	switch(T.dir)
+		if(NORTH)
+			. = 180
+		if(EAST)
+			. = 90
+		if(WEST)
+			. = -90
@@ -394,6 +394,12 @@
 		if(ismob(A) || .)
 			A.ratvar_act()

+/turf/proc/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
+	underlay_appearance.icon = icon
+	underlay_appearance.icon_state = icon_state
+	underlay_appearance.dir = adjacency_dir
+	return TRUE
+
 /turf/proc/add_blueprints(atom/movable/AM)
 	var/image/I = new
 	I.appearance = AM.appearance
@@ -37,7 +37,7 @@
 		body += " \[<A href='?_src_=holder;revive=\ref[M]'>Heal</A>\] "

 	if(M.client)
-		body += "<br>\[<b>Player Age:</b> [M.client.player_age]\]\[<b>Byond Age:</b> [M.client.account_age]\]"
+		body += "<br>\[<b>First Seen:</b> [M.client.player_join_date]\]\[<b>Byond account registered on:</b> [M.client.account_join_date]\]"
 		body += "<br><b>Show related accounts by:</b> "
 		body += "\[ <a href='?_src_=holder;showrelatedacc=cid;client=\ref[M.client]'>CID</a> | "
 		body += "<a href='?_src_=holder;showrelatedacc=ip;client=\ref[M.client]'>IP</a> \]"
@@ -48,7 +48,7 @@
 	body += "<a href='?priv_msg=[M.ckey]'>PM</a> - "
 	body += "<a href='?_src_=holder;subtlemessage=\ref[M]'>SM</a> - "
 	body += "<a href='?_src_=holder;adminplayerobservefollow=\ref[M]'>FLW</a> - "
-	body += "<a href='?_src_=holder;individuallog=\ref[M]'>LOGS</a>\] <b><br>"
+	body += "<a href='?_src_=holder;individuallog=\ref[M]'>LOGS</a>\] <br>"

 	body += "<b>Mob type</b> = [M.type]<br><br>"

@@ -239,21 +239,21 @@
 		if(6)
 			dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed story to Network.</B></FONT><HR><BR>"
 			if(src.admincaster_feed_channel.channel_name=="")
-				dat+="<FONT COLOR='maroon'>Invalid receiving channel name.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Invalid receiving channel name.</FONT><BR>"
 			if(src.admincaster_feed_message.returnBody(-1) == "" || src.admincaster_feed_message.returnBody(-1) == "\[REDACTED\]")
-				dat+="<FONT COLOR='maroon'>Invalid message body.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Invalid message body.</FONT><BR>"
 			dat+="<BR><A href='?src=\ref[src];ac_setScreen=[3]'>Return</A><BR>"
 		if(7)
 			dat+="<B><FONT COLOR='maroon'>ERROR: Could not submit Feed Channel to Network.</B></FONT><HR><BR>"
 			if(src.admincaster_feed_channel.channel_name =="" || src.admincaster_feed_channel.channel_name == "\[REDACTED\]")
-				dat+="<FONT COLOR='maroon'>Invalid channel name.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Invalid channel name.</FONT><BR>"
 			var/check = 0
 			for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels)
 				if(FC.channel_name == src.admincaster_feed_channel.channel_name)
 					check = 1
 					break
 			if(check)
-				dat+="<FONT COLOR='maroon'>Channel name already in use.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Channel name already in use.</FONT><BR>"
 			dat+="<BR><A href='?src=\ref[src];ac_setScreen=[2]'>Return</A><BR>"
 		if(9)
 			dat+="<B>[admincaster_feed_channel.channel_name]: </B><FONT SIZE=1>\[created by: <FONT COLOR='maroon'>[admincaster_feed_channel.returnAuthor(-1)]</FONT>\]</FONT><HR>"
@@ -354,9 +354,9 @@
 		if(16)
 			dat+="<B><FONT COLOR='maroon'>ERROR: Wanted Issue rejected by Network.</B></FONT><HR><BR>"
 			if(src.admincaster_wanted_message.criminal =="" || src.admincaster_wanted_message.criminal == "\[REDACTED\]")
-				dat+="<FONT COLOR='maroon'>Invalid name for person wanted.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Invalid name for person wanted.</FONT><BR>"
 			if(src.admincaster_wanted_message.body == "" || src.admincaster_wanted_message.body == "\[REDACTED\]")
-				dat+="<FONT COLOR='maroon'>Invalid description.</FONT><BR>"
+				dat+="<FONT COLOR='maroon'>Invalid description.</FONT><BR>"
 			dat+="<BR><A href='?src=\ref[src];ac_setScreen=[0]'>Return</A><BR>"
 		if(17)
 			dat+="<B>Wanted Issue successfully deleted from Circulation</B><BR>"
@@ -419,18 +419,18 @@
 	set desc="Restarts the world immediately"
 	if (!usr.client.holder)
 		return
-
-	var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
-	var result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
-	if(result)
+
+	var/list/options = list("Regular Restart", "Hard Restart (No Delay/Feeback Reason)", "Hardest Restart (No actions, just reboot)")
+	var result = input(usr, "Select reboot method", "World Reboot", options[1]) as null|anything in options
+	if(result)
 		SSblackbox.add_details("admin_verb","Reboot World") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-		switch(result)
-			if("Regular Restart")
-				SSticker.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "end_error", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
-			if("Hard Restart (No Delay, No Feeback Reason)")
-				world.Reboot()
-			if("Hardest Restart (No actions, just reboot)")
-				world.Reboot(fast_track = TRUE)		
+		switch(result)
+			if("Regular Restart")
+				SSticker.Reboot("Initiated by [usr.client.holder.fakekey ? "Admin" : usr.key].", "admin reboot - by [usr.key] [usr.client.holder.fakekey ? "(stealth)" : ""]", 10)
+			if("Hard Restart (No Delay, No Feeback Reason)")
+				world.Reboot()
+			if("Hardest Restart (No actions, just reboot)")
+				world.Reboot(fast_track = TRUE)

 /datum/admins/proc/end_round()
 	set category = "Server"
@@ -5,7 +5,7 @@
 	F << "<small>[time_stamp()] \ref[src] ([x],[y],[z])</small> || [src] [message]<br>"


-/client/proc/investigate_show( subject in list("hrefs","notes, memos, watchlist","singulo","wires","telesci", "gravity", "records", "cargo", "supermatter", "atmos", "experimentor", "botany") )
+/client/proc/investigate_show(subject in list("hrefs","notes, memos, watchlist", INVESTIGATE_SINGULO, INVESTIGATE_WIRES, INVESTIGATE_TELESCI, INVESTIGATE_GRAVITY, INVESTIGATE_RECORDS, INVESTIGATE_CARGO, INVESTIGATE_SUPERMATTER, INVESTIGATE_ATMOS, INVESTIGATE_EXPERIMENTOR, INVESTIGATE_BOTANY) )
 	set name = "Investigate"
 	set category = "Admin"
 	if(!holder)
@@ -174,7 +174,7 @@
 		if("list_bombers")
 			if(!check_rights(R_ADMIN))
 				return
-			var/dat = "<B>Bombing List<HR>"
+			var/dat = "<B>Bombing List</B><HR>"
 			for(var/l in GLOB.bombers)
 				dat += text("[l]<BR>")
 			usr << browse(dat, "window=bombers")
@@ -152,7 +152,7 @@ Pipelines + Other Objects -> Pipe network
 					"[user] unfastens \the [src].", \
 					"<span class='notice'>You unfasten \the [src].</span>", \
 					"<span class='italics'>You hear ratchet.</span>")
-				investigate_log("was <span class='warning'>REMOVED</span> by [key_name(usr)]", "atmos")
+				investigate_log("was <span class='warning'>REMOVED</span> by [key_name(usr)]", INVESTIGATE_ATMOS)

 				//You unwrenched a pipe full of pressure? Let's splat you into the wall, silly.
 				if(unsafe_wrenching)
@@ -112,7 +112,7 @@ Passive gate is similar to the regular pump except:
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("pressure")
 			var/pressure = params["pressure"]
@@ -128,7 +128,7 @@ Passive gate is similar to the regular pump except:
 				. = TRUE
 			if(.)
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()

 /obj/machinery/atmospherics/components/binary/passive_gate/atmosinit()
@@ -152,7 +152,7 @@ Passive gate is similar to the regular pump except:
 		target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)

 	if(on != old_on)
-		investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos")
+		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

 	if("status" in signal.data)
 		broadcast_status()
@@ -121,7 +121,7 @@ Thus, the two variables affect pump operation are set in New():
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+			investigate_log("Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 			message_admins("Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
 			. = TRUE
@@ -139,7 +139,7 @@ Thus, the two variables affect pump operation are set in New():
 				. = TRUE
 			if(.)
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+				investigate_log("Pump, [src.name], was set to [target_pressure] kPa by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 				message_admins("Pump, [src.name], was set to [target_pressure] kPa by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 				log_admin("[key_name(usr)] manipulated a pump at [x], [y], [z]")
 	update_icon()
@@ -165,7 +165,7 @@ Thus, the two variables affect pump operation are set in New():
 		target_pressure = Clamp(text2num(signal.data["set_output_pressure"]),0,ONE_ATMOSPHERE*50)

 	if(on != old_on)
-		investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos")
+		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

 	if("status" in signal.data)
 		broadcast_status()
@@ -186,7 +186,7 @@ Thus, the two variables affect pump operation are set in New():
 		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		else
-			investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", "atmos")
+			investigate_log("Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS)
 			message_admins("Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(user)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] unwrenched a pump at [x], [y], [z]")
 			return 1
@@ -30,12 +30,12 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
 	update_parents()
 	var/datum/pipeline/parent1 = PARENT1
 	parent1.reconcile_air()
-	investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", "atmos")
+	investigate_log("was opened by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS)

 /obj/machinery/atmospherics/components/binary/valve/proc/close()
 	open = 0
 	update_icon_nopipes()
-	investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", "atmos")
+	investigate_log("was closed by [usr ? key_name(usr) : "a remote signal"]", INVESTIGATE_ATMOS)

 /obj/machinery/atmospherics/components/binary/valve/proc/normalize_dir()
 	if(dir==SOUTH)
@@ -121,7 +121,7 @@ Thus, the two variables affect pump operation are set in New():
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+			investigate_log("Volume Pump, [src.name], was turned [on ? "on" : "off"] by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 			message_admins("Volume Pump, [src.name], turned [on ? "on" : "off"] by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")

@@ -140,7 +140,7 @@ Thus, the two variables affect pump operation are set in New():
 				. = TRUE
 			if(.)
 				transfer_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
-				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+				investigate_log("Volume Pump, [src.name], was set to [transfer_rate] L/s by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 				message_admins("Volume Pump, [src.name], was set to [transfer_rate] L/s by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 				log_admin("[key_name(usr)] manipulated a volume pump at [x], [y], [z]")
 	update_icon()
@@ -162,7 +162,7 @@ Thus, the two variables affect pump operation are set in New():
 		transfer_rate = Clamp(text2num(signal.data["set_transfer_rate"]),0,air1.volume)

 	if(on != old_on)
-		investigate_log("was turned [on ? "on" : "off"] by a remote signal", "atmos")
+		investigate_log("was turned [on ? "on" : "off"] by a remote signal", INVESTIGATE_ATMOS)

 	if("status" in signal.data)
 		broadcast_status()
@@ -183,7 +183,7 @@ Thus, the two variables affect pump operation are set in New():
 		if(!(stat & NOPOWER) && on)
 			to_chat(user, "<span class='warning'>You cannot unwrench [src], turn it off first!</span>")
 		else
-			investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", "atmos")
+			investigate_log("Volume Pump, [src.name], was unwrenched by [key_name(usr)] at [x], [y], [z], [loc.loc]", INVESTIGATE_ATMOS)
 			message_admins("Volume Pump, [src.name], was unwrenched by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)]")
 			log_admin("[key_name(usr)] unwrenched a volume pump at [x], [y], [z]")

@@ -83,20 +83,20 @@

 		if(!removed)
 			return
-		
+
 		var/filtering = filter_type ? TRUE : FALSE
-		
+
 		if(filtering && !istext(filter_type))
 			WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]")
 			filtering = FALSE
-		
+
 		if(filtering && removed.gases[filter_type])
 			var/datum/gas_mixture/filtered_out = new
-			
+
 			filtered_out.temperature = removed.temperature
 			filtered_out.assert_gas(filter_type)
 			filtered_out.gases[filter_type][MOLES] = removed.gases[filter_type][MOLES]
-			
+
 			removed.gases[filter_type][MOLES] = 0
 			removed.garbage_collect()

@@ -133,7 +133,7 @@
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("pressure")
 			var/pressure = params["pressure"]
@@ -149,7 +149,7 @@
 				. = TRUE
 			if(.)
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 		if("filter")
 			filter_type = ""
 			var/filter_name = "nothing"
@@ -157,6 +157,6 @@
 			if(gas in GLOB.meta_gas_info)
 				filter_type = gas
 				filter_name	= GLOB.meta_gas_info[gas][META_GAS_NAME]
-			investigate_log("was set to filter [filter_name] by [key_name(usr)]", "atmos")
+			investigate_log("was set to filter [filter_name] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 	update_icon()
@@ -138,7 +138,7 @@
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("pressure")
 			var/pressure = params["pressure"]
@@ -154,17 +154,17 @@
 				. = TRUE
 			if(.)
 				target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
-				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", "atmos")
+				investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
 		if("node1")
 			var/value = text2num(params["concentration"])
 			node1_concentration = max(0, min(1, node1_concentration + value))
 			node2_concentration = max(0, min(1, node2_concentration - value))
-			investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", "atmos")
+			investigate_log("was set to [node1_concentration] % on node 1 by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("node2")
 			var/value = text2num(params["concentration"])
 			node2_concentration = max(0, min(1, node2_concentration + value))
 			node1_concentration = max(0, min(1, node1_concentration - value))
-			investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", "atmos")
+			investigate_log("was set to [node2_concentration] % on node 2 by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 	update_icon()
@@ -27,10 +27,10 @@
 	var/radio_key = /obj/item/device/encryptionkey/headset_med
 	var/radio_channel = "Medical"

-/obj/machinery/atmospherics/components/unary/cryo_cell/New()
-	..()
+/obj/machinery/atmospherics/components/unary/cryo_cell/Initialize()
+	. = ..()
 	initialize_directions = dir
-	var/obj/item/weapon/circuitboard/machine/B = new /obj/item/weapon/circuitboard/machine/cryo_tube(null)
+	var/obj/item/weapon/circuitboard/machine/cryo_tube/B = new
 	B.apply_default_parts(src)

 	radio = new(src)
@@ -167,7 +167,7 @@
 	switch(action)
 		if("power")
 			on = !on
-			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("rate")
 			var/rate = params["rate"]
@@ -183,7 +183,7 @@
 				. = TRUE
 			if(.)
 				volume_rate = Clamp(rate, 0, MAX_TRANSFER_RATE)
-				investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", "atmos")
+				investigate_log("was set to [volume_rate] L/s by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()
 	broadcast_status()

@@ -173,7 +173,7 @@
 		if("power")
 			on = !on
 			use_power = 1 + on
-			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", "atmos")
+			investigate_log("was turned [on ? "on" : "off"] by [key_name(usr)]", INVESTIGATE_ATMOS)
 			. = TRUE
 		if("target")
 			var/target = params["target"]
@@ -190,7 +190,7 @@
 				. = TRUE
 			if(.)
 				target_temperature = Clamp(target, min_temperature, max_temperature)
-				investigate_log("was set to [target_temperature] K by [key_name(usr)]", "atmos")
+				investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS)
 	update_icon()

 /obj/machinery/atmospherics/components/unary/thermomachine/freezer
@@ -286,7 +286,7 @@
 	density = 0
 	playsound(src.loc, 'sound/effects/spray.ogg', 10, 1, -3)
 	update_icon()
-	investigate_log("was destroyed.", "atmos")
+	investigate_log("was destroyed.", INVESTIGATE_ATMOS)

 	if(holding)
 		holding.forceMove(T)
@@ -388,7 +388,7 @@
 				. = TRUE
 			if(.)
 				release_pressure = Clamp(round(pressure), can_min_release_pressure, can_max_release_pressure)
-				investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", "atmos")
+				investigate_log("was set to [release_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("valve")
 			var/logmsg
 			valve_open = !valve_open
@@ -439,7 +439,7 @@
 		if("eject")
 			if(holding)
 				if(valve_open)
-					investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transfering into the <span class='boldannounce'>air</span><br>", "atmos")
+					investigate_log("[key_name(usr)] removed the [holding], leaving the valve open and transfering into the <span class='boldannounce'>air</span><br>", INVESTIGATE_ATMOS)
 				holding.forceMove(get_turf(src))
 				holding = null
 				. = TRUE
@@ -120,6 +120,6 @@
 	if(I.force < 10 && !(stat & BROKEN))
 		take_damage(0)
 	else
-		investigate_log("was smacked with \a [I] by [key_name(user)].", "atmos")
+		investigate_log("was smacked with \a [I] by [key_name(user)].", INVESTIGATE_ATMOS)
 		add_fingerprint(user)
 		..()
@@ -133,7 +133,7 @@
 				. = TRUE
 			if(.)
 				pump.target_pressure = Clamp(round(pressure), PUMP_MIN_PRESSURE, PUMP_MAX_PRESSURE)
-				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", "atmos")
+				investigate_log("was set to [pump.target_pressure] kPa by [key_name(usr)].", INVESTIGATE_ATMOS)
 		if("eject")
 			if(holding)
 				holding.loc = get_turf(src)
@@ -46,8 +46,8 @@
 //Syndicate sub-machine guns.
 /obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r

-/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/New()
-	..()
+/obj/item/weapon/gun/ballistic/automatic/c20r/sc_c20r/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
@@ -55,8 +55,8 @@
 //Barman's shotgun
 /obj/item/weapon/gun/ballistic/shotgun/sc_pump

-/obj/item/weapon/gun/ballistic/shotgun/sc_pump/New()
-	..()
+/obj/item/weapon/gun/ballistic/shotgun/sc_pump/Initialize()
+	. = ..()
 	for(var/ammo in magazine.stored_ammo)
 		if(prob(95)) //95% chance
 			magazine.stored_ammo -= ammo
@@ -8,7 +8,7 @@
 	var/safety_warning = "For safety reasons the automated supply shuttle \
 		cannot transport live organisms, classified nuclear weaponry or \
 		homing beacons."
-	
+
 	light_color = "#E2853D"//orange

 /obj/machinery/computer/cargo/request
@@ -106,9 +106,9 @@
 				SSshuttle.supply.contraband = contraband
 				SSshuttle.moveShuttle("supply", "supply_away", TRUE)
 				say("The supply shuttle has departed.")
-				investigate_log("[key_name(usr)] sent the supply shuttle away.", "cargo")
+				investigate_log("[key_name(usr)] sent the supply shuttle away.", INVESTIGATE_CARGO)
 			else
-				investigate_log("[key_name(usr)] called the supply shuttle.", "cargo")
+				investigate_log("[key_name(usr)] called the supply shuttle.", INVESTIGATE_CARGO)
 				say("The supply shuttle has been called and will arrive in [SSshuttle.supply.timeLeft(600)] minutes.")
 				SSshuttle.moveShuttle("supply", "supply_home", TRUE)
 			. = TRUE
@@ -1582,7 +1582,7 @@
 	name = "Contraband Crate"
 	contraband = TRUE
 	cost = 3000
-	num_contained = 6
+	num_contained = 5
 	contains = list(/obj/item/weapon/poster/random_contraband,
 					/obj/item/weapon/storage/fancy/cigarettes/cigpack_shadyjims,
 					/obj/item/weapon/storage/fancy/cigarettes/cigpack_midori,
@@ -420,8 +420,8 @@
 	var/badmin_mode = FALSE
 	var/static/list/blacklisted_vars = list("locs", "loc", "contents", "x", "y", "z")

-/obj/item/weapon/gun/energy/laser/chameleon/New()
-	..()
+/obj/item/weapon/gun/energy/laser/chameleon/Initialize()
+	. = ..()
 	chameleon_action = new(src)
 	chameleon_action.chameleon_type = /obj/item/weapon/gun
 	chameleon_action.chameleon_name = "Gun"
@@ -7,18 +7,18 @@
 	actions_types = list(/datum/action/item_action/toggle_mode)
 	origin_tech = "materials=3;magnets=3;engineering=3;plasmatech=3"

-	mode = FALSE	//FALSE - regular mesons mode	TRUE - t-ray mode
+	mesons_on = TRUE //if set to FALSE, these goggles work as t-ray scanners.
 	var/range = 1

 /obj/item/clothing/glasses/meson/engine/toggle_mode(mob/user, voluntary)
 	var/turf/T = get_turf(src)
-	if(T && T.z == ZLEVEL_MINING && mode)
+	if(T && T.z == ZLEVEL_MINING && !mesons_on)
 		if(picked_excuse)
 			to_chat(user, "<span class='warning'>Due to [picked_excuse], the [name] cannot currently be swapped to \[Meson] mode.</span>")
 		return
-	mode = !mode
+	mesons_on = !mesons_on

-	if(mode)
+	if(!mesons_on)
 		vision_flags = 0
 		darkness_view = 2
 		invis_view = SEE_INVISIBLE_LIVING
@@ -50,7 +50,7 @@
 	toggle_mode(user, TRUE)

 /obj/item/clothing/glasses/meson/engine/process()
-	if(!mode)
+	if(mesons_on)
 		var/turf/T = get_turf(src)
 		if(T && T.z == ZLEVEL_MINING)
 			toggle_mode(loc)
@@ -83,15 +83,8 @@
 		if(M.client)
 			flick_overlay(I, list(M.client), 8)

-/obj/item/clothing/glasses/meson/engine/proc/t_ray_on()
-	if(!ishuman(loc))
-		return 0
-
-	var/mob/living/carbon/human/user = loc
-	return mode & (user.glasses == src)
-
 /obj/item/clothing/glasses/meson/engine/update_icon()
-	icon_state = mode ? "trayson-tray" : "trayson-meson"
+	icon_state = mesons_on ? "trayson-meson" : "trayson-tray"
 	if(istype(loc,/mob/living/carbon/human/))
 		var/mob/living/carbon/human/user = loc
 		if(user.glasses == src)
@@ -103,7 +96,7 @@
 	icon_state = "trayson-tray_off"
 	origin_tech = "materials=3;magnets=2;engineering=2"

-	mode = TRUE
+	mesons_on = FALSE
 	var/on = FALSE
 	vision_flags = 0
 	darkness_view = 2
@@ -135,6 +128,3 @@
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()
-
-/obj/item/clothing/glasses/meson/engine/tray/t_ray_on()
-	return on && ..()
@@ -42,7 +42,7 @@
 	var/static/list/meson_mining_failure_excuses = list("seismic activity", "excessive lava", "ambient radiation", "electromagnetic storms", "bluespace disruption", \
 	"gravity", "dust", "dense rock", "ash", "badly understood science", "radiant heat")
 	var/picked_excuse
-	var/mode = FALSE //if FALSE, is in normal meson mode.
+	var/mesons_on = TRUE

 /obj/item/clothing/glasses/meson/Initialize()
 	. = ..()
@@ -56,34 +56,28 @@
 /obj/item/clothing/glasses/meson/examine(mob/user)
 	..()
 	var/turf/T = get_turf(src)
-	if(T && T.z == ZLEVEL_MINING && mode && picked_excuse)
+	if(T && T.z == ZLEVEL_MINING && !mesons_on && picked_excuse)
 		to_chat(user, "<span class='warning'>Due to [picked_excuse], these Meson Scanners will not be able to display terrain layouts in this area.</span>")

 /obj/item/clothing/glasses/meson/proc/toggle_mode(mob/user)
-	if(vision_flags & SEE_TURFS)
-		mode = TRUE
-		vision_flags &= ~SEE_TURFS
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			if(picked_excuse)
-				to_chat(H, "<span class='warning'>Due to [picked_excuse], your Meson Scanners will not be able to display terrain layouts in this area.</span>")
-			if(H.glasses == src)
-				H.update_sight()
-	else if(!(vision_flags & SEE_TURFS))
-		mode = FALSE
-		vision_flags |= SEE_TURFS
-		if(ishuman(user))
-			var/mob/living/carbon/human/H = user
-			to_chat(H, "<span class='notice'>Your Meson Scanners have reactivated.</span>")
-			if(H.glasses == src)
-				H.update_sight()
+	vision_flags ^= SEE_TURFS
+	mesons_on = (vision_flags & SEE_TURFS)? TRUE : FALSE
+
+	if(iscarbon(user)) //only carbons can wear glasses
+		var/mob/living/carbon/C = user
+		if(!mesons_on)
+			to_chat(C, "<span class='notice'>Your Meson Scanners have reactivated.</span>")
+		else if(picked_excuse)
+			to_chat(C, "<span class='warning'>Due to [picked_excuse], your Meson Scanners will not be able to display terrain layouts in this area.</span>")
+		if(C.glasses == src)
+			C.update_sight()

 /obj/item/clothing/glasses/meson/process()
 	var/turf/T = get_turf(src)
 	if(T && T.z == ZLEVEL_MINING)
-		if(!mode)
+		if(mesons_on) //if we're on mining, turn mesons OFF
 			toggle_mode(loc)
-	else if(mode)
+	else if(!mesons_on) //otherwise, if we're not on mining, turn mesons back ON
 		toggle_mode(loc)

 /obj/item/clothing/glasses/meson/night
@@ -1,5 +0,0 @@
-/obj/item/clothing/head/hunter
-	name = "hunter hat"
-	desc = "It's a flimsy looking hat."
-	icon_state = "hunter"
-	icon = 'icons/obj/clothing/cit_hats.dmi'
@@ -280,3 +280,9 @@
 	name = "magnificent crown"
 	desc = "A crown worn by only the highest emperors of the land."
 	icon_state = "fancycrown"
+
+/obj/item/clothing/head/hunter
+	name = "hunter hat"
+	desc = "It's a flimsy looking hat."
+	item_state = "hunter_hat"
+	icon_state = "hunter_hat"
--- a/Show More
+++ b/Show More