Merge branch 'master' into Borg-tweaks-1

2026-08-24 04:27:35 +01:00 · 2020-09-13 00:59:17 +01:00
parent 78333e094d eb6f307c6f
commit ce61648835
128 changed files with 6647 additions and 422 deletions
@@ -0,0 +1,614 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/disposalpipe/segment,
+/turf/space,
+/area/space)
+"c" = (
+/obj/structure/lattice,
+/obj/structure/disposalpipe/broken{
+	dir = 1
+	},
+/turf/space,
+/area/space)
+"d" = (
+/obj/structure/lattice,
+/turf/space,
+/area/template_noop)
+"e" = (
+/obj/structure/grille/broken,
+/turf/space,
+/area/space)
+"g" = (
+/obj/structure/disposalpipe/broken{
+	dir = 4
+	},
+/turf/space,
+/area/space)
+"h" = (
+/obj/structure/disposalpipe/broken{
+	dir = 8
+	},
+/obj/item/stack/cable_coil/cut,
+/turf/space,
+/area/space)
+"l" = (
+/obj/item/stack/cable_coil/cut,
+/turf/space,
+/area/space)
+"m" = (
+/obj/effect/spawner/random_spawners/grille_often,
+/turf/space,
+/area/space)
+"n" = (
+/obj/effect/spawner/random_spawners/grille_maybe,
+/turf/space,
+/area/space)
+"o" = (
+/obj/random/tool,
+/turf/space,
+/area/space)
+"p" = (
+/obj/structure/girder/displaced,
+/turf/space,
+/area/space)
+"r" = (
+/turf/space,
+/area/template_noop)
+"t" = (
+/obj/structure/cable{
+	d1 = 2;
+	d2 = 8;
+	icon_state = "2-8"
+	},
+/turf/space,
+/area/space)
+"u" = (
+/obj/structure/door_assembly/door_assembly_sec,
+/obj/item/airlock_electronics,
+/turf/space,
+/area/space)
+"v" = (
+/obj/structure/lattice,
+/turf/space,
+/area/space)
+"x" = (
+/obj/structure/disposalpipe/junction,
+/turf/space,
+/area/space)
+"y" = (
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"z" = (
+/obj/item/stack/sheet/metal,
+/turf/simulated/floor/plating,
+/area/space)
+"B" = (
+/obj/structure/lattice,
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/space)
+"C" = (
+/obj/structure/disposalpipe/broken{
+	dir = 1
+	},
+/turf/space,
+/area/space)
+"D" = (
+/obj/structure/cable{
+	d1 = 4;
+	d2 = 8;
+	icon_state = "4-8";
+	pixel_y = 0;
+	tag = ""
+	},
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"E" = (
+/obj/item/stack/rods,
+/turf/space,
+/area/space)
+"F" = (
+/turf/simulated/floor/plating,
+/area/space)
+"G" = (
+/obj/random/toolbox,
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"I" = (
+/obj/structure/grille/broken,
+/obj/structure/lattice,
+/turf/space,
+/area/space)
+"J" = (
+/obj/structure/disposalpipe/broken,
+/turf/space,
+/area/space)
+"K" = (
+/obj/item/shard,
+/turf/space,
+/area/space)
+"N" = (
+/obj/structure/lattice,
+/obj/structure/lattice,
+/turf/space,
+/area/space)
+"O" = (
+/obj/machinery/power/apc/worn_out{
+	pixel_y = -24
+	},
+/obj/structure/cable,
+/turf/simulated/floor/plating,
+/area/space)
+"Q" = (
+/obj/effect/decal/cleanable/shreds{
+	pixel_x = 4;
+	pixel_y = 3
+	},
+/turf/simulated/floor/plating,
+/area/space)
+"T" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"U" = (
+/obj/effect/spawner/random_barrier/wall_probably,
+/turf/space,
+/area/space)
+"V" = (
+/turf/simulated/wall,
+/area/space)
+"X" = (
+/turf/space,
+/area/space)
+"Y" = (
+/obj/item/shard,
+/turf/simulated/floor/plating,
+/area/space)
+"Z" = (
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/space)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+r
+r
+r
+r
+r
+r
+r
+r
+r
+d
+d
+d
+r
+r
+d
+r
+a
+a
+"}
+(3,1,1) = {"
+a
+d
+v
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+r
+a
+"}
+(4,1,1) = {"
+a
+d
+X
+m
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+v
+Z
+X
+X
+d
+a
+"}
+(5,1,1) = {"
+a
+r
+X
+g
+F
+X
+E
+I
+X
+X
+v
+X
+F
+v
+v
+X
+X
+X
+r
+a
+"}
+(6,1,1) = {"
+a
+r
+J
+x
+C
+E
+v
+F
+X
+E
+X
+v
+g
+Z
+X
+X
+F
+X
+r
+a
+"}
+(7,1,1) = {"
+a
+r
+X
+X
+y
+E
+X
+E
+Y
+X
+n
+X
+h
+E
+F
+X
+v
+X
+r
+a
+"}
+(8,1,1) = {"
+a
+r
+X
+X
+X
+B
+l
+p
+X
+X
+y
+p
+X
+X
+X
+E
+X
+X
+r
+a
+"}
+(9,1,1) = {"
+a
+r
+X
+v
+X
+o
+X
+X
+Z
+l
+X
+E
+a
+X
+X
+V
+X
+X
+r
+a
+"}
+(10,1,1) = {"
+a
+r
+X
+Z
+Q
+v
+X
+y
+v
+D
+y
+U
+X
+X
+E
+X
+X
+n
+r
+a
+"}
+(11,1,1) = {"
+a
+r
+X
+X
+I
+v
+v
+X
+v
+t
+O
+V
+X
+X
+F
+E
+Z
+X
+d
+a
+"}
+(12,1,1) = {"
+a
+r
+X
+X
+X
+X
+J
+b
+c
+v
+G
+V
+X
+E
+e
+X
+X
+X
+r
+a
+"}
+(13,1,1) = {"
+a
+r
+X
+X
+X
+V
+X
+Z
+X
+X
+X
+u
+X
+X
+X
+X
+e
+Z
+r
+a
+"}
+(14,1,1) = {"
+a
+r
+X
+X
+X
+X
+v
+X
+v
+N
+E
+E
+K
+X
+v
+o
+X
+X
+r
+a
+"}
+(15,1,1) = {"
+a
+r
+X
+E
+X
+X
+X
+X
+E
+J
+C
+X
+X
+X
+X
+X
+X
+X
+d
+a
+"}
+(16,1,1) = {"
+a
+r
+X
+X
+E
+X
+T
+X
+Z
+X
+n
+v
+X
+z
+n
+X
+Z
+X
+d
+a
+"}
+(17,1,1) = {"
+a
+r
+X
+X
+X
+X
+X
+X
+X
+X
+F
+X
+X
+X
+p
+X
+X
+X
+r
+a
+"}
+(18,1,1) = {"
+a
+r
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+X
+v
+X
+X
+X
+X
+r
+a
+"}
+(19,1,1) = {"
+a
+a
+r
+r
+r
+r
+d
+r
+d
+r
+r
+r
+r
+r
+r
+r
+r
+r
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
@@ -0,0 +1,631 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/simulated/floor/plating/airless,
+/area/space)
+"c" = (
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+"d" = (
+/turf/simulated/wall/r_wall,
+/area/space)
+"e" = (
+/obj/item/stack/cable_coil/cut,
+/turf/space,
+/area/template_noop)
+"h" = (
+/obj/structure/girder,
+/turf/space,
+/area/template_noop)
+"j" = (
+/obj/structure/grille/broken,
+/turf/space,
+/area/space)
+"l" = (
+/obj/structure/girder,
+/turf/simulated/floor/plating,
+/area/space)
+"m" = (
+/obj/structure/grille/broken,
+/turf/template_noop,
+/area/space)
+"n" = (
+/obj/item/stack/cable_coil/cut,
+/turf/template_noop,
+/area/space)
+"o" = (
+/obj/machinery/door/airlock/command{
+	max_integrity = 40
+	},
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"p" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/space,
+/area/template_noop)
+"q" = (
+/obj/structure/lattice,
+/turf/space,
+/area/space)
+"s" = (
+/obj/item/stack/rods,
+/turf/space,
+/area/template_noop)
+"t" = (
+/obj/structure/door_assembly/door_assembly_com,
+/turf/space,
+/area/template_noop)
+"u" = (
+/obj/item/clothing/head/bio_hood/virology,
+/turf/space,
+/area/space)
+"w" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/space)
+"x" = (
+/turf/template_noop,
+/area/space)
+"y" = (
+/obj/structure/lattice,
+/obj/structure/door_assembly/door_assembly_vault{
+	anchored = 1
+	},
+/turf/simulated/floor/plating,
+/area/space)
+"z" = (
+/obj/item/stack/rods,
+/turf/template_noop,
+/area/space)
+"A" = (
+/obj/structure/closet/crate,
+/obj/item/reagent_containers/glass/beaker/bluespace,
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+"B" = (
+/obj/item/shard{
+	icon_state = "small"
+	},
+/turf/space,
+/area/space)
+"C" = (
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/template_noop)
+"D" = (
+/obj/effect/landmark/burnturf,
+/turf/simulated/floor/plating/airless,
+/area/space)
+"E" = (
+/obj/item/reagent_containers/glass/beaker/large,
+/turf/space,
+/area/template_noop)
+"F" = (
+/obj/effect/landmark/burnturf,
+/turf/simulated/floor,
+/area/space)
+"G" = (
+/obj/structure/safe,
+/obj/item/stack/sheet/mineral/bananium{
+	amount = 5
+	},
+/obj/item/stack/ore/bluespace_crystal/refined{
+	amount = 3
+	},
+/obj/item/dnainjector/comic,
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+"H" = (
+/obj/structure/table,
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+"I" = (
+/turf/space,
+/area/template_noop)
+"J" = (
+/mob/living/simple_animal/hostile/carp,
+/turf/space,
+/area/space)
+"L" = (
+/obj/item/shard,
+/turf/space,
+/area/space)
+"M" = (
+/turf/simulated/floor,
+/area/space)
+"N" = (
+/obj/item/clothing/suit/bio_suit/virology,
+/turf/space,
+/area/space)
+"O" = (
+/obj/item/shard{
+	icon_state = "small"
+	},
+/turf/space,
+/area/template_noop)
+"P" = (
+/obj/item/reagent_containers/spray/cleaner,
+/turf/space,
+/area/space)
+"R" = (
+/obj/item/stack/sheet/metal,
+/turf/template_noop,
+/area/space)
+"S" = (
+/obj/item/reagent_containers/spray/cleaner,
+/turf/space,
+/area/template_noop)
+"T" = (
+/turf/simulated/wall,
+/area/space)
+"U" = (
+/obj/effect/landmark/burnturf,
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+"V" = (
+/obj/structure/lattice,
+/turf/space,
+/area/template_noop)
+"W" = (
+/obj/effect/landmark/burnturf,
+/turf/simulated/floor/plating/burnt,
+/area/space)
+"X" = (
+/turf/space,
+/area/space)
+"Y" = (
+/obj/structure/girder/reinforced,
+/turf/simulated/floor/plating/damaged,
+/area/space)
+"Z" = (
+/obj/machinery/computer/pandemic{
+	circuit = /obj/effect/decal/cleanable/shreds
+	},
+/turf/simulated/floor/plasteel/airless,
+/area/space)
+
+(1,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+d
+d
+d
+d
+d
+Y
+x
+S
+I
+I
+I
+I
+I
+I
+C
+I
+I
+I
+a
+"}
+(3,1,1) = {"
+a
+d
+G
+A
+U
+F
+d
+z
+T
+T
+T
+T
+o
+T
+I
+p
+O
+I
+I
+a
+"}
+(4,1,1) = {"
+a
+Y
+c
+U
+c
+U
+d
+X
+w
+M
+c
+U
+M
+T
+V
+I
+I
+I
+I
+a
+"}
+(5,1,1) = {"
+a
+Y
+M
+F
+F
+q
+d
+z
+m
+F
+M
+F
+M
+T
+I
+I
+I
+I
+I
+a
+"}
+(6,1,1) = {"
+a
+d
+d
+y
+d
+d
+Y
+X
+w
+X
+n
+X
+w
+T
+I
+I
+I
+C
+I
+a
+"}
+(7,1,1) = {"
+a
+X
+X
+X
+X
+X
+P
+J
+X
+T
+T
+T
+x
+T
+I
+I
+V
+I
+I
+a
+"}
+(8,1,1) = {"
+a
+X
+X
+X
+X
+X
+X
+X
+R
+X
+w
+X
+b
+x
+x
+I
+I
+I
+I
+a
+"}
+(9,1,1) = {"
+a
+p
+s
+T
+m
+w
+T
+R
+X
+B
+X
+w
+X
+x
+z
+I
+s
+I
+I
+a
+"}
+(10,1,1) = {"
+a
+s
+I
+T
+M
+F
+T
+X
+X
+X
+X
+X
+X
+x
+x
+I
+I
+I
+I
+a
+"}
+(11,1,1) = {"
+a
+I
+I
+T
+c
+F
+T
+X
+X
+c
+F
+b
+j
+D
+T
+I
+I
+I
+t
+a
+"}
+(12,1,1) = {"
+a
+C
+I
+T
+X
+M
+N
+s
+I
+I
+L
+q
+q
+b
+T
+I
+s
+I
+I
+a
+"}
+(13,1,1) = {"
+a
+I
+I
+l
+T
+T
+T
+I
+I
+u
+j
+W
+c
+U
+T
+I
+I
+I
+I
+a
+"}
+(14,1,1) = {"
+a
+I
+s
+p
+I
+I
+I
+I
+p
+I
+I
+c
+H
+Z
+T
+I
+I
+I
+I
+a
+"}
+(15,1,1) = {"
+a
+V
+I
+I
+s
+V
+C
+I
+I
+s
+h
+T
+T
+T
+T
+I
+I
+I
+I
+a
+"}
+(16,1,1) = {"
+a
+I
+I
+E
+I
+I
+V
+I
+O
+I
+V
+I
+I
+I
+I
+I
+C
+I
+I
+a
+"}
+(17,1,1) = {"
+a
+I
+I
+C
+I
+e
+I
+I
+I
+I
+I
+e
+I
+V
+I
+I
+I
+I
+I
+a
+"}
+(18,1,1) = {"
+a
+I
+I
+I
+I
+I
+I
+h
+I
+I
+C
+I
+I
+I
+I
+I
+I
+I
+I
+a
+"}
+(19,1,1) = {"
+a
+I
+I
+I
+I
+I
+I
+I
+I
+I
+I
+I
+I
+I
+C
+I
+I
+I
+I
+a
+"}
+(20,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
@@ -0,0 +1,824 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/item/stack/rods,
+/turf/simulated/floor/plating/damaged,
+/area/template_noop)
+"c" = (
+/obj/item/trash/popcorn,
+/turf/space,
+/area/template_noop)
+"d" = (
+/obj/effect/spawner/random_spawners/wall_rusted_maybe,
+/turf/space,
+/area/template_noop)
+"e" = (
+/obj/item/poster/random_contraband,
+/turf/space,
+/area/template_noop)
+"f" = (
+/obj/structure/lattice,
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/template_noop)
+"g" = (
+/obj/item/paperplane,
+/turf/space,
+/area/template_noop)
+"h" = (
+/obj/item/trash/can,
+/turf/space,
+/area/template_noop)
+"i" = (
+/obj/item/stack/rods,
+/turf/template_noop,
+/area/template_noop)
+"k" = (
+/obj/item/shard,
+/turf/space,
+/area/template_noop)
+"l" = (
+/obj/item/stack/cable_coil{
+	amount = 10
+	},
+/turf/space,
+/area/template_noop)
+"m" = (
+/turf/simulated/wall,
+/area/template_noop)
+"n" = (
+/obj/item/stack/sheet/glass,
+/turf/space,
+/area/template_noop)
+"p" = (
+/obj/random/plushie,
+/turf/space,
+/area/template_noop)
+"q" = (
+/obj/item/stack/rods,
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/template_noop)
+"t" = (
+/obj/machinery/computer/arcade/battle,
+/turf/simulated/floor/plasteel/airless,
+/area/template_noop)
+"u" = (
+/obj/random/tool,
+/turf/space,
+/area/template_noop)
+"v" = (
+/obj/item/trash/syndi_cakes,
+/turf/space,
+/area/template_noop)
+"w" = (
+/obj/item/stack/tickets,
+/turf/space,
+/area/template_noop)
+"x" = (
+/obj/structure/bookcase/random/fiction,
+/turf/simulated/floor/plating/damaged,
+/area/template_noop)
+"y" = (
+/obj/item/storage/pill_bottle/random_meds/labelled,
+/turf/space,
+/area/template_noop)
+"z" = (
+/turf/simulated/floor/plating/damaged,
+/area/template_noop)
+"A" = (
+/turf/space,
+/area/template_noop)
+"B" = (
+/obj/item/stack/rods,
+/turf/space,
+/area/template_noop)
+"D" = (
+/obj/item/paper,
+/obj/item/paper,
+/turf/space,
+/area/template_noop)
+"F" = (
+/obj/random/tool,
+/turf/simulated/floor/plating/damaged,
+/area/template_noop)
+"G" = (
+/obj/item/poster/random_official,
+/turf/space,
+/area/template_noop)
+"H" = (
+/obj/item/stack/sheet/wood,
+/turf/space,
+/area/template_noop)
+"I" = (
+/obj/item/stack/rods,
+/obj/item/stack/rods,
+/turf/space,
+/area/template_noop)
+"J" = (
+/obj/item/trash/pistachios,
+/turf/space,
+/area/template_noop)
+"K" = (
+/obj/structure/lattice,
+/obj/structure/girder,
+/turf/space,
+/area/template_noop)
+"L" = (
+/obj/structure/girder,
+/turf/space,
+/area/template_noop)
+"M" = (
+/obj/item/stack/sheet/metal,
+/turf/space,
+/area/template_noop)
+"O" = (
+/obj/structure/girder/displaced,
+/turf/space,
+/area/template_noop)
+"S" = (
+/obj/structure/lattice,
+/turf/space,
+/area/template_noop)
+"U" = (
+/obj/item/stack/sheet/wood,
+/obj/item/stack/sheet/wood,
+/turf/space,
+/area/template_noop)
+"V" = (
+/obj/item/circuitboard/arcade,
+/turf/space,
+/area/template_noop)
+"W" = (
+/obj/item/stack/tickets,
+/obj/item/stack/tickets,
+/obj/item/stack/tickets,
+/turf/space,
+/area/template_noop)
+"Z" = (
+/obj/item/paper,
+/turf/space,
+/area/template_noop)
+
+(1,1,1) = {"
+a
+a
+a
+i
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+i
+a
+a
+a
+a
+a
+i
+a
+a
+a
+"}
+(3,1,1) = {"
+a
+a
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+A
+a
+a
+"}
+(4,1,1) = {"
+a
+a
+A
+B
+A
+B
+A
+A
+A
+A
+A
+A
+A
+A
+B
+B
+A
+A
+a
+a
+"}
+(5,1,1) = {"
+i
+a
+A
+A
+A
+A
+A
+w
+A
+M
+A
+A
+A
+A
+A
+A
+A
+A
+a
+i
+"}
+(6,1,1) = {"
+a
+a
+A
+A
+I
+A
+B
+A
+A
+B
+B
+M
+A
+A
+M
+A
+A
+A
+a
+a
+"}
+(7,1,1) = {"
+a
+a
+A
+A
+k
+A
+A
+O
+A
+A
+A
+A
+m
+A
+w
+A
+M
+A
+a
+a
+"}
+(8,1,1) = {"
+a
+a
+A
+B
+A
+M
+A
+A
+H
+A
+G
+n
+m
+A
+A
+B
+A
+A
+a
+a
+"}
+(9,1,1) = {"
+a
+a
+A
+A
+m
+A
+w
+A
+M
+S
+A
+A
+d
+B
+M
+A
+O
+A
+a
+a
+"}
+(10,1,1) = {"
+a
+a
+A
+w
+A
+A
+Z
+A
+W
+B
+S
+h
+M
+L
+A
+c
+A
+A
+a
+a
+"}
+(11,1,1) = {"
+a
+i
+B
+w
+A
+S
+A
+F
+A
+A
+S
+A
+Z
+A
+A
+A
+M
+A
+a
+a
+"}
+(12,1,1) = {"
+a
+a
+A
+A
+A
+A
+H
+L
+S
+m
+m
+b
+A
+A
+Z
+w
+B
+A
+i
+a
+"}
+(13,1,1) = {"
+a
+a
+A
+A
+B
+O
+A
+B
+A
+M
+A
+D
+K
+z
+S
+H
+B
+A
+a
+a
+"}
+(14,1,1) = {"
+a
+a
+A
+n
+A
+y
+f
+B
+A
+z
+B
+A
+m
+t
+A
+A
+A
+A
+a
+a
+"}
+(15,1,1) = {"
+a
+a
+A
+A
+z
+H
+A
+A
+A
+S
+A
+q
+z
+z
+A
+A
+O
+A
+a
+a
+"}
+(16,1,1) = {"
+a
+a
+A
+A
+S
+A
+S
+U
+B
+B
+A
+A
+S
+A
+M
+B
+u
+A
+a
+i
+"}
+(17,1,1) = {"
+a
+a
+A
+M
+H
+w
+Z
+B
+x
+S
+B
+S
+A
+k
+J
+A
+A
+A
+a
+a
+"}
+(18,1,1) = {"
+a
+a
+B
+A
+A
+A
+A
+A
+A
+w
+B
+z
+A
+O
+A
+M
+A
+A
+a
+a
+"}
+(19,1,1) = {"
+i
+a
+A
+A
+M
+z
+S
+w
+S
+M
+A
+m
+p
+A
+A
+B
+A
+A
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+A
+B
+A
+O
+H
+v
+A
+V
+H
+A
+B
+L
+A
+M
+A
+w
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+A
+A
+A
+A
+e
+M
+A
+w
+Z
+w
+B
+A
+w
+A
+A
+A
+a
+a
+"}
+(22,1,1) = {"
+a
+a
+A
+A
+M
+O
+m
+m
+L
+A
+B
+A
+A
+q
+A
+A
+A
+A
+a
+a
+"}
+(23,1,1) = {"
+a
+a
+A
+B
+k
+A
+B
+A
+B
+g
+n
+A
+O
+A
+A
+B
+B
+A
+a
+a
+"}
+(24,1,1) = {"
+a
+a
+A
+A
+A
+A
+A
+M
+A
+A
+l
+A
+w
+A
+A
+A
+A
+A
+a
+a
+"}
+(25,1,1) = {"
+a
+a
+A
+w
+B
+A
+A
+A
+A
+A
+A
+B
+A
+A
+A
+w
+A
+A
+a
+a
+"}
+(26,1,1) = {"
+a
+a
+A
+A
+A
+A
+A
+A
+B
+A
+B
+A
+A
+B
+A
+B
+A
+A
+a
+a
+"}
+(27,1,1) = {"
+a
+a
+B
+A
+w
+A
+B
+A
+w
+A
+B
+A
+A
+A
+A
+A
+A
+w
+a
+a
+"}
+(28,1,1) = {"
+a
+a
+A
+A
+A
+A
+A
+A
+A
+w
+A
+A
+A
+A
+A
+A
+A
+A
+a
+i
+"}
+(29,1,1) = {"
+i
+a
+a
+a
+a
+a
+a
+i
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(30,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+i
+a
+a
+"}
@@ -99,6 +99,12 @@
 /obj/item/tank/air,
 /turf/simulated/floor/plasteel,
 /area/ruin/powered)
+"u" = (
+/obj/machinery/tcomms/relay/ruskie{
+	network_id = "LISTENINGOUTPOST-RELAY"
+	},
+/turf/simulated/floor/plasteel,
+/area/ruin/powered)
 "w" = (
 /obj/machinery/light/small,
 /turf/simulated/floor/plasteel,
@@ -922,7 +928,7 @@ b
 f
 f
 f
-c
+f
 f
 D
 m
@@ -964,7 +970,7 @@ f
 f
 p
 Y
-f
+u
 f
 j
 i
@@ -128,66 +128,56 @@

 /obj/machinery/atmospherics/unary/vent_pump/process_atmos()
 	..()
-	if((stat & (NOPOWER|BROKEN)))
-		return 0
+	if(stat & (NOPOWER|BROKEN))
+		return FALSE
 	if(!node)
-		on = 0
+		on = FALSE
 	//broadcast_status() // from now air alarm/control computer should request update purposely --rastaf0
 	if(!on)
-		return 0
+		return FALSE

 	if(welded)
 		if(air_contents.return_pressure() >= weld_burst_pressure && prob(5))	//the weld is on but the cover is welded shut, can it withstand the internal pressure?
 			visible_message("<span class='danger'>The welded cover of [src] bursts open!</span>")
-			for(var/mob/M in range(1, src))
+			for(var/mob/living/M in range(1))
 				unsafe_pressure_release(M, air_contents.return_pressure())	//let's send everyone flying
 			welded = FALSE
 			update_icon()
-		return 0
+		return FALSE

 	var/datum/gas_mixture/environment = loc.return_air()
 	var/environment_pressure = environment.return_pressure()
-
 	if(pump_direction) //internal -> external
 		var/pressure_delta = 10000
-
-		if(pressure_checks&1)
+		if(pressure_checks & 1)
 			pressure_delta = min(pressure_delta, (external_pressure_bound - environment_pressure))
-		if(pressure_checks&2)
+		if(pressure_checks & 2)
 			pressure_delta = min(pressure_delta, (air_contents.return_pressure() - internal_pressure_bound))

-		if(pressure_delta > 0.5)
-			if(air_contents.temperature > 0)
-				var/transfer_moles = pressure_delta*environment.volume/(air_contents.temperature * R_IDEAL_GAS_EQUATION)
-
-				var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
-
-				loc.assume_air(removed)
-				air_update_turf()
-
-				parent.update = 1
+		if(pressure_delta > 0.5 && air_contents.temperature > 0)
+			var/transfer_moles = pressure_delta * environment.volume / (air_contents.temperature * R_IDEAL_GAS_EQUATION)
+			var/datum/gas_mixture/removed = air_contents.remove(transfer_moles)
+			loc.assume_air(removed)
+			air_update_turf()
+			parent.update = TRUE

 	else //external -> internal
 		var/pressure_delta = 10000
-		if(pressure_checks&1)
+		if(pressure_checks & 1)
 			pressure_delta = min(pressure_delta, (environment_pressure - external_pressure_bound))
-		if(pressure_checks&2)
+		if(pressure_checks & 2)
 			pressure_delta = min(pressure_delta, (internal_pressure_bound - air_contents.return_pressure()))

-		if(pressure_delta > 0.5)
-			if(environment.temperature > 0)
-				var/transfer_moles = pressure_delta*air_contents.volume/(environment.temperature * R_IDEAL_GAS_EQUATION)
+		if(pressure_delta > 0.5 && environment.temperature > 0)
+			var/transfer_moles = pressure_delta * air_contents.volume / (environment.temperature * R_IDEAL_GAS_EQUATION)
+			var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
+			if(isnull(removed)) //in space
+				return
+			air_contents.merge(removed)
+			air_update_turf()
+			parent.update = TRUE

-				var/datum/gas_mixture/removed = loc.remove_air(transfer_moles)
-				if(isnull(removed)) //in space
-					return
-
-				air_contents.merge(removed)
-				air_update_turf()
-
-				parent.update = 1
-
-	return 1
+	return TRUE

 //Radio remote control

@@ -386,11 +376,11 @@
 	if(I.use_tool(src, user, 20, volume = I.tool_volume))
 		if(!welded)
 			welded = TRUE
-			visible_message("<span class='notice'>[user] welds [src] shut!</span>",\
+			user.visible_message("<span class='notice'>[user] welds [src] shut!</span>",\
 				"<span class='notice'>You weld [src] shut!</span>")
 		else
 			welded = FALSE
-			visible_message("<span class='notice'>[user] unwelds [src]!</span>",\
+			user.visible_message("<span class='notice'>[user] unwelds [src]!</span>",\
 				"<span class='notice'>You unweld [src]!</span>")
 		update_icon()

@@ -404,10 +404,10 @@
 	if(I.use_tool(src, user, 20, volume = I.tool_volume))
 		if(!welded)
 			welded = TRUE
-			visible_message("<span class='notice'>[user] welds [src] shut!</span>",\
+			user.visible_message("<span class='notice'>[user] welds [src] shut!</span>",\
 				"<span class='notice'>You weld [src] shut!</span>")
 		else
 			welded = FALSE
-			visible_message("<span class='notice'>[user] unwelds [src]!</span>",\
+			user.visible_message("<span class='notice'>[user] unwelds [src]!</span>",\
 				"<span class='notice'>You unweld [src]!</span>")
 		update_icon()
@@ -69,9 +69,6 @@
 #define ZONE_ACTIVE 1
 #define ZONE_SLEEPING 0

-#define shuttle_time_in_station 1800 // 3 minutes in the station
-#define shuttle_time_to_arrive 6000 // 10 minutes to arrive
-
 #define EVENT_LEVEL_MUNDANE 1
 #define EVENT_LEVEL_MODERATE 2
 #define EVENT_LEVEL_MAJOR 3
@@ -265,8 +262,6 @@
 #define TRIGGER_GUARD_NONE 0
 #define TRIGGER_GUARD_NORMAL 1

-#define CLIENT_FROM_VAR(I) (ismob(I) ? I:client : (istype(I, /client) ? I : (istype(I, /datum/mind) ? I:current?:client : null)))
-
 // Macro to get the current elapsed round time, rather than total world runtime
 #define ROUND_TIME (SSticker.round_start_time ? (world.time - SSticker.round_start_time) : 0)

@@ -22,16 +22,9 @@

 // these define the time taken for the shuttle to get to SS13
 // and the time before it leaves again
-#define SHUTTLE_PREPTIME 				300	// 5 minutes = 300 seconds - after this time, the shuttle departs centcom and cannot be recalled
-#define SHUTTLE_LEAVETIME 				180	// 3 minutes = 180 seconds - the duration for which the shuttle will wait at the station after arriving
-#define SHUTTLE_TRANSIT_DURATION		300	// 5 minutes = 300 seconds - how long it takes for the shuttle to get to the station
-#define SHUTTLE_TRANSIT_DURATION_RETURN 120	// 2 minutes = 120 seconds - for some reason it takes less time to come back, go figure.
-
-//Ferry shuttle processing status
-#define IDLE_STATE		0
-#define WAIT_LAUNCH		1
-#define WAIT_ARRIVE		2
-#define WAIT_FINISH		3
+#define SHUTTLE_CALLTIME 	6000	//10 minutes = 6000 deciseconds - time taken for emergency shuttle to reach the station when called (in deciseconds)
+#define SHUTTLE_DOCKTIME 	1800	//3 minutes = 1800 deciseconds - time taken for emergency shuttle to leave again once it has docked (in deciseconds)
+#define SHUTTLE_ESCAPETIME	1200	//2 minutes = 1200 deciseconds - time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)

 //shuttle mode defines
 #define SHUTTLE_IGNITING 0
@@ -80,8 +80,7 @@
 #define INIT_ORDER_NANOMOB -23
 #define INIT_ORDER_SQUEAK -40
 #define INIT_ORDER_PATH -50
-#define INIT_ORDER_PERSISTENCE		-95
-#define INIT_ORDER_CHAT				-100 //Should be last to ensure chat remains smooth during init.
+#define INIT_ORDER_PERSISTENCE -95

 // Subsystem fire priority, from lowest to highest priority
 // If the subsystem isn't listed here it's either DEFAULT or PROCESS (if it's a processing subsystem child)
@@ -113,7 +112,6 @@
 #define FIRE_PRIORITY_MOBS			100
 #define FIRE_PRIORITY_NANOUI		110
 #define FIRE_PRIORITY_TICKER		200
-#define FIRE_PRIORITY_CHAT			400
 #define FIRE_PRIORITY_OVERLAYS		500
 #define FIRE_PRIORITY_INPUT			1000 // This must always always be the max highest priority. Player input must never be lost.

@@ -615,5 +615,3 @@ proc/checkhtml(var/t)
 	text = replacetext(text, "<td>",					"\[cell\]")
 	text = replacetext(text, "<img src = ntlogo.png>",	"\[logo\]")
 	return text
-
-#define string2charlist(string) (splittext(string, regex("(\\x0A|.)")) - splittext(string, ""))
@@ -81,6 +81,9 @@

 /obj/screen/ghost/respawn_pai/Click()
 	var/mob/dead/observer/G = usr
+	if(!GLOB.paiController.check_recruit(G))
+		to_chat(G, "<span class='warning'>You are not eligible to become a pAI.</span>")
+		return
 	GLOB.paiController.recruitWindow(G)

 /datum/hud/ghost
@@ -13,7 +13,7 @@
 	using.icon_state = mymob.a_intent
 	static_inventory += using
 	action_intent = using
-	
+
 	using = new /obj/screen/guardian/Manifest()
 	using.screen_loc = ui_rhand
 	static_inventory += using
@@ -49,8 +49,8 @@
 /obj/screen/guardian/Manifest/Click()
 	if(isguardian(usr))
 		var/mob/living/simple_animal/hostile/guardian/G = usr
-		G.Manifest()
-
+		if(G.loc == G.summoner)
+			G.Manifest()

 /obj/screen/guardian/Recall
 	icon_state = "recall"
@@ -1,67 +0,0 @@
-SUBSYSTEM_DEF(chat)
-	name = "Chat"
-	flags = SS_TICKER|SS_NO_INIT
-	wait = 1
-	priority = FIRE_PRIORITY_CHAT
-	init_order = INIT_ORDER_CHAT
-	offline_implications = "Chat messages will no longer be cleanly queued. No immediate action is needed."
-
-	var/list/payload = list()
-
-
-/datum/controller/subsystem/chat/fire()
-	for(var/i in payload)
-		var/client/C = i
-		if(C)
-			C << output(payload[C], "browseroutput:output")
-		payload -= C
-
-		if(MC_TICK_CHECK)
-			return
-
-
-/datum/controller/subsystem/chat/proc/queue(target, message, flag)
-	if(!target || !message)
-		return
-
-	if(!istext(message))
-		stack_trace("to_chat called with invalid input type")
-		return
-
-	if(target == world)
-		target = GLOB.clients
-
-	//Some macros remain in the string even after parsing and fuck up the eventual output
-	message = replacetext(message, "\improper", "")
-	message = replacetext(message, "\proper", "")
-	message += "<br>"
-
-
-	//url_encode it TWICE, this way any UTF-8 characters are able to be decoded by the Javascript.
-	//Do the double-encoding here to save nanoseconds
-	var/twiceEncoded = url_encode(url_encode(message))
-
-	if(islist(target))
-		for(var/I in target)
-			var/client/C = CLIENT_FROM_VAR(I) //Grab us a client if possible
-
-			if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
-				continue
-
-			if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
-				C.chatOutput.messageQueue += message
-				continue
-
-			payload[C] += twiceEncoded
-
-	else
-		var/client/C = CLIENT_FROM_VAR(target) //Grab us a client if possible
-
-		if(!C?.chatOutput || C.chatOutput.broken) //A player who hasn't updated his skin file.
-			return
-
-		if(!C.chatOutput.loaded) //Client still loading, put their messages in a queue
-			C.chatOutput.messageQueue += message
-			return
-
-		payload[C] += twiceEncoded
@@ -14,9 +14,9 @@ SUBSYSTEM_DEF(shuttle)
 		//emergency shuttle stuff
 	var/obj/docking_port/mobile/emergency/emergency
 	var/obj/docking_port/mobile/emergency/backup/backup_shuttle
-	var/emergencyCallTime = 6000	//time taken for emergency shuttle to reach the station when called (in deciseconds)
-	var/emergencyDockTime = 1800	//time taken for emergency shuttle to leave again once it has docked (in deciseconds)
-	var/emergencyEscapeTime = 1200	//time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
+	var/emergencyCallTime = SHUTTLE_CALLTIME	//time taken for emergency shuttle to reach the station when called (in deciseconds)
+	var/emergencyDockTime = SHUTTLE_DOCKTIME	//time taken for emergency shuttle to leave again once it has docked (in deciseconds)
+	var/emergencyEscapeTime = SHUTTLE_ESCAPETIME	//time taken for emergency shuttle to reach a safe distance after leaving station (in deciseconds)
 	var/emergency_sec_level_time = 0 // time sec level was last raised to red or higher
 	var/area/emergencyLastCallLoc
 	var/emergencyNoEscape
@@ -248,3 +248,29 @@
 	allow_duplicates = FALSE // I dont even want to think about what happens if you have 2 shuttles with the same ID. Likely scary stuff.
 	always_place = TRUE // Its designed to make exploring other space ruins more accessible
 	cost = 0 // Force spawned so shouldnt have a cost
+
+/datum/map_template/ruin/space/syndiecakesfactory
+	id = "Syndiecakes Factory"
+	suffix = "syndiecakesfactory.dmm"
+	name = "Syndicakes Factory"
+	description = "Syndicate used to get funds selling corgi cakes produced here. Was it hit by meteors or by a Nanotrasen comando?"
+	allow_duplicates = FALSE
+	cost = 2 //telecomms + multiple mobs
+
+/datum/map_template/ruin/space/debris1
+	id = "debris1"
+	suffix = "debris1.dmm"
+	name = "Debris field 1"
+	description = "A bunch of metal chunks, wires and space waste"
+
+/datum/map_template/ruin/space/debris2
+	id = "debris2"
+	suffix = "debris2.dmm"
+	name = "Debris field 2"
+	description = "A bunch of metal chunks, wires and space waste that used to be some kind of secure storage facility"
+
+/datum/map_template/ruin/space/debris3
+	id = "debris3"
+	suffix = "debris3.dmm"
+	name = "Debris field 3"
+	description = "A bunch of metal chunks, wires and space waste. It used to be an arcade."
@@ -133,3 +133,8 @@
 	suffix = "admin"
 	name = "NTV Argos"
 	description = "Default Admin ship. An older ship used for special operations."
+
+/datum/map_template/shuttle/admin/armory
+	suffix = "armory"
+	name = "NRV Sparta"
+	description = "Armory Shuttle, with plenty of guns to hand out and some general supplies."
@@ -1725,8 +1725,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))

 	U.purchase_log += "<BIG>[bicon(C)]</BIG>"
 	for(var/item in bought_items)
-		new item(C)
-		U.purchase_log += "<BIG>[bicon(item)]</BIG>"
+		var/obj/purchased = new item(C)
+		U.purchase_log += "<BIG>[bicon(purchased)]</BIG>"
 	log_game("[key_name(usr)] purchased a surplus crate with [jointext(itemlog, ", ")]")

 /datum/uplink_item/bundles_TC/telecrystal
@@ -249,14 +249,13 @@
 	block = GLOB.wingdingsblock

 /datum/dna/gene/disability/wingdings/OnSay(mob/M, message)
-	var/list/chars = string2charlist(message)
 	var/garbled_message = ""
-	for(var/C in chars)
-		if(C in GLOB.alphabet_uppercase)
+	for(var/i in 1 to length(message))
+		if(message[i] in GLOB.alphabet_uppercase)
 			garbled_message += pick(GLOB.alphabet_uppercase)
-		else if(C in GLOB.alphabet)
+		else if(message[i] in GLOB.alphabet)
 			garbled_message += pick(GLOB.alphabet)
 		else
-			garbled_message += C
+			garbled_message += message[i]
 	message = garbled_message
 	return message
@@ -370,16 +370,11 @@ GLOBAL_LIST_EMPTY(sting_paths)
 					mind.changeling.purchasedpowers += path
 				path.on_purchase(src)
 	else //for respec
-		var/datum/action/changeling/hivemind_upload/S1 = new
+		var/datum/action/changeling/hivemind_pick/S1 = new
 		if(!mind.changeling.has_sting(S1))
 			mind.changeling.purchasedpowers+=S1
 			S1.Grant(src)

-		var/datum/action/changeling/hivemind_download/S2 = new
-		if(!mind.changeling.has_sting(S2))
-			mind.changeling.purchasedpowers+=S2
-			S2.Grant(src)
-
 	var/mob/living/carbon/C = src		//only carbons have dna now, so we have to typecaste
 	mind.changeling.absorbed_dna |= C.dna.Clone()
 	mind.changeling.trim_dna()
@@ -12,27 +12,36 @@
 	var/datum/changeling/changeling=user.mind.changeling
 	changeling.changeling_speak = 1
 	to_chat(user, "<i><font color=#800080>Use say \":g message\" to communicate with the other changelings.</font></i>")
-	var/datum/action/changeling/hivemind_upload/S1 = new
+	var/datum/action/changeling/hivemind_pick/S1 = new
 	if(!changeling.has_sting(S1))
 		changeling.purchasedpowers+=S1
 		S1.Grant(user)
-	var/datum/action/changeling/hivemind_download/S2 = new
-	if(!changeling.has_sting(S2))
-		S2.Grant(user)
-		changeling.purchasedpowers+=S2
 	return

 // HIVE MIND UPLOAD/DOWNLOAD DNA
 GLOBAL_LIST_EMPTY(hivemind_bank)

-/datum/action/changeling/hivemind_upload
+/datum/action/changeling/hivemind_pick
 	name = "Hive Channel DNA"
-	desc = "Allows us to channel DNA in the airwaves to allow other changelings to absorb it. Costs 10 chemicals."
-	button_icon_state = "hivemind_channel"
+	desc = "Allows us to upload or absorb DNA in the airwaves. Does not count towards absorb objectives. Costs 10 chemicals."
+	button_icon_state = "hive_absorb"
 	chemical_cost = 10
 	dna_cost = -1

-/datum/action/changeling/hivemind_upload/sting_action(var/mob/user)
+/datum/action/changeling/hivemind_pick/sting_action(mob/user)
+	var/datum/changeling/changeling = user.mind.changeling
+	var/channel_pick = alert("Upload or Absorb DNA?", "Channel Select", "Upload", "Absorb")
+
+	if(channel_pick == "Upload")
+		dna_upload(user)
+	if(channel_pick == "Absorb")
+		if(changeling.using_stale_dna(user))//If our current DNA is the stalest, we gotta ditch it.
+			to_chat(user, "<span class='warning'>We have reached our capacity to store genetic information! We must transform before absorbing more.</span>")
+			return
+		else
+			dna_absorb(user)
+
+/datum/action/changeling/proc/dna_upload(mob/user)
 	var/datum/changeling/changeling = user.mind.changeling
 	var/list/names = list()
 	for(var/datum/dna/DNA in (changeling.absorbed_dna+changeling.protected_dna))
@@ -56,23 +65,7 @@ GLOBAL_LIST_EMPTY(hivemind_bank)
 	feedback_add_details("changeling_powers","HU")
 	return 1

-/datum/action/changeling/hivemind_download
-	name = "Hive Absorb DNA"
-	desc = "Allows us to absorb DNA that has been channeled to the airwaves. Does not count towards absorb objectives. Costs 10 chemicals."
-	button_icon_state = "hive_absorb"
-	chemical_cost = 10
-	dna_cost = -1
-
-/datum/action/changeling/hivemind_download/can_sting(var/mob/living/carbon/user)
-	if(!..())
-		return
-	var/datum/changeling/changeling = user.mind.changeling
-	if(changeling.using_stale_dna(user))//If our current DNA is the stalest, we gotta ditch it.
-		to_chat(user, "<span class='warning'>We have reached our capacity to store genetic information! We must transform before absorbing more.</span>")
-		return
-	return 1
-
-/datum/action/changeling/hivemind_download/sting_action(var/mob/user)
+/datum/action/changeling/proc/dna_absorb(mob/user)
 	var/datum/changeling/changeling = user.mind.changeling
 	var/list/names = list()
 	for(var/datum/dna/DNA in GLOB.hivemind_bank)
@@ -177,26 +177,37 @@
 /obj/item/clothing/suit/hooded/cultrobes/cult_shield/special_overlays()
 	return mutable_appearance('icons/effects/cult_effects.dmi', shield_state, MOB_LAYER + 0.01)

-/obj/item/clothing/suit/hooded/cultrobes/berserker
+/obj/item/clothing/suit/hooded/cultrobes/flagellant_robe
 	name = "flagellant's robes"
 	desc = "Blood-soaked robes infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
-	icon_state = "hardsuit-berserker"
-	item_state = "hardsuit-berserker"
+	icon_state = "flagellantrobe"
+	item_state = "flagellantrobe"
 	flags_inv = HIDEJUMPSUIT
 	allowed = list(/obj/item/tome,/obj/item/melee/cultblade)
 	body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
 	armor = list("melee" = -45, "bullet" = -45, "laser" = -45,"energy" = -45, "bomb" = -45, "bio" = -45, "rad" = -45, "fire" = 0, "acid" = 0)
 	slowdown = -1
-	hoodtype = /obj/item/clothing/head/hooded/berserkerhood
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/suit.dmi',
+		"Drask" = 'icons/mob/species/drask/suit.dmi',
+		"Grey" = 'icons/mob/species/grey/suit.dmi'
+	)
+	hoodtype = /obj/item/clothing/head/hooded/flagellant_hood


-/obj/item/clothing/head/hooded/berserkerhood
+/obj/item/clothing/head/hooded/flagellant_hood
 	name = "flagellant's robes"
 	desc = "Blood-soaked garb infused with dark magic; allows the user to move at inhuman speeds, but at the cost of increased damage."
-	icon_state = "culthood"
+	icon_state = "flagellanthood"
+	item_state = "flagellanthood"
 	flags_inv = HIDEFACE
 	flags_cover = HEADCOVERSEYES
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	sprite_sheets = list(
+		"Vox" = 'icons/mob/species/vox/head.dmi',
+		"Drask" = 'icons/mob/species/drask/head.dmi',
+		"Grey" = 'icons/mob/species/grey/head.dmi'
+	)

 /obj/item/whetstone/cult
 	name = "eldritch whetstone"
@@ -120,7 +120,7 @@
 	selection_prompt = "You study the schematics etched on the forge..."
 	selection_title = "Forge"
 	creation_message = "<span class='cultitalic'>You work the forge as dark knowledge guides your hands, creating %ITEM%!</span>"
-	choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/berserker, \
+	choosable_items = list("Shielded Robe" = /obj/item/clothing/suit/hooded/cultrobes/cult_shield, "Flagellant's Robe" = /obj/item/clothing/suit/hooded/cultrobes/flagellant_robe, \
 							"Cultist Hardsuit" = /obj/item/storage/box/cult)

 /obj/structure/cult/functional/forge/New()
@@ -1,5 +1,5 @@
 /obj/item/paper/talisman
-	icon = 'icons/obj/paper.dmi'
+	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "paper_talisman"
 	var/cultist_name = "talisman"
 	var/cultist_desc = "A basic talisman. It serves no purpose."
@@ -781,3 +781,17 @@
 	if(AI.eyeobj)
 		AI.eyeobj.relay_speech = TRUE

+/datum/AI_Module/large/cameracrack
+	module_name = "Core Camera Cracker"
+	mod_pick_name = "cameracrack"
+	description = "By shortcirucuting the camera network chip, it overheats, preventing the camera console from using your internal camera."
+	cost = 10
+	one_purchase = TRUE
+	upgrade = TRUE
+	unlock_text = "<span class='notice'>Network chip short circuited. Internal camera disconected from network. Minimal damage to other internal components.</span>"
+	unlock_sound = 'sound/items/wirecutter.ogg'
+
+/datum/AI_Module/large/cameracrack/upgrade(mob/living/silicon/ai/AI)
+	if(AI.builtInCamera)
+		QDEL_NULL(AI.builtInCamera)
+
@@ -187,24 +187,24 @@
 		icon_state = "scrubber:0"

 /obj/machinery/portable_atmospherics/scrubber/huge/attackby(var/obj/item/W as obj, var/mob/user as mob, params)
-	if(istype(W, /obj/item/wrench))
-		if(stationary)
-			to_chat(user, "<span class='warning'>The bolts are too tight for you to unscrew!</span>")
-			return
-		if(on)
-			to_chat(user, "<span class='warning'>Turn it off first!</span>")
-			return
-
-		anchored = !anchored
-		playsound(loc, W.usesound, 50, 1)
-		to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] \the [src].</span>")
-		return
-
 	if((istype(W, /obj/item/analyzer)) && get_dist(user, src) <= 1)
 		atmosanalyzer_scan(air_contents, user)
 		return
 	return ..()

+/obj/machinery/portable_atmospherics/scrubber/huge/wrench_act(mob/user, obj/item/I)
+	. = TRUE
+	if(stationary)
+		to_chat(user, "<span class='warning'>The bolts are too tight for you to unscrew!</span>")
+		return
+	if(on)
+		to_chat(user, "<span class='warning'>Turn it off first!</span>")
+		return
+	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+		return
+	anchored = !anchored
+	to_chat(user, "<span class='notice'>You [anchored ? "wrench" : "unwrench"] [src].</span>")
+
 /obj/machinery/portable_atmospherics/scrubber/huge/stationary
 	name = "Stationary Air Scrubber"
 	stationary = 1
@@ -106,23 +106,37 @@ GLOBAL_LIST_EMPTY(tcomms_machines)


 /**
-  * Start of Ion Anomalie Event
+  * Start of Ion Anomaly Event
  *
-  * Proc to easily start an Ion Anomalie's effects, and update the icon
+  * Proc to easily start an Ion Anomaly's effects, and update the icon
  */
 /obj/machinery/tcomms/proc/start_ion()
 	ion = TRUE
 	update_icon()

 /**
-  * End of Ion Anomalie Event
+  * End of Ion Anomaly Event
  *
-  * Proc to easily stop an Ion Anomalie's effects, and update the icon
+  * Proc to easily stop an Ion Anomaly's effects, and update the icon
  */
 /obj/machinery/tcomms/proc/end_ion()
 	ion = FALSE
 	update_icon()

+/**
+  * Z-Level transit change helper
+  *
+  * Proc to make sure you cant have two of these active on a Z-level at once. It also makes sure to update the linkage
+  */
+/obj/machinery/tcomms/onTransitZ(old_z, new_z)
+	. = ..()
+	if(active)
+		active = FALSE
+		// This needs a timer because otherwise its on the shuttle Z and the message is missed
+		addtimer(CALLBACK(src, /atom.proc/visible_message, "<span class='warning'>Radio equipment on [src] has been overloaded by heavy bluespace interference. Please restart the machine.</span>"), 5)
+	update_icon()
+
+
 /**
  * Logging helper
  *
@@ -14,6 +14,8 @@
 	name = "Telecommunications Core"
 	desc = "A large rack full of communications equipment. Looks important."
 	icon_state = "core"
+	// This starts as off so you cant make cores as hot spares
+	active = FALSE
 	/// The NTTC config for this device
 	var/datum/nttc_configuration/nttc = new()
 	/// List of all reachable devices
@@ -35,6 +37,11 @@
 	link_password = GenerateKey()
 	reachable_zlevels |= loc.z
 	component_parts += new /obj/item/circuitboard/tcomms/core(null)
+	if(check_power_on())
+		active = TRUE
+	else
+		visible_message("<span class='warning'>Error: Another core is already active in this sector. Power-up cancelled due to radio interference.</span>")
+	update_icon()

 /**
  * Destructor for the core.
@@ -121,6 +128,38 @@
 			reachable_zlevels |= R.loc.z


+/**
+  * Z-Level transit change helper
+  *
+  * Handles parent call of disabling the machine if it changes Z-level, but also rebuilds the list of reachable levels
+  */
+/obj/machinery/tcomms/core/onTransitZ(old_z, new_z)
+	. = ..()
+	refresh_zlevels()
+
+/**
+  * Power-on checker
+  *
+  * Checks the z-level to see if an existing core is already powered on, and deny this one turning on if there is one. Returns TRUE if it can power on, or FALSE if it cannot
+  */
+/obj/machinery/tcomms/core/proc/check_power_on()
+	// Cancel if we are already on
+	if(active)
+		return TRUE
+
+	for(var/obj/machinery/tcomms/core/C in GLOB.tcomms_machines)
+		// Make sure we dont check ourselves
+		if(C == src)
+			continue
+		// We dont care about ones on other zlevels
+		if(!atoms_share_level(C, src))
+			continue
+		// If another core is active, return FALSE
+		if(C.active)
+			return FALSE
+	// If we got here there isnt an active core on this Z-level. So return true
+	return TRUE
+
 //////////////
 // UI STUFF //
 //////////////
@@ -198,8 +237,11 @@
 	if(ui_tab == UI_TAB_CONFIG)
 		// All the toggle on/offs go here
 		if(href_list["toggle_active"])
-			active = !active
-			update_icon()
+			if(check_power_on())
+				active = !active
+				update_icon()
+			else
+				to_chat(usr, "<span class='warning'>Error: Another core is already active in this sector. Power-up cancelled due to radio interference.</span>")
 		// NTTC Toggles
 		if(href_list["nttc_toggle_jobs"])
 			nttc.toggle_jobs = !nttc.toggle_jobs
@@ -9,6 +9,8 @@
 	name = "Telecommunications Relay"
 	desc = "A large device with several radio antennas on it."
 	icon_state = "relay"
+	// This starts as off so you cant make cores as hot spares
+	active = FALSE
 	/// The host core for this relay
 	var/obj/machinery/tcomms/core/linked_core
 	/// ID of the hub to auto link to
@@ -26,6 +28,11 @@
 /obj/machinery/tcomms/relay/Initialize(mapload)
 	. = ..()
 	component_parts += new /obj/item/circuitboard/tcomms/relay(null)
+	if(check_power_on())
+		active = TRUE
+	else
+		visible_message("<span class='warning'>Error: Another relay is already active in this sector. Power-up cancelled due to radio interference.</span>")
+	update_icon()
 	if(mapload && autolink_id)
 		return INITIALIZE_HINT_LATELOAD

@@ -51,6 +58,40 @@
 			// Only ONE of these with one ID should exist per world
 			break

+/**
+  * Z-Level transit change helper
+  *
+  * Handles parent call of disabling the machine if it changes Z-level, but also rebuilds the list of reachable levels on the linked core
+  */
+/obj/machinery/tcomms/relay/onTransitZ(old_z, new_z)
+	. = ..()
+	if(linked_core)
+		linked_core.refresh_zlevels()
+
+
+/**
+  * Power-on checker
+  *
+  * Checks the z-level to see if an existing relay is already powered on, and deny this one turning on if there is one. Returns TRUE if it can power on, or FALSE if it cannot
+  */
+/obj/machinery/tcomms/relay/proc/check_power_on()
+	// Cancel if we are already on
+	if(active)
+		return TRUE
+
+	for(var/obj/machinery/tcomms/relay/R in GLOB.tcomms_machines)
+		// Make sure we dont check ourselves
+		if(R == src)
+			continue
+		// We dont care about ones on other zlevels
+		if(!atoms_share_level(R, src))
+			continue
+		// If another relay is active, return FALSE
+		if(R.active)
+			return FALSE
+	// If we got here there isnt an active relay on this Z-level. So return TRUE
+	return TRUE
+
 /**
  * Proc to link the relay to the core.
  *
@@ -83,9 +124,9 @@
  * Proc which ensures the host core has its zlevels updated (icons are updated by parent call)
  */
 /obj/machinery/tcomms/relay/power_change()
-    ..()
-    if(linked_core)
-        linked_core.refresh_zlevels()
+	..()
+	if(linked_core)
+		linked_core.refresh_zlevels()

 //////////////
 // UI STUFF //
@@ -127,10 +168,13 @@

 	// All the toggle on/offs go here
 	if(href_list["toggle_active"])
-		active = !active
-		update_icon()
-		if(linked_core)
-			linked_core.refresh_zlevels()
+		if(check_power_on())
+			active = !active
+			update_icon()
+			if(linked_core)
+				linked_core.refresh_zlevels()
+		else
+			to_chat(usr, "<span class='warning'>Error: Another relay is already active in this sector. Power-up cancelled due to radio interference.</span>")

 	// Set network ID
 	if(href_list["network_id"])
@@ -331,6 +331,8 @@
 		else
 			occupant.clear_alert("mechaport")
 	if(leg_overload_mode)
+		log_message("Leg Overload damage.")
+		take_damage(1, BRUTE, FALSE, FALSE)
 		if(obj_integrity < max_integrity - max_integrity / 3)
 			leg_overload_mode = FALSE
 			step_in = initial(step_in)
@@ -502,7 +504,7 @@
 				check_for_internal_damage(list(MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST))
 			else
 				check_for_internal_damage(list(MECHA_INT_FIRE,MECHA_INT_TEMP_CONTROL,MECHA_INT_TANK_BREACH,MECHA_INT_CONTROL_LOST,MECHA_INT_SHORT_CIRCUIT))
-		if(. >= 5 || prob(33))
+		if((. >= 5 || prob(33)) && !(. == 1 && leg_overload_mode)) //If it takes 1 damage and leg_overload_mode is true, do not say TAKING DAMAGE! to the user several times a second.
 			occupant_message("<span class='userdanger'>Taking damage!</span>")
 		log_message("Took [damage_amount] points of damage. Damage type: [damage_type]")

@@ -540,7 +542,7 @@
 	user.changeNext_move(CLICK_CD_MELEE)
 	user.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 	playsound(loc, 'sound/weapons/tap.ogg', 40, 1, -1)
-	user.visible_message("<span class='danger'>[user] hits [name]. Nothing happens</span>", "<span class='danger'>You hit [name] with no visible effect.</span>")
+	user.visible_message("<span class='notice'>[user] hits [name]. Nothing happens</span>", "<span class='notice'>You hit [name] with no visible effect.</span>")
 	log_message("Attack by hand/paw. Attacker - [user].")


@@ -11,7 +11,7 @@
 	slot_flags = SLOT_BELT | SLOT_EARS
 	attack_verb = list("attacked", "coloured")
 	toolspeed = 1
-	var/colour = "#FF0000" //RGB
+	var/colour = COLOR_RED
 	var/drawtype = "rune"
 	var/list/graffiti = list("body","amyjon","face","matt","revolution","engie","guy","end","dwarf","uboa","up","down","left","right","heart","borgsrogue","voxpox","shitcurity","catbeast","hieroglyphs1","hieroglyphs2","hieroglyphs3","security","syndicate1","syndicate2","nanotrasen","lie","valid","arrowleft","arrowright","arrowup","arrowdown","chicken","hailcrab","brokenheart","peace","scribble","scribble2","scribble3","skrek","squish","tunnelsnake","yip","youaredead")
 	var/list/letters = list("a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z")
@@ -123,54 +123,54 @@

 /obj/item/toy/crayon/red
 	icon_state = "crayonred"
-	colour = "#DA0000"
+	colour = COLOR_RED
 	colourName = "red"

 /obj/item/toy/crayon/orange
 	icon_state = "crayonorange"
-	colour = "#FF9300"
+	colour = COLOR_ORANGE
 	colourName = "orange"

 /obj/item/toy/crayon/yellow
 	icon_state = "crayonyellow"
-	colour = "#FFF200"
+	colour = COLOR_YELLOW
 	colourName = "yellow"

 /obj/item/toy/crayon/green
 	icon_state = "crayongreen"
-	colour = "#A8E61D"
+	colour = COLOR_GREEN
 	colourName = "green"

 /obj/item/toy/crayon/blue
 	icon_state = "crayonblue"
-	colour = "#00B7EF"
+	colour = COLOR_BLUE
 	colourName = "blue"

 /obj/item/toy/crayon/purple
 	icon_state = "crayonpurple"
-	colour = "#DA00FF"
+	colour = COLOR_PURPLE
 	colourName = "purple"

 /obj/item/toy/crayon/random/New()
 	icon_state = pick(list("crayonred", "crayonorange", "crayonyellow", "crayongreen", "crayonblue", "crayonpurple"))
 	switch(icon_state)
 		if("crayonred")
-			colour = "#DA0000"
+			colour = COLOR_RED
 			colourName = "red"
 		if("crayonorange")
-			colour = "#FF9300"
+			colour = COLOR_ORANGE
 			colourName = "orange"
 		if("crayonyellow")
-			colour = "#FFF200"
+			colour = COLOR_YELLOW
 			colourName = "yellow"
 		if("crayongreen")
-			colour = "#A8E61D"
+			colour =COLOR_GREEN
 			colourName = "green"
 		if("crayonblue")
-			colour = "#00B7EF"
+			colour = COLOR_BLUE
 			colourName = "blue"
 		if("crayonpurple")
-			colour = "#DA00FF"
+			colour = COLOR_PURPLE
 			colourName = "purple"
 	..()

@@ -197,10 +197,10 @@
 	if(!Adjacent(usr) || usr.incapacitated())
 		return
 	if(href_list["color"])
-		if(colour != "#FFFFFF")
-			colour = "#FFFFFF"
+		if(colour != COLOR_WHITE)
+			colour = COLOR_WHITE
 		else
-			colour = "#000000"
+			colour = COLOR_BLACK
 		update_window(usr)
 	else
 		..()
@@ -325,7 +325,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	// If we were to send to a channel we don't have, drop it.
 	return RADIO_CONNECTION_FAIL

-/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, var/verb = "says")
+/obj/item/radio/talk_into(mob/living/M as mob, list/message_pieces, channel, verbage = "says")
 	if(!on)
 		return 0 // the device has to be on
 	//  Fix for permacell radios, but kinda eh about actually fixing them.
@@ -428,6 +428,7 @@ GLOBAL_LIST_INIT(default_medbay_channels, list(
 	tcm.connection = connection
 	tcm.vname = M.voice_name
 	tcm.sender = M
+	tcm.verbage = verbage
 	// Now put that through the stuff
 	var/handled = FALSE
 	if(connection)
@@ -72,7 +72,7 @@ REAGENT SCANNER
 						var/turf/U = O.loc
 						if(U && U.intact)
 							O.invisibility = 101
-							O.alpha = 255
+						O.alpha = 255
 		for(var/mob/living/M in T.contents)
 			var/oldalpha = M.alpha
 			if(M.alpha < 255 && istype(M))
@@ -251,6 +251,7 @@
 		message_admins("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at <A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[bombturf.x];Y=[bombturf.y];Z=[bombturf.z]'>[A.name] (JMP)</a>.")
 		log_game("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).")
 		investigate_log("[key_name_admin(user)] has lit the [src] trapped with [boobytrap] by [key_name_admin(trapper)] at [A.name] ([bombturf.x],[bombturf.y],[bombturf.z]).", INVESTIGATE_BOMB)
+		burn()
 	else
 		return ..()

@@ -267,8 +268,16 @@

 /obj/item/flag/chameleon/burn()
 	if(boobytrap)
-		boobytrap.prime()
-	..()
+		fire_act()
+		addtimer(CALLBACK(src, .proc/prime_boobytrap), boobytrap.det_time)
+	else
+		..()
+
+/obj/item/flag/chameleon/proc/prime_boobytrap()
+	boobytrap.forceMove(get_turf(loc))
+	boobytrap.prime()
+	boobytrap = null
+	burn()

 /obj/item/flag/chameleon/updateFlagIcon()
 	icon_state = updated_icon_state
@@ -472,7 +472,8 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
 	new /datum/stack_recipe("cane mould", /obj/item/kitchen/mould/cane, 1, on_floor = 1), \
 	new /datum/stack_recipe("cash mould", /obj/item/kitchen/mould/cash, 1, on_floor = 1), \
 	new /datum/stack_recipe("coin mould", /obj/item/kitchen/mould/coin, 1, on_floor = 1), \
-	new /datum/stack_recipe("sucker mould", /obj/item/kitchen/mould/loli, 1, on_floor = 1)))
+	new /datum/stack_recipe("sucker mould", /obj/item/kitchen/mould/loli, 1, on_floor = 1), \
+	new /datum/stack_recipe("warning cone", /obj/item/clothing/head/cone, 5, on_floor = 1)))

 /obj/item/stack/sheet/plastic
 	name = "plastic"
@@ -35,7 +35,7 @@
 	desc = "A translucent balloon. There's nothing in it."
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "waterballoon-e"
-	item_state = "balloon-empty"
+	item_state = "waterballoon-e"

 /obj/item/toy/balloon/New()
 	..()
@@ -99,10 +99,10 @@
 /obj/item/toy/balloon/update_icon()
 	if(src.reagents.total_volume >= 1)
 		icon_state = "waterballoon"
-		item_state = "balloon"
+		item_state = "waterballoon"
 	else
 		icon_state = "waterballoon-e"
-		item_state = "balloon-empty"
+		item_state = "waterballoon-e"

 /obj/item/toy/syndicateballoon
 	name = "syndicate balloon"
@@ -104,7 +104,7 @@
 	playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)

 	M.visible_message("<span class='danger'>[U] comes from behind and begins garroting [M] with the [src]!</span>", \
-				  "<span class='userdanger'>[U]\ begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
+				  "<span class='userdanger'>[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]</span>", \
 				  "You hear struggling and wire strain against flesh!")

 	return
@@ -19,7 +19,7 @@

 /obj/item/grenade/smokebomb/prime()
 	playsound(src.loc, 'sound/effects/smoke.ogg', 50, 1, -3)
-	src.smoke.set_up(10, 0, usr.loc)
+	smoke.set_up(10, 0)
 	spawn(0)
 		src.smoke.start()
 		sleep(10)
@@ -126,13 +126,15 @@
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()

-/obj/item/restraints/handcuffs/cable/proc/cable_color(var/colorC)
-	if(colorC)
-		if(colorC == "rainbow")
-			colorC = color_rainbow()
-		color = colorC
-	else
+/obj/item/restraints/handcuffs/cable/proc/cable_color(colorC)
+	if(!colorC)
 		color = COLOR_RED
+	else if(colorC == "rainbow")
+		color = color_rainbow()
+	else if(colorC == "orange") //byond only knows 16 colors by name, and orange isn't one of them
+		color = COLOR_ORANGE
+	else
+		color = colorC

 /obj/item/restraints/handcuffs/cable/proc/color_rainbow()
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
@@ -380,12 +380,13 @@
 	w_class = WEIGHT_CLASS_BULKY
 	flags = CONDUCT
 	materials = list(MAT_METAL=3000)
+	cant_hold = list(/obj/item/disk/nuclear) // Prevents some cheesing

-/obj/item/storage/bag/tray/attack(mob/living/M as mob, mob/living/user as mob)
+/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
 	..()
 	// Drop all the things. All of them.
 	var/list/obj/item/oldContents = contents.Copy()
-	quick_empty()
+	drop_inventory(user)

 	// Make each item scatter a bit
 	for(var/obj/item/I in oldContents)
@@ -846,7 +846,7 @@
 	desc = "A small box of Almost But Not Quite Plasma Premium Matches."
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "matchbox"
-	item_state = "zippo"
+	item_state = "matchbox"
 	storage_slots = 10
 	w_class = WEIGHT_CLASS_TINY
 	max_w_class = WEIGHT_CLASS_TINY
@@ -226,14 +226,14 @@
 	name = "\improper DromedaryCo packet"
 	desc = "A packet of six imported DromedaryCo cancer sticks. A label on the packaging reads, \"Wouldn't a slow death make a change?\""
 	icon_state = "Dpacket"
-	item_state = "cigpacket"
+	item_state = "Dpacket"


 /obj/item/storage/fancy/cigarettes/syndicate
 	name = "\improper Syndicate Cigarettes"
 	desc = "A packet of six evil-looking cigarettes, A label on the packaging reads, \"Donk Co\""
 	icon_state = "robustpacket"
-	item_state = "cigpacket"
+	item_state = "robustpacket"

 /obj/item/storage/fancy/cigarettes/syndicate/New()
 	..()
@@ -244,14 +244,14 @@
 	name = "cigarette packet"
 	desc = "An obscure brand of cigarettes."
 	icon_state = "syndiepacket"
-	item_state = "cigpacket"
+	item_state = "syndiepacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/syndicate

 /obj/item/storage/fancy/cigarettes/cigpack_med
 	name = "Medical Marijuana Packet"
 	desc = "A prescription packet containing six marijuana cigarettes."
 	icon_state = "medpacket"
-	item_state = "cigpacket"
+	item_state = "medpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/medical_marijuana


@@ -259,46 +259,46 @@
 	name = "\improper Uplift Smooth packet"
 	desc = "Your favorite brand, now menthol flavored."
 	icon_state = "upliftpacket"
-	item_state = "cigpacket"
+	item_state = "upliftpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/menthol

 /obj/item/storage/fancy/cigarettes/cigpack_robust
 	name = "\improper Robust packet"
 	desc = "Smoked by the robust."
 	icon_state = "robustpacket"
-	item_state = "cigpacket"
+	item_state = "robustpacket"

 /obj/item/storage/fancy/cigarettes/cigpack_robustgold
 	name = "\improper Robust Gold packet"
 	desc = "Smoked by the truly robust."
 	icon_state = "robustgpacket"
-	item_state = "cigpacket"
+	item_state = "robustgpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/robustgold

 /obj/item/storage/fancy/cigarettes/cigpack_carp
 	name = "\improper Carp Classic packet"
 	desc = "Since 2313."
 	icon_state = "carppacket"
-	item_state = "cigpacket"
+	item_state = "carppacket"

 /obj/item/storage/fancy/cigarettes/cigpack_midori
 	name = "\improper Midori Tabako packet"
 	desc = "You can't understand the runes, but the packet smells funny."
 	icon_state = "midoripacket"
-	item_state = "cigpacket"
+	item_state = "midoripacket"

 /obj/item/storage/fancy/cigarettes/cigpack_shadyjims
 	name ="\improper Shady Jim's Super Slims"
 	desc = "Is your weight slowing you down? Having trouble running away from gravitational singularities? Can't stop stuffing your mouth? Smoke Shady Jim's Super Slims and watch all that fat burn away. Guaranteed results!"
 	icon_state = "shadyjimpacket"
-	item_state = "cigpacket"
+	item_state = "shadyjimpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/shadyjims

 /obj/item/storage/fancy/cigarettes/cigpack_random
 	name ="\improper Embellished Enigma packet"
 	desc = "For the true connoisseur of exotic flavors."
 	icon_state = "shadyjimpacket"
-	item_state = "cigpacket"
+	item_state = "shadyjimpacket"
 	cigarette_type = /obj/item/clothing/mask/cigarette/random

 /obj/item/storage/fancy/rollingpapers
@@ -307,6 +307,7 @@
 	w_class = WEIGHT_CLASS_TINY
 	icon = 'icons/obj/cigarettes.dmi'
 	icon_state = "cig_paper_pack"
+	item_state = "cig_paper_pack"
 	storage_slots = 10
 	icon_type = "rolling paper"
 	can_hold = list(/obj/item/rollingpaper)
@@ -438,8 +438,11 @@
 	if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained())
 		return

+	drop_inventory(usr)
+
+/obj/item/storage/proc/drop_inventory(user)
 	var/turf/T = get_turf(src)
-	hide_from(usr)
+	hide_from(user)
 	for(var/obj/item/I in contents)
 		remove_from_storage(I, T)
 		CHECK_TICK
@@ -499,10 +502,9 @@

 /obj/item/storage/attack_self(mob/user)

-	//Clicking on itself will empty it, if it has the verb to do that.
-	if(user.is_in_active_hand(src))
-		if(verbs.Find(/obj/item/storage/verb/quick_empty))
-			quick_empty()
+	//Clicking on itself will empty it, if allow_quick_empty is TRUE
+	if(allow_quick_empty && user.is_in_active_hand(src))
+		drop_inventory(user)

 //Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area).
 //Returns -1 if the atom was not found on container.
@@ -69,6 +69,11 @@
 /obj/structure/closet/secure_closet/closed_item_click(mob/user)
 	togglelock(user)

+/obj/structure/closet/secure_closet/AltClick(mob/user)
+	..()
+	if(Adjacent(user))
+		togglelock(user)
+
 /obj/structure/closet/secure_closet/emag_act(mob/user)
 	if(!broken)
 		broken = TRUE
@@ -56,27 +56,20 @@

 /obj/structure/dresser/crowbar_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_start_check(src, user, 0))
+	if(!I.use_tool(src, user, 0))
 		return
 	TOOL_ATTEMPT_DISMANTLE_MESSAGE
 	if(I.use_tool(src, user, 50, volume = I.tool_volume))
 		TOOL_DISMANTLE_SUCCESS_MESSAGE
-
+		deconstruct(disassembled = TRUE)

 /obj/structure/dresser/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.use_tool(src, user, 0, volume = I.tool_volume))
-		return
-	if(anchored)
-		WRENCH_UNANCHOR_MESSAGE
-		anchored = FALSE
-	else
-		if(!isfloorturf(loc))
-			user.visible_message("<span class='warning'>A floor must be present to secure [src]!</span>")
-			return
-		WRENCH_ANCHOR_MESSAGE
-		anchored = TRUE
+	default_unfasten_wrench(user, I, time = 20)

-/obj/structure/dresser/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(drop_location(), 30)
-	qdel(src)
+obj/structure/dresser/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()
@@ -11,12 +11,30 @@
 	anchored = TRUE

 /obj/structure/loom/attackby(obj/item/I, mob/user)
-	if(default_unfasten_wrench(user, I, 5))
-		return
 	if(weave(I, user))
 		return
 	return ..()

+/obj/structure/loom/crowbar_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0))
+		return
+	TOOL_ATTEMPT_DISMANTLE_MESSAGE
+	if(I.use_tool(src, user, 50, volume = I.tool_volume))
+		TOOL_DISMANTLE_SUCCESS_MESSAGE
+		deconstruct(disassembled = TRUE)
+
+/obj/structure/loom/wrench_act(mob/user, obj/item/I)
+	. = TRUE
+	default_unfasten_wrench(user, I, time = 20)
+
+/obj/structure/loom/deconstruct(disassembled = FALSE)
+	var/mat_drop = 5
+	if(disassembled)
+		mat_drop = 10
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()
+
 ///Handles the weaving.
 /obj/structure/loom/proc/weave(obj/item/stack/sheet/cotton/W, mob/user)
 	if(!istype(W))
@@ -292,12 +292,12 @@

 /obj/structure/sign/directions/engineering
 	name = "\improper Engineering Department"
-	desc = "A direction sign, pointing out which way the Engineering department is."
+	desc = "A direction sign, pointing out which way the Engineering Department is."
 	icon_state = "direction_eng"

 /obj/structure/sign/directions/security
 	name = "\improper Security Department"
-	desc = "A direction sign, pointing out which way the Security department is."
+	desc = "A direction sign, pointing out which way the Security Department is."
 	icon_state = "direction_sec"

 /obj/structure/sign/directions/medical
@@ -307,12 +307,12 @@

 /obj/structure/sign/directions/evac
 	name = "\improper Escape Arm"
-	desc = "A direction sign, pointing out which way escape shuttle dock is."
+	desc = "A direction sign, pointing out which way Escape Shuttle Dock is."
 	icon_state = "direction_evac"

 /obj/structure/sign/directions/cargo
 	name = "\improper Cargo Department"
-	desc = "A direction sign, pointing out which way the Cargo department is."
+	desc = "A direction sign, pointing out which way the Cargo Department is."
 	icon_state = "direction_supply"

 /obj/structure/sign/explosives
@@ -340,6 +340,8 @@ GLOBAL_VAR_INIT(world_topic_spam_protect_time, world.timeofday)
 	#endif

 	for(var/client/C in GLOB.clients)
+		var/secs_before_auto_reconnect = 10 // TODO: make it higher if server is due for an update @AffectedArc07
+		C << output(list2params(list(secs_before_auto_reconnect)), "browseroutput:reboot")
 		if(config.server)       //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
 			C << link("byond://[config.server]")

@@ -11,7 +11,8 @@
 	resistance_flags = NONE
 	armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 10, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
 	sprite_sheets = list(
-		"Vox" = 'icons/mob/species/vox/suit.dmi'
+		"Vox" = 'icons/mob/species/vox/suit.dmi',
+		"Grey" = 'icons/mob/species/grey/suit.dmi'
 		)
 	w_class = WEIGHT_CLASS_NORMAL

@@ -357,7 +357,7 @@
 		if(!fail_msg)
 			to_chat(usr, "<span class='notice'>[TR.name] constructed.</span>")
 			if(TR.alert_admins_on_craft)
-				message_admins("[usr.ckey] has created a [TR.name] at [ADMIN_COORDJMP(usr)]")
+				message_admins("[key_name_admin(usr)] has created a [TR.name] at [ADMIN_COORDJMP(usr)]")
 		else
 			to_chat(usr, "<span class ='warning'>Construction failed[fail_msg]</span>")
 		busy = FALSE
@@ -7,6 +7,7 @@
 	materials = list(MAT_GLASS=100)
 	var/light_intensity = 2
 	light_color = LIGHT_COLOR_LIGHTBLUE
+	resistance_flags = FLAMMABLE

 /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change()
 	if(!isShotFlammable() && (resistance_flags & ON_FIRE))
@@ -30,6 +31,7 @@
 		overlays += filling
 		name = "shot glass of " + reagents.get_master_reagent_name() //No matter what, the glass will tell you the reagent's name. Might be too abusable in the future.
 		if(resistance_flags & ON_FIRE)
+			cut_overlay(GLOB.fire_overlay, TRUE)
 			overlays += "shotglass_fire"
 			name = "flaming [name]"
 	else
@@ -30,7 +30,7 @@
 	name = "-meat"
 	var/subjectname = ""
 	var/subjectjob = null
-	tastes = list("tender meat" = 1)
+	tastes = list("salty meat" = 1)

 /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct
 	name = "meat product"
@@ -198,10 +198,17 @@
 		return
 	return ..()

+/obj/structure/beebox/crowbar_act(mob/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0))
+		return
+	TOOL_ATTEMPT_DISMANTLE_MESSAGE
+	if(I.use_tool(src, user, 50, volume = I.tool_volume))
+		TOOL_DISMANTLE_SUCCESS_MESSAGE
+		deconstruct(disassembled = TRUE)
+
 /obj/structure/beebox/wrench_act(mob/user, obj/item/I)
 	. = TRUE
-	if(!I.tool_use_check(user, 0))
-		return
 	default_unfasten_wrench(user, I, time = 20)

 /obj/structure/beebox/attack_hand(mob/user)
@@ -261,15 +268,18 @@
 					visible_message("<span class='notice'>[user] removes the queen from the apiary.</span>")
 					queen_bee = null

-/obj/structure/beebox/deconstruct(disassembled = TRUE)
-	new /obj/item/stack/sheet/wood(loc, 20)
+/obj/structure/beebox/deconstruct(disassembled = FALSE)
+	var/mat_drop = 20
+	if(disassembled)
+		mat_drop = 40
+	new /obj/item/stack/sheet/wood(loc, mat_drop)
 	for(var/mob/living/simple_animal/hostile/poison/bees/B in bees)
 		if(B.loc == src)
 			B.forceMove(drop_location())
 	for(var/obj/item/honey_frame/HF in honey_frames)
 		HF.forceMove(drop_location())
 		honey_frames -= HF
-	qdel(src)
+	..()

 /obj/structure/beebox/unwrenched
 	anchored = FALSE
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/objects.dmi'
 	icon_state = "barrel"
 	density = TRUE
-	anchored = FALSE
+	anchored = TRUE
 	container_type = DRAINABLE | AMOUNT_VISIBLE
 	pressure_resistance = 2 * ONE_ATMOSPHERE
 	max_integrity = 300
@@ -65,6 +65,26 @@
 		to_chat(user, "<span class='notice'>You close [src], letting you draw from its tap.</span>")
 	update_icon()

+/obj/structure/fermenting_barrel/crowbar_act(mob/living/user, obj/item/I)
+	. = TRUE
+	if(!I.use_tool(src, user, 0))
+		return
+	TOOL_ATTEMPT_DISMANTLE_MESSAGE
+	if(I.use_tool(src, user, 50, volume = I.tool_volume))
+		TOOL_DISMANTLE_SUCCESS_MESSAGE
+		deconstruct(disassembled = TRUE)
+
+/obj/structure/fermenting_barrel/wrench_act(mob/living/user, obj/item/I)
+	. = TRUE
+	default_unfasten_wrench(user, I, time = 20)
+
+/obj/structure/fermenting_barrel/deconstruct(disassembled = FALSE)
+	var/mat_drop = 15
+	if(disassembled)
+		mat_drop = 30
+	new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
+	..()
+
 /obj/structure/fermenting_barrel/update_icon()
 	if(open)
 		icon_state = "barrel_open"
@@ -1,20 +1,10 @@
-/mob/dead/observer/say(var/message)
+/mob/dead/observer/say(message)
 	message = sanitize(copytext(message, 1, MAX_MESSAGE_LEN))

 	if(!message)
 		return

-	log_ghostsay(message, src)
-
-	if(src.client)
-		if(src.client.prefs.muted & MUTE_DEADCHAT)
-			to_chat(src, "<span class='warning'>You cannot talk in deadchat (muted).</span>")
-			return
-
-		if(src.client.handle_spam_prevention(message,MUTE_DEADCHAT))
-			return
-
-	. = src.say_dead(message)
+	return say_dead(message)


 /mob/dead/observer/emote(act, type, message, force)
@@ -171,7 +171,14 @@

 	to_chat(src, heard)

-/mob/proc/hear_holopad_talk(list/message_pieces, var/verb = "says", var/mob/speaker = null)
+/mob/proc/hear_holopad_talk(list/message_pieces, verb = "says", mob/speaker = null)
+	if(sleeping || stat == UNCONSCIOUS)
+		hear_sleep(multilingual_to_message(message_pieces))
+		return
+
+	if(!can_hear())
+		return
+
 	var/message = combine_message(message_pieces, verb, speaker)

 	var/name = speaker.name
@@ -186,7 +186,7 @@
 	if(prob(80))
 		new_name += " [pick(list("Hadii","Kaytam","Zhan-Khazan","Hharar","Njarir'Akhan"))]"
 	else
-		new_name += ..(gender,1)
+		new_name += " [..(gender,1)]"
 	return new_name

 /datum/language/vulpkanin
@@ -572,41 +572,34 @@ emp_act
 		if(M.a_intent == INTENT_HARM)
 			if(w_uniform)
 				w_uniform.add_fingerprint(M)
-			var/damage = rand(15, 30)
+			var/damage = prob(90) ? 20 : 0
 			if(!damage)
-				playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
+				playsound(loc, 'sound/weapons/slashmiss.ogg', 50, TRUE, -1)
 				visible_message("<span class='danger'>[M] has lunged at [src]!</span>")
 				return 0
 			var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
-			var/armor_block = run_armor_check(affecting, "melee")
+			var/armor_block = run_armor_check(affecting, "melee", armour_penetration = 10)

-			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+			playsound(loc, 'sound/weapons/slice.ogg', 25, TRUE, -1)
 			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
 				"<span class='userdanger'>[M] has slashed at [src]!</span>")

 			apply_damage(damage, BRUTE, affecting, armor_block)
-			if(damage >= 25)
-				visible_message("<span class='danger'>[M] has wounded [src]!</span>", \
- 					"<span class='userdanger'>[M] has wounded [src]!</span>")
-				apply_effect(4, WEAKEN, armor_block)
-				add_attack_logs(M, src, "Alien attacked")
+			add_attack_logs(M, src, "Alien attacked")
 			updatehealth("alien attack")

-		if(M.a_intent == INTENT_DISARM)
-			if(prob(80))
+		if(M.a_intent == INTENT_DISARM) //Always drop item in hand, if no item, get stun instead.
+			var/obj/item/I = get_active_hand()
+			if(I && unEquip(I))
+				playsound(loc, 'sound/weapons/slash.ogg', 25, TRUE, -1)
+				visible_message("<span class='danger'>[M] disarms [src]!</span>", "<span class='userdanger'>[M] disarms you!</span>", "<span class='hear'>You hear aggressive shuffling!</span>")
+				to_chat(M, "<span class='danger'>You disarm [src]!</span>")
+			else
 				var/obj/item/organ/external/affecting = get_organ(ran_zone(M.zone_selected))
 				playsound(loc, 'sound/weapons/pierce.ogg', 25, 1, -1)
 				apply_effect(5, WEAKEN, run_armor_check(affecting, "melee"))
 				add_attack_logs(M, src, "Alien tackled")
 				visible_message("<span class='danger'>[M] has tackled down [src]!</span>")
-			else
-				if(prob(99)) //this looks fucking stupid but it was previously 'var/randn = rand(1, 100); if(randn <= 99)'
-					playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
-					drop_item()
-					visible_message("<span class='danger'>[M] disarmed [src]!</span>")
-				else
-					playsound(loc, 'sound/weapons/slashmiss.ogg', 50, 1, -1)
-					visible_message("<span class='danger'>[M] has tried to disarm [src]!</span>")

 /mob/living/carbon/human/attack_animal(mob/living/simple_animal/M)
 	. = ..()
@@ -74,6 +74,10 @@
 	..()
 	H.gender = NEUTER

+/datum/species/diona/on_species_loss(mob/living/carbon/human/H)
+	. = ..()
+	H.clear_alert("nolight")
+
 /datum/species/diona/handle_reagents(mob/living/carbon/human/H, datum/reagent/R)
 	if(R.id == "glyphosate" || R.id == "atrazine")
 		H.adjustToxLoss(3) //Deal aditional damage
@@ -351,8 +351,6 @@ proc/get_radio_key_from_channel(var/channel)
 			return

 	if(stat)
-		if(stat == DEAD)
-			return say_dead(message_pieces)
 		return

 	if(is_muzzled())
@@ -173,19 +173,19 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
 	add_language("Galactic Common", 1)
 	add_language("Sol Common", 1)
 	add_language("Tradeband", 1)
-	add_language("Neo-Russkiya", 0)
-	add_language("Gutter", 0)
-	add_language("Sinta'unathi", 0)
-	add_language("Siik'tajr", 0)
-	add_language("Canilunzt", 0)
-	add_language("Skrellian", 0)
-	add_language("Vox-pidgin", 0)
-	add_language("Orluum", 0)
-	add_language("Rootspeak", 0)
+	add_language("Neo-Russkiya", 1)
+	add_language("Gutter", 1)
+	add_language("Sinta'unathi", 1)
+	add_language("Siik'tajr", 1)
+	add_language("Canilunzt", 1)
+	add_language("Skrellian", 1)
+	add_language("Vox-pidgin", 1)
+	add_language("Orluum", 1)
+	add_language("Rootspeak", 1)
 	add_language("Trinary", 1)
-	add_language("Chittin", 0)
-	add_language("Bubblish", 0)
-	add_language("Clownish", 0)
+	add_language("Chittin", 1)
+	add_language("Bubblish", 1)
+	add_language("Clownish", 1)

 	if(!safety)//Only used by AIize() to successfully spawn an AI.
 		if(!B)//If there is no player/brain inside.
@@ -563,6 +563,10 @@
 	var/obj/item/holder/H = ..()
 	if(!istype(H))
 		return
+	if(stat == DEAD)
+		H.icon = 'icons/mob/pai.dmi'
+		H.icon_state = "[chassis]_dead"
+		return
 	if(resting)
 		icon_state = "[chassis]"
 		resting = 0
@@ -53,7 +53,7 @@
 			emote("deathgasp", force = TRUE)

 		if(module)
-			module.handle_death(gibbed)
+			module.handle_death(src, gibbed)

 	// Only execute the below if we successfully died
 	. = ..(gibbed)
@@ -59,7 +59,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	var/ear_protection = 0
 	var/damage_protection = 0
 	var/emp_protection = FALSE
-	var/xeno_disarm_chance = 85

 	var/list/force_modules = list()
 	var/allow_rename = TRUE
@@ -1353,7 +1352,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	eye_protection = 2 // Immunity to flashes and the visual part of flashbangs
 	ear_protection = 1 // Immunity to the audio part of flashbangs
 	damage_protection = 10 // Reduce all incoming damage by this number
-	xeno_disarm_chance = 20
 	allow_rename = FALSE
 	modtype = "Commando"
 	faction = list("nanotrasen")
@@ -1425,7 +1423,6 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
 	damage_protection = 5 // Reduce all incoming damage by this number
 	eprefix = "Gamma"
 	magpulse = 1
-	xeno_disarm_chance = 40


 /mob/living/silicon/robot/destroyer
@@ -2,19 +2,17 @@
 	if(M.a_intent == INTENT_DISARM)
 		if(!lying)
 			M.do_attack_animation(src, ATTACK_EFFECT_DISARM)
-			if(prob(xeno_disarm_chance))
-				Stun(7)
-				step(src, get_dir(M,src))
-				spawn(5)
-					step(src, get_dir(M,src))
-				add_attack_logs(M, src, "Alien pushed over")
-				playsound(loc, 'sound/weapons/pierce.ogg', 50, 1, -1)
-				visible_message("<span class='danger'>[M] has forced back [src]!</span>",\
-								"<span class='userdanger'>[M] has forced back [src]!</span>")
+			var/obj/item/I = get_active_hand()
+			if(I)
+				uneq_active()
+				visible_message("<span class='danger'>[M] disarmed [src]!</span>", "<span class='userdanger'>[M] has disabled [src]'s active module!</span>")
+				add_attack_logs(M, src, "alien disarmed")
 			else
-				playsound(loc, 'sound/weapons/slashmiss.ogg', 25, 1, -1)
-				visible_message("<span class='danger'>[M] took a swipe at [src]!</span>",\
-								"<span class='userdanger'>[M] took a swipe at [src]!</span>")
+				Stun(2)
+				step(src, get_dir(M,src))
+				add_attack_logs(M, src, "Alien pushed over")
+				visible_message("<span class='danger'>[M] forces back [src]!</span>", "<span class='userdanger'>[M] forces back [src]!</span>")
+			playsound(loc, 'sound/weapons/pierce.ogg', 50, TRUE, -1)
 	else
 		..()
 	return
@@ -114,7 +114,7 @@
 /obj/item/robot_module/proc/handle_custom_removal(component_id, mob/living/user, obj/item/W)
 	return FALSE

-/obj/item/robot_module/proc/handle_death(gibbed)
+/obj/item/robot_module/proc/handle_death(mob/living/silicon/robot/R, gibbed)
 	return

 /obj/item/robot_module/standard
@@ -255,7 +255,7 @@

 	fix_modules()

-/obj/item/robot_module/engineering/handle_death()
+/obj/item/robot_module/engineering/handle_death(mob/living/silicon/robot/R, gibbed)
 	var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
 	if(G)
 		G.drop_gripped_item(silent = TRUE)
@@ -368,6 +368,11 @@
 	R.add_language("Clownish",1)
 	R.add_language("Neo-Russkiya", 1)

+/obj/item/robot_module/butler/handle_death(mob/living/silicon/robot/R, gibbed)
+	var/obj/item/storage/bag/tray/cyborg/T = locate(/obj/item/storage/bag/tray/cyborg) in modules
+	if(istype(T))
+		T.drop_inventory(R)
+

 /obj/item/robot_module/miner
 	name = "miner robot module"
@@ -623,7 +628,7 @@
 	..()


-/obj/item/robot_module/drone/handle_death()
+/obj/item/robot_module/drone/handle_death(mob/living/silicon/robot/R, gibbed)
 	var/obj/item/gripper/G = locate(/obj/item/gripper) in modules
 	if(G)
 		G.drop_gripped_item(silent = TRUE)
@@ -3,11 +3,10 @@

 /mob/living/silicon/attack_alien(mob/living/carbon/alien/humanoid/M)
 	if(..()) //if harm or disarm intent
-		var/damage = rand(10, 20)
+		var/damage = 20
 		if(prob(90))
 			playsound(loc, 'sound/weapons/slash.ogg', 25, 1, -1)
-			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
-							"<span class='userdanger'>[M] has slashed at [src]!</span>")
+			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", "<span class='userdanger'>[M] has slashed at [src]!</span>")
 			if(prob(8))
 				flash_eyes(affect_silicon = 1)
 			add_attack_logs(M, src, "Alien attacked")
@@ -64,6 +63,6 @@
 		else
 			M.do_attack_animation(src, ATTACK_EFFECT_PUNCH)
 			playsound(loc, 'sound/effects/bang.ogg', 10, 1)
-			visible_message("<span class='danger'>[M] punches [src], but doesn't leave a dent.</span>", \
-						"<span class='userdanger'>[M] punches [src], but doesn't leave a dent.!</span>")
+			visible_message("<span class='notice'>[M] punches [src], but doesn't leave a dent.</span>", \
+						"<span class='notice'>[M] punches [src], but doesn't leave a dent.</span>")
 	return FALSE
@@ -42,13 +42,18 @@

 /mob/living/simple_animal/attack_alien(mob/living/carbon/alien/humanoid/M)
 	if(..()) //if harm or disarm intent.
-		var/damage = rand(15, 30)
-		visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
-				"<span class='userdanger'>[M] has slashed at [src]!</span>")
-		playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
-		add_attack_logs(M, src, "Alien attacked")
-		attack_threshold_check(damage)
-	return
+		if(M.a_intent == INTENT_DISARM)
+			playsound(loc, 'sound/weapons/pierce.ogg', 25, TRUE, -1)
+			visible_message("<span class='danger'>[M] [response_disarm] [name]!</span>", "<span class='userdanger'>[M] [response_disarm] you!</span>")
+			add_attack_logs(M, src, "Alien disarmed")
+		else
+			var/damage = rand(15, 30)
+			visible_message("<span class='danger'>[M] has slashed at [src]!</span>", \
+					"<span class='userdanger'>[M] has slashed at [src]!</span>")
+			playsound(loc, 'sound/weapons/slice.ogg', 25, 1, -1)
+			add_attack_logs(M, src, "Alien attacked")
+			attack_threshold_check(damage)
+		return TRUE

 /mob/living/simple_animal/attack_larva(mob/living/carbon/alien/larva/L)
 	if(..()) //successful larva bite
@@ -44,18 +44,27 @@
 		usr.emote(message)


-/mob/proc/say_dead(var/message)
-	if(!(client && client.holder))
-		if(!config.dsay_allowed)
-			to_chat(src, "<span class='danger'>Deadchat is globally muted.</span>")
+/mob/proc/say_dead(message)
+	if(client)
+		if(!client.holder)
+			if(!config.dsay_allowed)
+				to_chat(src, "<span class='danger'>Deadchat is globally muted.</span>")
+				return
+
+		if(client.prefs.muted & MUTE_DEADCHAT)
+			to_chat(src, "<span class='warning'>You cannot talk in deadchat (muted).</span>")
 			return

-	if(client && !(client.prefs.toggles & CHAT_DEAD))
-		to_chat(usr, "<span class='danger'>You have deadchat muted.</span>")
-		return
+		if(!(client.prefs.toggles & CHAT_DEAD))
+			to_chat(src, "<span class='danger'>You have deadchat muted.</span>")
+			return
+
+		if(client.handle_spam_prevention(message, MUTE_DEADCHAT))
+			return

 	say_dead_direct("[pick("complains", "moans", "whines", "laments", "blubbers", "salts")], <span class='message'>\"[message]\"</span>", src)
 	create_log(DEADCHAT_LOG, message)
+	log_ghostsay(message, src)

 /mob/proc/say_understands(var/mob/other, var/datum/language/speaking = null)
 	if(stat == DEAD)
@@ -229,14 +229,15 @@ By design, d1 is the smallest direction and d2 is the highest
 	if(current_size >= STAGE_FIVE)
 		deconstruct()

-obj/structure/cable/proc/cable_color(var/colorC)
-	if(colorC)
-		if(colorC == "rainbow")
-			color = color_rainbow()
-		else
-			color = colorC
+obj/structure/cable/proc/cable_color(colorC)
+	if(!colorC)
+		color = COLOR_RED
+	else if(colorC == "rainbow")
+		color = color_rainbow()
+	else if(colorC == "orange") //byond only knows 16 colors by name, and orange isn't one of them
+		color = COLOR_ORANGE
 	else
-		color = "#DD0000"
+		color = colorC

 /obj/structure/cable/proc/color_rainbow()
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
@@ -845,13 +846,15 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_WHITE, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
 	..()

-/obj/item/stack/cable_coil/proc/cable_color(var/colorC)
-	if(colorC)
-		if(colorC == "rainbow")
-			colorC = color_rainbow()
-		color = colorC
-	else
+/obj/item/stack/cable_coil/proc/cable_color(colorC)
+	if(!colorC)
 		color = COLOR_RED
+	else if(colorC == "rainbow")
+		color = color_rainbow()
+	else if(colorC == "orange") //byond only knows 16 colors by name, and orange isn't one of them
+		color = COLOR_ORANGE
+	else
+		color = colorC

 /obj/item/stack/cable_coil/proc/color_rainbow()
 	color = pick(COLOR_RED, COLOR_BLUE, COLOR_GREEN, COLOR_PINK, COLOR_YELLOW, COLOR_CYAN)
@@ -133,6 +133,9 @@
 /obj/item/ammo_box/magazine/internal/shot/riot/short
 	max_ammo = 3

+/obj/item/ammo_box/magazine/internal/shot/riot/buckshot
+	ammo_type = /obj/item/ammo_casing/shotgun/buckshot
+
 /obj/item/ammo_box/magazine/internal/grenadelauncher
 	name = "grenade launcher internal magazine"
 	ammo_type = /obj/item/ammo_casing/a40mm
@@ -95,6 +95,7 @@
 				if(!user.unEquip(A))
 					return
 				to_chat(user, "<span class='notice'>You screw [S] onto [src].</span>")
+				playsound(src, 'sound/items/screwdriver.ogg', 40, 1)
 				suppressed = A
 				S.oldsound = fire_sound
 				S.initial_w_class = w_class
@@ -120,6 +121,7 @@
 				..()
 				return
 			to_chat(user, "<span class='notice'>You unscrew [suppressed] from [src].</span>")
+			playsound(src, 'sound/items/screwdriver.ogg', 40, 1)
 			user.put_in_hands(suppressed)
 			fire_sound = S.oldsound
 			w_class = S.initial_w_class
@@ -197,6 +197,8 @@
 	..()
 	post_sawoff()

+/obj/item/gun/projectile/shotgun/riot/buckshot	//comes pre-loaded with buckshot rather than rubber
+	mag_type = /obj/item/ammo_box/magazine/internal/shot/riot/buckshot


 ///////////////////////
@@ -543,6 +543,14 @@
 	build_path = /obj/item/assembly/health
 	category = list("initial", "Medical")

+/datum/design/stethoscope
+	name = "Stethoscope"
+	id = "stethoscope"
+	build_type = AUTOLATHE
+	materials = list(MAT_METAL = 500)
+	build_path = /obj/item/clothing/accessory/stethoscope
+	category = list("initial", "Medical")
+
 /datum/design/timer
 	name = "Timer"
 	id = "timer"
@@ -751,7 +751,7 @@
 	category = list("Exosuit Equipment")

 /datum/design/mech_mining_scanner
-	name = "Exosuit Engineering Equipement (Mining Scanner)"
+	name = "Exosuit Engineering Equipment (Mining Scanner)"
 	id = "mech_mscanner"
 	build_type = MECHFAB
 	build_path = /obj/item/mecha_parts/mecha_equipment/mining_scanner
@@ -291,8 +291,7 @@
 			for(var/turf/T in oview(1, src))
 				if(!T.density)
 					if(prob(EFFECT_PROB_VERYHIGH))
-						var/obj/effect/decal/cleanable/reagentdecal = new/obj/effect/decal/cleanable/greenglow(T)
-						reagentdecal.reagents.add_reagent("radium", 7)
+						new /obj/effect/decal/cleanable/greenglow(T)
 		if(prob(EFFECT_PROB_MEDIUM-badThingCoeff))
 			var/savedName = "[exp_on]"
 			ejectItem(TRUE)
@@ -7,7 +7,7 @@
 #define VAULT_NOBREATH "Lung Enhancement"
 #define VAULT_FIREPROOF "Thermal Regulation"
 #define VAULT_STUNTIME "Neural Repathing"
-#define VAULT_ARMOUR "Bone Reinforcement"
+#define VAULT_ARMOUR "Hardened Skin"
 #define VAULT_SPEED "Leg Muscle Stimulus"
 #define VAULT_QUICK "Arm Muscle Stimulus"

@@ -401,6 +401,10 @@ h1.alert, h2.alert			{color: #FFF;}
 .connectionClosed.restored {background: green;}
 .internal.boldnshit {color: #6685f5; font-weight: bold;}

+.rebooting {background: #2979AF; color: white; padding: 5px;}
+.rebooting a {color: white !important; text-decoration-color: white !important;}
+#reconnectTimer {font-weight: bold;}
+
 /* HELPER CLASSES */
 .text-normal {font-weight: normal; font-style: normal;}
 .hidden {display: none; visibility: hidden;}
@@ -400,6 +400,10 @@ h1.alert, h2.alert			{color: #000000;}
 .connectionClosed.restored {background: green;}
 .internal.boldnshit {color: blue; font-weight: bold;}

+.rebooting {background: #2979AF; color: white; padding: 5px;}
+.rebooting a {color: white !important; text-decoration-color: white !important;}
+#reconnectTimer {font-weight: bold;}
+
 /* HELPER CLASSES */
 .text-normal {font-weight: normal; font-style: normal;}
 .hidden {display: none; visibility: hidden;}
@@ -69,10 +69,13 @@ var opts = {
 	'macros': {},

 	// Emoji toggle
-	'enableEmoji': true
+	'enableEmoji': true,
+
+	// Reboot message stuff
+	'rebootIntervalHandler': null
 };

-var regexHasError = false; //variable to check if regex has excepted 
+var regexHasError = false; //variable to check if regex has excepted

 function outerHTML(el) {
    var wrap = document.createElement('div');
@@ -97,10 +100,10 @@ if (typeof String.prototype.trim !== 'function') {
 if (!String.prototype.includes) {
 	String.prototype.includes = function(search, start) {
 	  'use strict';
-  
+
 	  if (search instanceof RegExp) {
 		throw TypeError('first argument must not be a RegExp');
-	  } 
+	  }
 	  if (start === undefined) { start = 0; }
 	  return this.indexOf(search, start) !== -1;
 	};
@@ -124,7 +127,7 @@ function byondDecode(message) {
 	// The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
 	// Marvelous.
 	message = message.replace(/\+/g, "%20");
-	try { 
+	try {
 		// This is a workaround for the above not always working when BYOND's shitty url encoding breaks.
 		// Basically, sometimes BYOND's double encoding trick just arbitrarily produces something that makes decodeURIComponent
 		// throw an "Invalid Encoding URI" URIError... the simplest way to work around this is to just ignore it and use unescape instead
@@ -217,10 +220,10 @@ function highlightTerms(el) {
 				ind = next_tag;
 			}
 		}
-		
+
 		element.innerHTML = s;
 	}
-	
+
 	for (var i = 0; i < opts.highlightTerms.length; i++) { //Each highlight term
 		if(opts.highlightTerms[i]) {
 			if(!opts.highlightRegexEnable){
@@ -573,6 +576,34 @@ function toggleWasd(state) {
 	opts.wasd = (state == 'on' ? true : false);
 }

+function reboot(timeRaw) {
+	var timeLeftSecs = parseInt(timeRaw);
+	const intervalSecs = 1; // tick every 1 second
+
+	rebootFinished();
+	internalOutput('<div class="rebooting internal">The server is restarting. <a href="byond://winset?command=.reconnect" id="reconnectTimer">Reconnect (' + timeLeftSecs + ')</a></div>', 'internal');
+
+	opts.rebootIntervalHandler = setInterval(function() {
+		timeLeftSecs -= intervalSecs;
+		if (timeLeftSecs <= 0) {
+			$("#reconnectTimer").text('Reconnecting...');
+			window.location.href = 'byond://winset?command=.reconnect';
+			clearInterval(opts.rebootIntervalHandler)
+			opts.rebootIntervalHandler = null;
+		} else {
+			$("#reconnectTimer").text('Reconnect (' + timeLeftSecs + ')');
+		}
+	}, intervalSecs * 1000);
+}
+
+function rebootFinished() {
+	if (opts.rebootIntervalHandler != null) {
+		clearInterval(opts.rebootIntervalHandler)
+	}
+	$("<span> Reconnected automatically!</span>").insertBefore("#reconnectTimer");
+	$("#reconnectTimer").remove();
+}
+
 /*****************************************
 *
 * MAKE MACRO DICTIONARY
@@ -652,7 +683,7 @@ $(function() {
 		'shideSpam': getCookie('hidespam'),
 		'darkChat': getCookie('darkChat'),
 	};
-	
+
 	if (savedConfig.sfontSize) {
 		$messages.css('font-size', savedConfig.sfontSize);
 		internalOutput('<span class="internal boldnshit">Loaded font size setting of: '+savedConfig.sfontSize+'</span>', 'internal');
@@ -1010,18 +1041,18 @@ $(function() {
 		} else {
 			xmlHttp = new ActiveXObject("Microsoft.XMLHTTP");
 		}
-		
+
 		// synchronous requests are depricated in modern browsers
-		xmlHttp.open('GET', 'browserOutput.css', true);			
+		xmlHttp.open('GET', 'browserOutput.css', true);
 		xmlHttp.onload = function (e) {
 			if (xmlHttp.status === 200) {	// request successful
-				
+
 				// Generate Log
 				var saved = '<style>'+xmlHttp.responseText+'</style>';
 				saved += $messages.html();
 				saved = saved.replace(/&/g, '&amp;');
 				saved = saved.replace(/</g, '&lt;');
-				
+
 				// Generate final output and open the window
 				var finalText = '<head><title>Chat Log</title></head> \
 					<iframe src="saveInstructions.html" id="instructions" style="border:none;" height="220" width="100%"></iframe>'+
@@ -1031,7 +1062,7 @@ $(function() {
 				openWindow('Style Doc Retrieve Error: '+xmlHttp.statusText);
 			}
 		}
-		
+
 		// timeout and request errors
 		xmlHttp.timeout = 300;
 		xmlHttp.ontimeout = function (e) {
@@ -109,6 +109,7 @@ var/list/chatResources = list(

 	loaded = TRUE
 	winset(owner, "browseroutput", "is-disabled=false")
+	owner << output(null, "browseroutput:rebootFinished")
 	if(owner.holder)
 		loadAdmin()
 	for(var/message in messageQueue)
@@ -245,8 +246,8 @@ var/list/chatResources = list(
 var/to_chat_filename
 var/to_chat_line
 var/to_chat_src
-// Call using macro: to_chat(target, message, flag)
-/proc/to_chat_immediate(target, message, flag)
+
+/proc/to_chat(target, message, flag)
 	if(!is_valid_tochat_message(message) || !is_valid_tochat_target(target))
 		target << message

@@ -304,17 +305,4 @@ var/to_chat_src

 		target << output(output_message, "browseroutput:output")

-/proc/to_chat(target, message, flag)
-	/*
-	If any of the following conditions are met, do NOT use SSchat. These conditions include:
-		- Is the MC still initializing?
-		- Has SSchat initialized?
-		- Has SSchat been offlined due to MC crashes?
-	If any of these are met, use the old chat system, otherwise people wont see messages
-	*/
-	if(Master.current_runlevel == RUNLEVEL_INIT || !SSchat?.initialized || SSchat?.flags & SS_NO_FIRE)
-		to_chat_immediate(target, message, flag)
-		return
-	SSchat.queue(target, message, flag)
-
 #undef MAX_COOKIE_LENGTH
--- a/Show More
+++ b/Show More