Updating

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

_maps/RandomRuins/LavaRuins/lavaland_surface_random_ripley.dmm

@@ -14,7 +14,7 @@
 /area/lavaland/surface/outdoors)
 "e" = (
 /obj/item/clothing/shoes/workboots/mining,
-/obj/item/clothing/under/rank/miner/lavaland,
+/obj/item/clothing/under/rank/cargo/miner/lavaland,
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/asteroid/basalt/lava_land_surface,
 /area/lavaland/surface/outdoors)

_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm

@@ -188,10 +188,10 @@
 /area/ruin/powered/seedvault)
 "G" = (
 /obj/structure/closet/crate/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
-/obj/item/clothing/under/rank/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
+/obj/item/clothing/under/rank/civilian/hydroponics,
 /turf/open/floor/plasteel/freezer,
 /area/ruin/powered/seedvault)
 "H" = (

_maps/RandomRuins/SpaceRuins/DJstation.dmm

@@ -324,7 +324,7 @@
 	dir = 1
 	},
 /obj/structure/rack,
-/obj/item/clothing/under/soviet,
+/obj/item/clothing/under/costume/soviet,
 /obj/item/clothing/head/ushanka,
 /turf/open/floor/plasteel/cafeteria,
 /area/ruin/space/djstation)

_maps/RandomRuins/SpaceRuins/advancedlab.dmm

@@ -219,7 +219,7 @@
 /obj/structure/closet{
 	name = "Official Clothing"
 	},
-/obj/item/clothing/under/rank/centcom_commander,
+/obj/item/clothing/under/rank/centcom/commander,
 /obj/item/clothing/head/centhat,
 /obj/item/clothing/gloves/combat,
 /obj/item/clothing/suit/armor/vest,

_maps/RandomRuins/SpaceRuins/crashedship.dmm

@@ -2098,7 +2098,7 @@
 /area/awaymission/BMPship/Aft)
 "gj" = (
 /obj/structure/closet,
-/obj/item/clothing/under/overalls,
+/obj/item/clothing/under/misc/overalls,
 /turf/open/floor/plasteel,
 /area/awaymission/BMPship/Aft)
 "gk" = (
@@ -2269,7 +2269,7 @@
 /area/awaymission/BMPship/Aft)
 "gP" = (
 /obj/structure/closet,
-/obj/item/clothing/under/lawyer/bluesuit,
+/obj/item/clothing/under/rank/civilian/lawyer/bluesuit,
 /obj/item/clothing/suit/apron,
 /turf/open/floor/plasteel,
 /area/awaymission/BMPship/Aft)

_maps/RandomRuins/SpaceRuins/derelict2.dmm

@@ -64,7 +64,7 @@
 /obj/structure/chair{
 	dir = 4
 	},
-/obj/item/clothing/under/polychromic/shirt,
+/obj/item/clothing/under/misc/poly_shirt,
 /obj/item/clothing/neck/tie/black,
 /obj/item/clothing/shoes/laceup,
 /obj/item/storage/wallet/random,
@@ -89,7 +89,7 @@
 /obj/structure/chair{
 	dir = 8
 	},
-/obj/item/clothing/under/polychromic/skirt,
+/obj/item/clothing/under/dress/skirt/polychromic,
 /obj/item/clothing/shoes/laceup,
 /obj/item/clothing/gloves/color/white,
 /obj/item/clothing/glasses/regular,

_maps/RandomRuins/SpaceRuins/oldAIsat.dmm

@@ -573,7 +573,7 @@
 "bU" = (
 /obj/effect/decal/cleanable/blood,
 /obj/structure/chair,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
 /obj/item/restraints/handcuffs,
 /obj/effect/decal/remains/human,
 /turf/open/floor/plating/airless,

_maps/RandomRuins/SpaceRuinsStation/roid1.dmm

@@ -0,0 +1,111 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"e" = (
+/turf/template_noop,
+/area/template_noop)
+"m" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"q" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+e
+e
+e
+q
+q
+e
+e
+e
+"}
+(2,1,1) = {"
+e
+e
+q
+m
+m
+q
+e
+e
+"}
+(3,1,1) = {"
+e
+q
+m
+m
+m
+m
+q
+e
+"}
+(4,1,1) = {"
+e
+q
+m
+m
+m
+m
+m
+q
+"}
+(5,1,1) = {"
+q
+m
+m
+m
+m
+m
+m
+q
+"}
+(6,1,1) = {"
+q
+m
+m
+m
+m
+m
+m
+q
+"}
+(7,1,1) = {"
+q
+m
+m
+m
+m
+m
+q
+e
+"}
+(8,1,1) = {"
+e
+q
+m
+m
+m
+m
+q
+e
+"}
+(9,1,1) = {"
+e
+e
+q
+m
+m
+q
+e
+e
+"}
+(10,1,1) = {"
+e
+e
+e
+q
+q
+e
+e
+e
+"}

_maps/RandomRuins/SpaceRuinsStation/roid10.dmm

@@ -0,0 +1,342 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"m" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"n" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"B" = (
+/obj/item/toy/plush/borgplushie,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"J" = (
+/turf/template_noop,
+/area/template_noop)
+"Y" = (
+/obj/item/pickaxe/drill,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+J
+J
+m
+m
+m
+m
+m
+J
+J
+J
+J
+J
+m
+m
+J
+J
+J
+"}
+(2,1,1) = {"
+J
+m
+n
+n
+n
+n
+n
+m
+J
+J
+m
+m
+n
+n
+m
+J
+J
+"}
+(3,1,1) = {"
+m
+n
+n
+n
+m
+B
+n
+m
+J
+m
+n
+n
+n
+n
+m
+J
+J
+"}
+(4,1,1) = {"
+m
+n
+n
+m
+m
+n
+n
+n
+m
+n
+n
+n
+n
+n
+n
+m
+J
+"}
+(5,1,1) = {"
+m
+n
+n
+m
+n
+n
+n
+n
+m
+m
+n
+n
+n
+n
+n
+m
+J
+"}
+(6,1,1) = {"
+m
+n
+n
+m
+m
+m
+m
+n
+n
+m
+m
+m
+n
+n
+n
+m
+J
+"}
+(7,1,1) = {"
+m
+n
+n
+n
+m
+n
+m
+n
+n
+n
+n
+m
+n
+n
+n
+n
+m
+"}
+(8,1,1) = {"
+m
+n
+n
+n
+m
+n
+m
+n
+n
+n
+n
+m
+n
+n
+n
+n
+m
+"}
+(9,1,1) = {"
+m
+n
+n
+n
+m
+n
+m
+m
+m
+n
+n
+m
+n
+n
+n
+n
+m
+"}
+(10,1,1) = {"
+m
+n
+n
+n
+m
+n
+n
+n
+m
+n
+n
+m
+n
+n
+n
+n
+m
+"}
+(11,1,1) = {"
+m
+n
+n
+n
+m
+Y
+n
+n
+m
+n
+n
+m
+m
+n
+n
+n
+m
+"}
+(12,1,1) = {"
+m
+n
+n
+n
+n
+n
+n
+m
+m
+m
+m
+m
+n
+n
+n
+m
+J
+"}
+(13,1,1) = {"
+J
+m
+n
+n
+n
+m
+n
+m
+n
+n
+n
+n
+n
+n
+m
+J
+J
+"}
+(14,1,1) = {"
+J
+m
+n
+n
+n
+m
+m
+m
+n
+n
+n
+n
+n
+n
+m
+J
+J
+"}
+(15,1,1) = {"
+J
+J
+m
+m
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+m
+J
+J
+"}
+(16,1,1) = {"
+J
+J
+J
+J
+m
+m
+n
+n
+n
+n
+n
+n
+m
+m
+J
+J
+J
+"}
+(17,1,1) = {"
+J
+J
+J
+J
+J
+J
+m
+m
+m
+m
+m
+m
+J
+J
+J
+J
+J
+"}

_maps/RandomRuins/SpaceRuinsStation/roid2.dmm

@@ -0,0 +1,277 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/effect/overlay/palmtree_l,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav)
+"j" = (
+/turf/open/floor/holofloor/beach/coast_t,
+/area/ruin/space/has_grav)
+"n" = (
+/turf/open/floor/holofloor/beach/coast_b,
+/area/ruin/space/has_grav)
+"o" = (
+/turf/template_noop,
+/area/template_noop)
+"p" = (
+/turf/open/floor/holofloor/beach/water,
+/area/ruin/space/has_grav)
+"t" = (
+/obj/effect/overlay/palmtree_r,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav)
+"u" = (
+/obj/structure/marker_beacon,
+/turf/open/floor/holofloor/beach/coast_t,
+/area/ruin/space/has_grav)
+"A" = (
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav)
+"F" = (
+/mob/living/simple_animal/crab{
+	desc = "This little bugger seems so happy to dance.!";
+	name = "raving crab"
+	},
+/turf/open/floor/holofloor/beach/coast_t,
+/area/ruin/space/has_grav)
+"H" = (
+/obj/structure/marker_beacon,
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav)
+"L" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"R" = (
+/mob/living/simple_animal/crab{
+	desc = "This little bugger seems so happy to dance.!";
+	name = "raving crab"
+	},
+/turf/open/floor/holofloor/beach,
+/area/ruin/space/has_grav)
+"T" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+o
+o
+T
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+"}
+(2,1,1) = {"
+T
+L
+L
+T
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+"}
+(3,1,1) = {"
+T
+L
+L
+L
+L
+T
+T
+T
+T
+T
+o
+o
+o
+o
+"}
+(4,1,1) = {"
+o
+T
+L
+L
+L
+L
+L
+L
+L
+L
+T
+o
+o
+o
+"}
+(5,1,1) = {"
+o
+T
+L
+L
+A
+A
+L
+L
+L
+L
+L
+T
+o
+o
+"}
+(6,1,1) = {"
+T
+L
+L
+L
+A
+R
+j
+n
+p
+p
+L
+L
+T
+o
+"}
+(7,1,1) = {"
+T
+L
+L
+A
+a
+A
+u
+n
+p
+p
+L
+L
+T
+o
+"}
+(8,1,1) = {"
+T
+L
+L
+H
+R
+A
+j
+n
+p
+p
+L
+L
+T
+o
+"}
+(9,1,1) = {"
+T
+L
+L
+A
+A
+A
+u
+n
+p
+p
+L
+L
+T
+o
+"}
+(10,1,1) = {"
+T
+L
+L
+L
+A
+t
+F
+n
+p
+p
+L
+L
+T
+o
+"}
+(11,1,1) = {"
+o
+T
+T
+L
+L
+A
+L
+L
+L
+L
+L
+L
+T
+o
+"}
+(12,1,1) = {"
+o
+o
+o
+T
+L
+L
+L
+L
+L
+L
+L
+L
+T
+o
+"}
+(13,1,1) = {"
+o
+o
+o
+o
+T
+L
+L
+L
+L
+o
+T
+T
+L
+T
+"}
+(14,1,1) = {"
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+o
+T
+o
+"}

_maps/RandomRuins/SpaceRuinsStation/roid3.dmm

@@ -0,0 +1,498 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"c" = (
+/obj/machinery/door/airlock/silver{
+	name = "Bathroom"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/plasteel/freezer,
+/area/ruin/space/has_grav/powered)
+"d" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"e" = (
+/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/obj/item/reagent_containers/glass/bottle/nutrient/ez,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"g" = (
+/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/glowcap,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"i" = (
+/obj/structure/fireplace{
+	dir = 8
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"j" = (
+/obj/structure/reagent_dispensers/watertank/high,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"m" = (
+/obj/structure/mineral_door/woodrustic{
+	name = "Event Hall"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"n" = (
+/obj/machinery/vending/boozeomat{
+	req_access = null
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"o" = (
+/obj/item/reagent_containers/glass/bucket,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"p" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"q" = (
+/turf/template_noop,
+/area/template_noop)
+"s" = (
+/obj/machinery/hydroponics/soil,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"t" = (
+/turf/closed/indestructible/wood,
+/area/ruin/space/has_grav/powered)
+"v" = (
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"w" = (
+/obj/item/plant_analyzer,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"y" = (
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"A" = (
+/obj/item/seeds/glowshroom,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"C" = (
+/obj/structure/chair/wood/normal{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"E" = (
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/powered)
+"F" = (
+/obj/item/seeds/grass,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"J" = (
+/obj/machinery/light,
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/powered)
+"K" = (
+/obj/structure/table/wood,
+/obj/machinery/light{
+	dir = 4
+	},
+/obj/item/reagent_containers/food/drinks/bottle/wine,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"L" = (
+/obj/structure/mirror{
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/bot,
+/obj/machinery/shower{
+	dir = 8;
+	pixel_y = -4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/powered)
+"M" = (
+/obj/structure/toilet{
+	dir = 4
+	},
+/turf/open/floor/plasteel/showroomfloor,
+/area/ruin/space/has_grav/powered)
+"N" = (
+/obj/structure/rack,
+/obj/item/stack/sheet/mineral/wood,
+/obj/item/stack/sheet/mineral/wood,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"P" = (
+/obj/structure/table/wood,
+/obj/item/clothing/head/festive,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"T" = (
+/obj/item/shovel/spade,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"W" = (
+/obj/item/cultivator,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"Y" = (
+/obj/structure/table/wood,
+/obj/item/phone,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav/powered)
+"Z" = (
+/obj/item/seeds/tower,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+q
+q
+q
+d
+d
+d
+d
+q
+q
+q
+q
+d
+d
+d
+q
+q
+q
+"}
+(2,1,1) = {"
+q
+q
+d
+p
+p
+p
+p
+d
+d
+d
+d
+p
+p
+p
+d
+q
+q
+"}
+(3,1,1) = {"
+q
+d
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+d
+q
+"}
+(4,1,1) = {"
+d
+p
+p
+p
+p
+p
+p
+p
+p
+p
+t
+t
+t
+t
+p
+p
+d
+"}
+(5,1,1) = {"
+d
+p
+p
+d
+d
+d
+e
+j
+p
+p
+t
+M
+J
+t
+p
+p
+d
+"}
+(6,1,1) = {"
+d
+p
+p
+d
+d
+d
+F
+o
+p
+p
+t
+E
+L
+t
+p
+p
+d
+"}
+(7,1,1) = {"
+q
+d
+d
+s
+s
+s
+s
+d
+t
+t
+t
+c
+t
+t
+t
+p
+d
+"}
+(8,1,1) = {"
+q
+d
+d
+d
+A
+g
+W
+d
+t
+Y
+C
+v
+n
+y
+t
+p
+d
+"}
+(9,1,1) = {"
+q
+d
+d
+s
+s
+s
+s
+d
+t
+P
+C
+v
+v
+v
+t
+p
+d
+"}
+(10,1,1) = {"
+q
+d
+d
+d
+T
+Z
+d
+d
+m
+v
+v
+v
+v
+v
+t
+p
+d
+"}
+(11,1,1) = {"
+q
+d
+d
+s
+s
+s
+s
+d
+t
+v
+v
+v
+v
+v
+t
+p
+d
+"}
+(12,1,1) = {"
+q
+d
+d
+d
+w
+A
+d
+d
+t
+t
+i
+N
+K
+a
+t
+p
+d
+"}
+(13,1,1) = {"
+q
+d
+p
+s
+s
+s
+s
+d
+p
+t
+t
+t
+t
+t
+t
+p
+q
+"}
+(14,1,1) = {"
+d
+p
+p
+p
+d
+d
+d
+p
+p
+p
+p
+p
+p
+p
+p
+d
+q
+"}
+(15,1,1) = {"
+d
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+d
+d
+q
+q
+"}
+(16,1,1) = {"
+d
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+p
+d
+q
+q
+q
+"}
+(17,1,1) = {"
+q
+d
+p
+p
+p
+p
+d
+d
+d
+d
+d
+d
+d
+q
+q
+q
+q
+"}
+(18,1,1) = {"
+q
+q
+d
+d
+d
+d
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+q
+"}

_maps/RandomRuins/SpaceRuinsStation/roid4.dmm

@@ -0,0 +1,441 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"f" = (
+/obj/effect/decal/cleanable/blood/gibs/body,
+/turf/open/floor/plating/airless,
+/area/ruin/space)
+"g" = (
+/obj/structure/lattice,
+/turf/closed/wall,
+/area/ruin/space)
+"l" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/unpowered)
+"n" = (
+/turf/template_noop,
+/area/template_noop)
+"r" = (
+/turf/closed/wall,
+/area/ruin/space)
+"t" = (
+/obj/structure/lattice,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"z" = (
+/obj/item/pickaxe/silver,
+/turf/open/floor/plating/airless,
+/area/ruin/space)
+"I" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"M" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/space/nearstation)
+"P" = (
+/turf/open/floor/plating/airless,
+/area/ruin/space)
+"R" = (
+/obj/item/lazarus_injector,
+/obj/effect/decal/cleanable/blood/gibs/human/lizard/body,
+/turf/open/floor/plating/airless,
+/area/ruin/space)
+"Z" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+
+(1,1,1) = {"
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+I
+I
+n
+n
+n
+n
+"}
+(2,1,1) = {"
+n
+n
+n
+n
+n
+I
+I
+I
+I
+I
+n
+n
+I
+I
+Z
+Z
+I
+n
+n
+n
+"}
+(3,1,1) = {"
+n
+n
+n
+I
+I
+Z
+Z
+Z
+Z
+Z
+I
+n
+I
+Z
+Z
+Z
+Z
+I
+n
+n
+"}
+(4,1,1) = {"
+n
+n
+I
+Z
+Z
+Z
+Z
+Z
+Z
+t
+n
+n
+I
+Z
+Z
+Z
+I
+n
+n
+n
+"}
+(5,1,1) = {"
+n
+I
+Z
+Z
+Z
+Z
+Z
+Z
+t
+M
+n
+n
+I
+Z
+Z
+Z
+Z
+l
+n
+n
+"}
+(6,1,1) = {"
+n
+I
+Z
+Z
+Z
+Z
+I
+I
+n
+M
+n
+I
+Z
+Z
+Z
+Z
+Z
+Z
+I
+n
+"}
+(7,1,1) = {"
+I
+Z
+Z
+Z
+Z
+I
+n
+M
+M
+g
+r
+I
+Z
+Z
+Z
+Z
+Z
+Z
+I
+n
+"}
+(8,1,1) = {"
+I
+Z
+Z
+Z
+Z
+I
+n
+M
+z
+f
+r
+I
+Z
+Z
+Z
+Z
+Z
+Z
+I
+n
+"}
+(9,1,1) = {"
+I
+Z
+Z
+Z
+t
+M
+M
+M
+R
+P
+M
+t
+t
+Z
+Z
+Z
+Z
+Z
+I
+n
+"}
+(10,1,1) = {"
+I
+Z
+Z
+Z
+I
+n
+n
+r
+r
+M
+n
+n
+n
+Z
+Z
+Z
+Z
+Z
+Z
+n
+"}
+(11,1,1) = {"
+n
+I
+Z
+I
+n
+n
+n
+n
+n
+M
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+I
+"}
+(12,1,1) = {"
+n
+n
+I
+n
+n
+n
+I
+I
+I
+M
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+Z
+"}
+(13,1,1) = {"
+n
+n
+n
+n
+n
+I
+Z
+Z
+Z
+t
+n
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+"}
+(14,1,1) = {"
+n
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+I
+n
+n
+n
+n
+n
+I
+Z
+Z
+Z
+"}
+(15,1,1) = {"
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+Z
+I
+n
+n
+n
+n
+n
+I
+Z
+Z
+I
+"}
+(16,1,1) = {"
+n
+n
+n
+n
+I
+Z
+Z
+Z
+Z
+I
+n
+n
+n
+n
+n
+n
+n
+I
+I
+n
+"}
+(17,1,1) = {"
+n
+n
+n
+n
+I
+Z
+Z
+I
+I
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+"}
+(18,1,1) = {"
+n
+n
+n
+n
+n
+I
+I
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+n
+"}

_maps/RandomRuins/SpaceRuinsStation/roid5.dmm

@@ -0,0 +1,296 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"b" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"h" = (
+/obj/effect/decal/remains/human,
+/turf/open/floor/plating/asteroid,
+/area/ruin/space)
+"t" = (
+/turf/open/floor/plating/asteroid,
+/area/ruin/space)
+"G" = (
+/obj/item/holosign_creator/atmos,
+/turf/open/floor/plating/asteroid,
+/area/ruin/space)
+"K" = (
+/turf/template_noop,
+/area/template_noop)
+"P" = (
+/obj/structure/holosign/barrier/atmos,
+/turf/open/floor/plating/asteroid,
+/area/ruin/space)
+"R" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"Y" = (
+/obj/structure/fluff/fokoff_sign,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+K
+K
+K
+R
+R
+R
+R
+K
+K
+K
+K
+R
+b
+b
+R
+K
+K
+"}
+(2,1,1) = {"
+K
+K
+R
+b
+b
+b
+b
+R
+K
+K
+R
+b
+b
+b
+b
+R
+K
+"}
+(3,1,1) = {"
+K
+R
+b
+b
+b
+b
+b
+b
+R
+Y
+b
+b
+b
+b
+b
+b
+R
+"}
+(4,1,1) = {"
+R
+b
+b
+b
+b
+b
+b
+b
+b
+R
+b
+b
+b
+b
+b
+b
+R
+"}
+(5,1,1) = {"
+R
+b
+b
+b
+b
+b
+b
+b
+b
+P
+b
+b
+b
+b
+b
+b
+R
+"}
+(6,1,1) = {"
+K
+R
+b
+b
+b
+b
+b
+b
+t
+G
+t
+b
+b
+b
+b
+R
+K
+"}
+(7,1,1) = {"
+K
+K
+R
+b
+b
+b
+R
+P
+t
+h
+t
+t
+b
+b
+b
+R
+K
+"}
+(8,1,1) = {"
+K
+K
+K
+R
+Y
+R
+R
+b
+b
+b
+t
+t
+P
+Y
+R
+K
+K
+"}
+(9,1,1) = {"
+K
+K
+K
+R
+R
+b
+b
+b
+b
+b
+b
+b
+b
+R
+K
+K
+K
+"}
+(10,1,1) = {"
+K
+K
+K
+R
+b
+b
+b
+b
+b
+b
+b
+b
+b
+b
+R
+K
+K
+"}
+(11,1,1) = {"
+K
+K
+K
+R
+b
+b
+b
+b
+b
+b
+b
+b
+b
+R
+K
+K
+K
+"}
+(12,1,1) = {"
+K
+K
+K
+K
+R
+b
+b
+b
+b
+R
+R
+R
+R
+K
+K
+K
+K
+"}
+(13,1,1) = {"
+K
+K
+K
+K
+K
+R
+b
+b
+R
+K
+K
+K
+K
+K
+K
+K
+K
+"}
+(14,1,1) = {"
+K
+K
+K
+K
+K
+K
+R
+R
+K
+K
+K
+K
+K
+K
+K
+K
+K
+"}

_maps/RandomRuins/SpaceRuinsStation/roid6.dmm

@@ -0,0 +1,349 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"h" = (
+/turf/closed/wall/mineral/titanium,
+/area/ruin/space/has_grav)
+"i" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/structure/spider/stickyweb,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"k" = (
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab/spider,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"q" = (
+/obj/structure/shuttle/engine/propulsion/burst,
+/turf/closed/wall/mineral/titanium,
+/area/ruin/space/has_grav)
+"r" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"v" = (
+/turf/template_noop,
+/area/template_noop)
+"x" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"C" = (
+/obj/effect/decal/remains/human,
+/obj/item/twohanded/spear,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"F" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"J" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"O" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/structure/spider/stickyweb,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"P" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/item/reagent_containers/food/snacks/meat/slab/spider,
+/turf/open/floor/mineral/titanium/blue,
+/area/ruin/space/has_grav)
+"R" = (
+/obj/structure/grille,
+/obj/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/ruin/space/has_grav)
+"S" = (
+/obj/item/shard{
+	icon_state = "medium"
+	},
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg2"
+	},
+/area/ruin/space/has_grav)
+"U" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"W" = (
+/obj/structure/spider/stickyweb,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+v
+v
+v
+v
+v
+v
+J
+J
+J
+v
+v
+v
+v
+v
+v
+"}
+(2,1,1) = {"
+v
+v
+v
+v
+J
+J
+U
+U
+U
+J
+J
+J
+J
+v
+v
+"}
+(3,1,1) = {"
+v
+v
+J
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+J
+v
+"}
+(4,1,1) = {"
+v
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+J
+"}
+(5,1,1) = {"
+v
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+"}
+(6,1,1) = {"
+v
+J
+U
+U
+U
+U
+h
+R
+h
+q
+W
+U
+U
+J
+v
+"}
+(7,1,1) = {"
+J
+U
+U
+U
+U
+U
+r
+i
+i
+q
+W
+W
+J
+J
+v
+"}
+(8,1,1) = {"
+J
+U
+U
+U
+S
+x
+C
+k
+x
+F
+J
+J
+J
+J
+v
+"}
+(9,1,1) = {"
+J
+U
+U
+U
+h
+h
+P
+O
+a
+q
+W
+W
+J
+J
+v
+"}
+(10,1,1) = {"
+J
+U
+U
+U
+U
+h
+h
+R
+h
+q
+W
+U
+U
+U
+v
+"}
+(11,1,1) = {"
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+"}
+(12,1,1) = {"
+v
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+J
+"}
+(13,1,1) = {"
+v
+J
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+U
+J
+"}
+(14,1,1) = {"
+v
+v
+J
+J
+J
+J
+J
+J
+J
+J
+U
+U
+U
+U
+J
+"}
+(15,1,1) = {"
+v
+v
+v
+v
+v
+v
+v
+v
+v
+v
+J
+J
+J
+J
+v
+"}

_maps/RandomRuins/SpaceRuinsStation/roid7.dmm

@@ -0,0 +1,701 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/item/stack/sheet/metal,
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/lattice,
+/obj/structure/lattice,
+/obj/item/stack/sheet/metal,
+/turf/template_noop,
+/area/space/nearstation)
+"c" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"d" = (
+/obj/item/chair,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/ruin/unpowered)
+"e" = (
+/obj/effect/decal/cleanable/blood/gibs/down,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/ruin/space)
+"f" = (
+/obj/structure/fluff/broken_flooring{
+	dir = 4;
+	icon_state = "singular"
+	},
+/turf/template_noop,
+/area/template_noop)
+"g" = (
+/obj/structure/girder,
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"h" = (
+/obj/item/chair/stool/bar,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/space)
+"i" = (
+/obj/structure/table/wood,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"j" = (
+/obj/item/ammo_casing/shotgun/beanbag,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"k" = (
+/turf/closed/wall,
+/area/ruin/space)
+"l" = (
+/obj/structure/chair/stool/bar,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"m" = (
+/obj/item/storage/box/drinkingglasses,
+/obj/structure/table/wood,
+/obj/machinery/light{
+	dir = 8;
+	icon_state = "tube-broken";
+	status = 2
+	},
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"n" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/unpowered)
+"o" = (
+/obj/structure/lattice,
+/turf/template_noop,
+/area/space/nearstation)
+"p" = (
+/obj/structure/fluff/broken_flooring{
+	dir = 4;
+	icon_state = "plating";
+	name = "broken plating"
+	},
+/turf/template_noop,
+/area/space/nearstation)
+"q" = (
+/obj/machinery/light{
+	dir = 1;
+	icon_state = "tube-broken";
+	status = 2
+	},
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"r" = (
+/obj/machinery/door/airlock/public/glass,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"s" = (
+/obj/structure/table/wood,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"t" = (
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"u" = (
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"w" = (
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/ruin/space)
+"x" = (
+/obj/structure/table/wood,
+/obj/item/trash/plate,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"y" = (
+/obj/structure/table_frame,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"z" = (
+/obj/machinery/light{
+	icon_state = "tube-broken";
+	status = 2
+	},
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"A" = (
+/obj/item/ammo_casing/c46x30mm,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/ruin/space)
+"B" = (
+/obj/structure/fluff/broken_flooring{
+	icon_state = "singular"
+	},
+/turf/template_noop,
+/area/template_noop)
+"C" = (
+/obj/structure/lattice,
+/obj/structure/fluff/broken_flooring{
+	dir = 1;
+	icon_state = "side"
+	},
+/turf/template_noop,
+/area/space/nearstation)
+"D" = (
+/obj/structure/table/wood,
+/obj/item/storage/firstaid/brute,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"E" = (
+/obj/structure/girder,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/space)
+"F" = (
+/obj/structure/closet/secure_closet/freezer/kitchen,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"G" = (
+/turf/template_noop,
+/area/template_noop)
+"H" = (
+/obj/machinery/vending/boozeomat/all_access,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"I" = (
+/obj/structure/table/wood,
+/obj/item/kitchen/fork,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"K" = (
+/obj/item/ammo_casing/shotgun/improvised,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"L" = (
+/obj/machinery/vending/dinnerware,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"M" = (
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg1"
+	},
+/area/ruin/unpowered)
+"N" = (
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/space)
+"O" = (
+/obj/item/stack/sheet/metal,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/space)
+"P" = (
+/obj/item/toy/plush/beeplushie,
+/obj/vehicle/ridden/lavaboat,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"Q" = (
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood/splatter,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"R" = (
+/obj/structure/fluff/broken_flooring{
+	dir = 1;
+	icon_state = "plating";
+	name = "broken plating"
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"S" = (
+/obj/item/ammo_casing/c46x30mm,
+/turf/open/floor/plating/airless{
+	icon_state = "platingdmg3"
+	},
+/area/ruin/space)
+"T" = (
+/obj/structure/closet/secure_closet/freezer/fridge,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"U" = (
+/obj/item/chair/stool/bar,
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"V" = (
+/obj/structure/lattice,
+/obj/item/stack/sheet/metal,
+/turf/template_noop,
+/area/space/nearstation)
+"W" = (
+/obj/structure/lattice,
+/obj/structure/fluff/broken_flooring{
+	dir = 1;
+	icon_state = "plating";
+	name = "broken plating"
+	},
+/turf/template_noop,
+/area/space/nearstation)
+"X" = (
+/turf/open/floor/plasteel/airless,
+/area/ruin/space)
+"Y" = (
+/obj/effect/decal/remains/human,
+/obj/effect/decal/cleanable/blood/old,
+/obj/item/clothing/head/chefhat,
+/turf/open/floor/plasteel/airless/cafeteria,
+/area/ruin/space)
+"Z" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+
+(1,1,1) = {"
+G
+G
+G
+G
+G
+G
+G
+G
+G
+G
+c
+c
+c
+c
+c
+c
+G
+G
+G
+G
+"}
+(2,1,1) = {"
+G
+G
+G
+G
+c
+c
+c
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+Z
+c
+G
+G
+G
+"}
+(3,1,1) = {"
+G
+G
+G
+c
+Z
+Z
+Z
+c
+c
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+c
+G
+G
+"}
+(4,1,1) = {"
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+c
+G
+"}
+(5,1,1) = {"
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+c
+G
+"}
+(6,1,1) = {"
+G
+G
+G
+c
+Z
+c
+R
+E
+k
+k
+k
+k
+k
+k
+k
+Z
+Z
+Z
+Z
+c
+"}
+(7,1,1) = {"
+G
+G
+f
+G
+c
+o
+n
+X
+X
+z
+k
+H
+m
+L
+k
+Z
+Z
+Z
+Z
+c
+"}
+(8,1,1) = {"
+G
+G
+G
+G
+G
+V
+C
+N
+N
+l
+I
+t
+j
+s
+k
+Z
+Z
+Z
+Z
+c
+"}
+(9,1,1) = {"
+G
+G
+c
+c
+G
+o
+W
+A
+S
+h
+x
+j
+Y
+D
+k
+Z
+Z
+Z
+Z
+c
+"}
+(10,1,1) = {"
+G
+c
+Z
+Z
+c
+o
+d
+e
+Q
+U
+y
+K
+t
+s
+k
+Z
+Z
+Z
+c
+G
+"}
+(11,1,1) = {"
+c
+Z
+Z
+Z
+c
+o
+M
+A
+S
+l
+i
+t
+j
+u
+k
+X
+Z
+Z
+Z
+c
+"}
+(12,1,1) = {"
+c
+Z
+Z
+c
+G
+G
+p
+w
+N
+N
+k
+q
+t
+s
+E
+X
+P
+Z
+Z
+c
+"}
+(13,1,1) = {"
+G
+c
+c
+G
+G
+o
+b
+X
+O
+N
+r
+t
+t
+t
+E
+X
+X
+Z
+Z
+c
+"}
+(14,1,1) = {"
+G
+G
+G
+B
+G
+a
+o
+X
+X
+z
+k
+T
+T
+F
+E
+X
+X
+Z
+Z
+c
+"}
+(15,1,1) = {"
+G
+G
+G
+G
+G
+c
+g
+E
+k
+k
+k
+k
+k
+k
+k
+X
+Z
+Z
+c
+G
+"}
+(16,1,1) = {"
+G
+G
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+Z
+c
+G
+"}
+(17,1,1) = {"
+G
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+Z
+c
+Z
+Z
+Z
+Z
+Z
+c
+c
+G
+G
+"}
+(18,1,1) = {"
+G
+G
+G
+c
+Z
+Z
+Z
+Z
+Z
+c
+G
+c
+c
+c
+c
+c
+G
+G
+G
+G
+"}
+(19,1,1) = {"
+G
+G
+G
+G
+c
+Z
+Z
+Z
+Z
+c
+G
+G
+G
+G
+G
+G
+G
+G
+G
+G
+"}
+(20,1,1) = {"
+G
+G
+G
+G
+G
+c
+c
+c
+c
+G
+G
+G
+G
+G
+G
+G
+G
+G
+G
+G
+"}

_maps/RandomRuins/SpaceRuinsStation/roid8.dmm

@@ -0,0 +1,460 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/flora/ausbushes/palebush,
+/turf/open/floor/grass,
+/area/ruin/space)
+"g" = (
+/obj/structure/flora/ausbushes/ywflowers,
+/turf/open/floor/grass,
+/area/ruin/space)
+"m" = (
+/obj/structure/flora/ausbushes/fernybush,
+/turf/open/floor/grass,
+/area/ruin/space)
+"p" = (
+/obj/structure/flora/ausbushes/brflowers,
+/turf/open/floor/grass,
+/area/ruin/space)
+"q" = (
+/turf/open/floor/grass,
+/area/ruin/space)
+"C" = (
+/mob/living/simple_animal/butterfly,
+/turf/open/floor/grass,
+/area/ruin/space)
+"D" = (
+/obj/structure/toilet/secret{
+	dir = 4;
+	secret_type = /obj/item/gun/magic/wand/arcane
+	},
+/turf/open/floor/grass,
+/area/ruin/space)
+"J" = (
+/turf/template_noop,
+/area/template_noop)
+"L" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"O" = (
+/obj/item/clothing/head/wizard,
+/obj/item/clothing/suit/wizrobe,
+/obj/effect/decal/remains/human,
+/obj/effect/light_emitter/red_energy_sword,
+/turf/open/floor/grass,
+/area/ruin/space)
+"S" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"V" = (
+/obj/item/bong/coconut,
+/turf/open/floor/grass,
+/area/ruin/space)
+"Y" = (
+/obj/structure/flora/ausbushes/grassybush,
+/turf/open/floor/grass,
+/area/ruin/space)
+"Z" = (
+/obj/structure/flora/ausbushes/stalkybush,
+/turf/open/floor/grass,
+/area/ruin/space)
+
+(1,1,1) = {"
+J
+J
+L
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+"}
+(2,1,1) = {"
+J
+L
+S
+L
+J
+J
+J
+J
+J
+J
+J
+J
+J
+J
+L
+L
+L
+J
+"}
+(3,1,1) = {"
+L
+S
+S
+S
+L
+J
+J
+J
+J
+J
+J
+J
+L
+L
+S
+S
+S
+L
+"}
+(4,1,1) = {"
+L
+S
+S
+S
+L
+J
+J
+J
+J
+J
+J
+L
+S
+S
+S
+S
+S
+L
+"}
+(5,1,1) = {"
+J
+L
+S
+S
+L
+J
+J
+L
+L
+L
+L
+S
+S
+S
+S
+S
+S
+L
+"}
+(6,1,1) = {"
+J
+J
+L
+L
+J
+J
+L
+S
+S
+S
+S
+S
+S
+S
+S
+S
+L
+J
+"}
+(7,1,1) = {"
+J
+J
+J
+J
+J
+L
+S
+S
+S
+S
+D
+m
+S
+S
+S
+S
+L
+J
+"}
+(8,1,1) = {"
+J
+J
+J
+J
+L
+S
+S
+S
+q
+q
+q
+q
+S
+S
+S
+L
+J
+J
+"}
+(9,1,1) = {"
+J
+J
+J
+J
+L
+S
+S
+a
+C
+q
+p
+C
+S
+S
+S
+L
+J
+J
+"}
+(10,1,1) = {"
+J
+J
+J
+J
+L
+S
+S
+q
+V
+O
+q
+q
+Z
+S
+S
+L
+J
+J
+"}
+(11,1,1) = {"
+J
+J
+J
+L
+S
+S
+S
+q
+g
+q
+C
+q
+q
+S
+S
+L
+J
+J
+"}
+(12,1,1) = {"
+J
+J
+J
+L
+S
+S
+S
+S
+q
+q
+Y
+q
+S
+S
+S
+L
+J
+J
+"}
+(13,1,1) = {"
+J
+J
+J
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+L
+L
+J
+J
+"}
+(14,1,1) = {"
+J
+J
+L
+S
+S
+S
+S
+S
+S
+S
+S
+S
+S
+L
+L
+S
+L
+J
+"}
+(15,1,1) = {"
+J
+L
+S
+S
+S
+S
+S
+S
+L
+L
+L
+L
+L
+L
+S
+S
+S
+L
+"}
+(16,1,1) = {"
+L
+S
+S
+S
+S
+S
+S
+S
+L
+J
+J
+J
+J
+L
+S
+S
+S
+L
+"}
+(17,1,1) = {"
+J
+L
+S
+S
+S
+S
+S
+L
+J
+J
+J
+J
+L
+S
+S
+S
+L
+J
+"}
+(18,1,1) = {"
+J
+L
+S
+S
+S
+S
+L
+J
+J
+J
+J
+L
+S
+S
+S
+L
+J
+J
+"}
+(19,1,1) = {"
+J
+J
+L
+S
+S
+S
+L
+J
+J
+J
+J
+L
+S
+S
+L
+J
+J
+J
+"}
+(20,1,1) = {"
+J
+J
+J
+L
+L
+L
+J
+J
+J
+J
+J
+J
+L
+L
+J
+J
+J
+J
+"}

_maps/RandomRuins/SpaceRuinsStation/roid9.dmm

@@ -0,0 +1,646 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/iron,
+/area/ruin/space/has_grav)
+"d" = (
+/obj/structure/table/wood,
+/obj/item/flashlight/lamp,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"e" = (
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/obj/structure/bed,
+/obj/item/bedsheet,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"g" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/obj/machinery/door/airlock/highsecurity,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"h" = (
+/obj/machinery/light/small,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"k" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"l" = (
+/obj/structure/dresser,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"m" = (
+/obj/structure/table/wood,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"n" = (
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"o" = (
+/obj/structure/table/wood,
+/obj/item/reagent_containers/food/snacks/beans,
+/obj/item/reagent_containers/food/snacks/beans,
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"p" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 10
+	},
+/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"q" = (
+/obj/machinery/atmospherics/components/unary/tank/air{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"r" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 4
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden{
+	dir = 5
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"u" = (
+/obj/structure/chair/comfy/black{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"v" = (
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"w" = (
+/obj/machinery/atmospherics/components/unary/vent_pump/on,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"x" = (
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"y" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1,
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"z" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 4
+	},
+/obj/machinery/door/airlock/highsecurity,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"A" = (
+/obj/structure/table/wood,
+/obj/item/export/bottle/wine,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/obj/item/reagent_containers/food/drinks/drinkingglass,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"B" = (
+/obj/structure/table/wood,
+/obj/item/storage/box/donkpockets,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 1
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"C" = (
+/turf/closed/mineral/random/no_caves,
+/area/ruin/space)
+"D" = (
+/obj/machinery/atmospherics/components/unary/outlet_injector/on/layer1{
+	dir = 1
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+"E" = (
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"F" = (
+/obj/structure/table,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"G" = (
+/obj/machinery/computer/security,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"J" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 9
+	},
+/obj/machinery/atmospherics/pipe/simple/supply/hidden,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"N" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/mechanical,
+/obj/item/clothing/gloves/color/yellow,
+/obj/item/multitool,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"O" = (
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"P" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"Q" = (
+/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer1{
+	dir = 1
+	},
+/obj/structure/table/wood,
+/obj/machinery/microwave,
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"T" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 6
+	},
+/turf/open/floor/wood,
+/area/ruin/space/has_grav)
+"U" = (
+/obj/machinery/sleeper,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"V" = (
+/obj/machinery/computer/crew,
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"W" = (
+/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden/layer1,
+/obj/machinery/airalarm{
+	dir = 1;
+	pixel_y = -22
+	},
+/turf/open/floor/plasteel,
+/area/ruin/space/has_grav)
+"Y" = (
+/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer1{
+	dir = 6
+	},
+/turf/open/floor/plating/asteroid/airless,
+/area/ruin/space)
+
+(1,1,1) = {"
+e
+e
+e
+e
+e
+e
+v
+v
+v
+e
+e
+e
+e
+e
+e
+v
+v
+e
+e
+e
+"}
+(2,1,1) = {"
+e
+e
+e
+e
+e
+v
+C
+C
+C
+v
+e
+e
+e
+v
+v
+C
+C
+v
+e
+e
+"}
+(3,1,1) = {"
+e
+e
+e
+e
+v
+C
+C
+C
+C
+v
+v
+e
+e
+C
+C
+C
+C
+C
+v
+e
+"}
+(4,1,1) = {"
+e
+e
+e
+v
+C
+C
+C
+C
+C
+C
+v
+v
+v
+C
+C
+C
+C
+C
+v
+e
+"}
+(5,1,1) = {"
+e
+e
+v
+C
+C
+C
+C
+C
+C
+C
+v
+v
+C
+C
+C
+C
+C
+C
+v
+e
+"}
+(6,1,1) = {"
+e
+v
+C
+C
+C
+C
+C
+C
+C
+C
+v
+v
+C
+C
+C
+C
+C
+C
+C
+v
+"}
+(7,1,1) = {"
+e
+v
+C
+C
+C
+C
+C
+C
+C
+C
+v
+v
+C
+C
+C
+C
+C
+C
+C
+v
+"}
+(8,1,1) = {"
+e
+v
+C
+C
+C
+C
+C
+C
+C
+C
+v
+v
+v
+C
+C
+C
+C
+C
+C
+v
+"}
+(9,1,1) = {"
+e
+v
+C
+C
+C
+C
+C
+C
+C
+C
+v
+v
+v
+C
+C
+C
+C
+C
+C
+v
+"}
+(10,1,1) = {"
+e
+v
+C
+C
+C
+C
+C
+C
+C
+C
+Y
+D
+C
+C
+C
+C
+C
+C
+C
+v
+"}
+(11,1,1) = {"
+v
+C
+C
+C
+C
+C
+a
+a
+a
+a
+z
+a
+C
+C
+C
+C
+C
+C
+C
+v
+"}
+(12,1,1) = {"
+v
+C
+C
+C
+C
+C
+a
+V
+O
+x
+k
+a
+a
+a
+a
+a
+C
+C
+v
+e
+"}
+(13,1,1) = {"
+v
+C
+C
+C
+C
+C
+a
+G
+u
+O
+k
+a
+l
+f
+f
+a
+C
+C
+v
+e
+"}
+(14,1,1) = {"
+v
+C
+C
+C
+C
+C
+a
+F
+O
+P
+W
+a
+d
+n
+h
+a
+C
+C
+v
+e
+"}
+(15,1,1) = {"
+v
+C
+C
+C
+C
+C
+a
+a
+N
+w
+r
+a
+n
+T
+Q
+a
+C
+C
+v
+e
+"}
+(16,1,1) = {"
+v
+C
+C
+C
+C
+C
+C
+a
+U
+E
+p
+g
+y
+J
+B
+a
+C
+C
+v
+e
+"}
+(17,1,1) = {"
+e
+e
+v
+C
+C
+C
+C
+a
+a
+a
+q
+a
+m
+o
+A
+a
+C
+v
+v
+e
+"}
+(18,1,1) = {"
+e
+e
+e
+v
+C
+C
+C
+C
+C
+a
+a
+a
+a
+a
+a
+a
+C
+v
+e
+e
+"}
+(19,1,1) = {"
+e
+e
+e
+e
+v
+v
+v
+v
+C
+C
+C
+C
+C
+C
+C
+C
+C
+v
+e
+e
+"}
+(20,1,1) = {"
+e
+e
+e
+e
+e
+e
+e
+e
+v
+v
+v
+v
+v
+v
+v
+v
+v
+e
+e
+e
+"}

_maps/RandomRuins/StationRuins/Box/Engine/engine_am.dmm

@@ -118,13 +118,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"nR" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 8
-	},
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/engine,
-/area/engine/engineering)
 "nW" = (
 /obj/effect/turf_decal/stripes/line{
 	dir = 4
@@ -180,13 +173,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"xg" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "xx" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 4
@@ -266,13 +252,6 @@
 	},
 /turf/open/floor/plating,
 /area/engine/engineering)
-"Bh" = (
-/obj/machinery/door/poddoor/shutters/preopen{
-	id = "engsm";
-	name = "Radiation Chamber Shutters"
-	},
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "BG" = (
 /obj/structure/closet/emcloset/anchored,
 /obj/machinery/light/small{
@@ -427,13 +406,6 @@
 	},
 /turf/open/floor/engine,
 /area/engine/engineering)
-"Mn" = (
-/obj/effect/turf_decal/stripes/line{
-	dir = 4
-	},
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/engine,
-/area/engine/engineering)
 "MD" = (
 /obj/structure/reagent_dispensers/fueltank,
 /obj/effect/turf_decal/stripes/line{
@@ -503,10 +475,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"SD" = (
-/obj/effect/turf_decal/box/red,
-/turf/open/floor/engine,
-/area/engine/engineering)
 "Tr" = (
 /obj/structure/sign/warning/radiation/rad_area,
 /obj/machinery/atmospherics/pipe/simple/orange/visible{
@@ -1117,8 +1085,8 @@ MJ
 wt
 eJ
 Zx
-Mn
-Mn
+nW
+nW
 WQ
 lY
 Og
@@ -1401,7 +1369,7 @@ fh
 JZ
 kK
 Ch
-dz
+Ch
 MJ
 MJ
 MJ

_maps/RandomRuins/StationRuins/Box/Engine/engine_teg.dmm

@@ -1545,21 +1545,6 @@
 	},
 /turf/open/floor/plasteel,
 /area/engine/engineering)
-"RK" = (
-/obj/machinery/portable_atmospherics/canister/toxins,
-/obj/effect/turf_decal/delivery,
-/obj/structure/cable/yellow{
-	icon_state = "4-8"
-	},
-/obj/machinery/atmospherics/pipe/simple/supply/hidden{
-	dir = 4
-	},
-/obj/structure/window/reinforced{
-	dir = 8
-	},
-/obj/effect/decal/cleanable/dirt,
-/turf/open/floor/plasteel,
-/area/engine/engineering)
 "RQ" = (
 /obj/machinery/atmospherics/components/binary/pump{
 	dir = 1
@@ -2237,7 +2222,7 @@ yf
 "}
 (12,1,1) = {"
 cS
-RK
+QS
 uy
 PK
 iZ

_maps/RandomZLevels/Academy.dmm

@@ -2754,12 +2754,12 @@
 "hT" = (
 /obj/structure/closet,
 /obj/item/storage/belt/soulstone,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "hU" = (
 /obj/structure/closet,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/dress/skirt,
 /obj/item/clothing/glasses/regular,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
@@ -2772,7 +2772,7 @@
 "hW" = (
 /obj/structure/closet,
 /obj/item/lipstick/random,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/plasteel,
 /area/awaymission/academy/academyaft)
 "hX" = (

_maps/RandomZLevels/VR/snowdin_VR.dmm

@@ -2524,7 +2524,7 @@
 /area/awaymission/snowdin/post)
 "fF" = (
 /obj/structure/closet,
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /obj/item/clothing/suit/hooded/wintercoat,
 /obj/item/clothing/shoes/winterboots,
 /obj/effect/turf_decal/bot,

_maps/RandomZLevels/VR/syndicate_trainer.dmm

@@ -2252,7 +2252,7 @@
 /area/awaymission/centcomAway/hangar)
 "mQ" = (
 /obj/structure/safe/floor,
-/obj/item/clothing/under/rank/centcom_officer,
+/obj/item/clothing/under/rank/centcom/officer,
 /obj/item/clothing/suit/det_suit,
 /obj/item/gun/ballistic/revolver/mateba,
 /turf/open/indestructible,

_maps/RandomZLevels/caves.dmm

@@ -580,7 +580,7 @@
 /area/awaymission/caves/BMP_asteroid/level_four)
 "bH" = (
 /obj/effect/decal/remains/human,
-/obj/item/clothing/under/patriotsuit,
+/obj/item/clothing/under/misc/patriotsuit,
 /turf/open/floor/plating/asteroid/basalt/lava{
 	initial_gas_mix = "n2=23;o2=14"
 	},

_maps/RandomZLevels/moonoutpost19.dmm

@@ -174,7 +174,7 @@
 /obj/structure/bed/nest,
 /obj/effect/decal/cleanable/blood/gibs,
 /obj/item/clothing/mask/facehugger/impregnated,
-/obj/item/clothing/under/rank/security,
+/obj/item/clothing/under/rank/security/officer,
 /obj/item/clothing/suit/armor/vest,
 /obj/item/melee/baton/loaded,
 /obj/item/clothing/head/helmet,
@@ -5718,7 +5718,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -6008,7 +6008,7 @@
 	name = "Kitchen Crate"
 	},
 /obj/item/storage/box/mousetraps,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /turf/open/floor/plasteel/showroomfloor{
 	heat_capacity = 1e+006;
 	temperature = 273.15
@@ -6655,7 +6655,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/assistantformal,
+/obj/item/clothing/under/misc/assistantformal,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -6823,7 +6823,7 @@
 /obj/structure/table,
 /obj/structure/bedsheetbin,
 /obj/item/clothing/neck/tie/black,
-/obj/item/clothing/under/lawyer/blacksuit,
+/obj/item/clothing/under/suit/black,
 /obj/effect/turf_decal/tile/blue{
 	dir = 4
 	},
@@ -7068,7 +7068,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/suit_jacket/burgundy,
+/obj/item/clothing/under/suit/burgundy,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},

_maps/RandomZLevels/research.dmm

@@ -3214,7 +3214,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -4322,7 +4322,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -5173,7 +5173,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /obj/effect/decal/cleanable/blood,
@@ -6047,7 +6047,7 @@
 	id_job = "Geneticist";
 	oxy_damage = 55;
 	suit = /obj/item/clothing/suit/toggle/labcoat/genetics;
-	uniform = /obj/item/clothing/under/rank/geneticist;
+	uniform = /obj/item/clothing/under/rank/medical/geneticist;
 	name = "Geneticist"
 	},
 /turf/open/floor/mineral/titanium/blue,

_maps/RandomZLevels/undergroundoutpost45.dmm

@@ -312,7 +312,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/pj/blue,
+/obj/item/clothing/under/misc/pj/blue,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -362,7 +362,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/suit_jacket/female,
+/obj/item/clothing/under/suit/black/skirt,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},
@@ -2135,7 +2135,7 @@
 	},
 /area/awaymission/undergroundoutpost45/caves)
 "ev" = (
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /obj/structure/closet/secure_closet{
 	desc = "It's a secure locker for personnel. The first card swiped gains control.";
 	icon_state = "cabinet";
@@ -3130,7 +3130,7 @@
 	name = "Kitchen Crate"
 	},
 /obj/item/storage/box/mousetraps,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/plasteel/showroomfloor{
 	heat_capacity = 1e+006
@@ -5263,7 +5263,7 @@
 	},
 /area/awaymission/undergroundoutpost45/gateway)
 "km" = (
-/obj/item/clothing/under/suit_jacket/navy,
+/obj/item/clothing/under/suit/navy,
 /obj/structure/closet/secure_closet{
 	desc = "It's a secure locker for personnel. The first card swiped gains control.";
 	icon_state = "cabinet";
@@ -9706,7 +9706,7 @@
 	name = "personal closet";
 	req_access_txt = "201"
 	},
-/obj/item/clothing/under/pj/red,
+/obj/item/clothing/under/misc/pj/red,
 /turf/open/floor/carpet{
 	heat_capacity = 1e+006
 	},

_maps/_basemap.dm

@@ -11,6 +11,7 @@
 		#include "map_files\OmegaStation\OmegaStation.dmm"
 		#include "map_files\PubbyStation\PubbyStation.dmm"
 		#include "map_files\BoxStation\BoxStation.dmm"
+		#include "map_files\LambdaStation\lambda.dmm"
 
 		#ifdef TRAVISBUILDING
 			#include "templates.dm"

_maps/kilostation.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/kilostation.json"

_maps/kilostation.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "Kilo Station",
+    "map_path": "map_files/KiloStation",
+    "map_file": "KiloStation.dmm",
+    "shuttles": {
+	    "emergency": "emergency_kilo",
+	    "ferry": "ferry_kilo",
+	    "cargo": "cargo_kilo",
+	    "whiteship": "whiteship_delta"
+    }
+}

_maps/lambdastation.dm

@@ -0,0 +1 @@
+#define FORCE_MAP "_maps/lambdastation.json"

_maps/lambdastation.json

@@ -0,0 +1,11 @@
+{
+    "map_name": "Lambda Station",
+    "map_path": "map_files/LambdaStation",
+    "map_file": "lambda.dmm",
+    "shuttles": {
+	    "cargo": "cargo_box",
+	    "ferry": "ferry_fancy",
+	    "whiteship": "whiteship_meta",
+	    "emergency": "emergency_meta"
+    }
+}

_maps/map_files/generic/CentCom.dmm

@@ -1711,14 +1711,14 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eD" = (
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/green,
+/obj/item/clothing/under/costume/schoolgirl/green,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eE" = (
@@ -1832,14 +1832,14 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/orange,
+/obj/item/clothing/under/costume/schoolgirl/orange,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eU" = (
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl/red,
+/obj/item/clothing/under/costume/schoolgirl/red,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
 "eV" = (
@@ -1934,7 +1934,7 @@
 /obj/structure/table,
 /obj/item/paper,
 /obj/item/pen,
-/obj/item/clothing/under/schoolgirl,
+/obj/item/clothing/under/costume/schoolgirl,
 /obj/item/toy/katana,
 /turf/open/floor/holofloor,
 /area/holodeck/rec_center/school)
@@ -6839,8 +6839,8 @@
 /area/centcom/ferry)
 "pN" = (
 /obj/structure/closet/secure_closet/personal/cabinet,
-/obj/item/clothing/under/rank/curator/treasure_hunter,
-/obj/item/clothing/under/skirt/black,
+/obj/item/clothing/under/rank/civilian/curator/treasure_hunter,
+/obj/item/clothing/under/dress/skirt,
 /obj/item/clothing/under/shorts/black,
 /obj/item/clothing/under/pants/track,
 /obj/item/clothing/accessory/armband/deputy,
@@ -17017,11 +17017,11 @@
 /turf/open/floor/plasteel/white,
 /area/centcom/holding)
 "OU" = (
-/obj/item/clothing/under/jabroni,
-/obj/item/clothing/under/geisha,
-/obj/item/clothing/under/kilt,
+/obj/item/clothing/under/costume/jabroni,
+/obj/item/clothing/under/costume/geisha,
+/obj/item/clothing/under/costume/kilt,
 /obj/structure/closet,
-/obj/item/clothing/under/roman,
+/obj/item/clothing/under/costume/roman,
 /turf/open/indestructible/hotelwood,
 /area/centcom/holding)
 "OV" = (

_maps/shuttles/arrival_cog.dmm

@@ -0,0 +1,278 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"c" = (
+/obj/structure/shuttle/engine/propulsion/right{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"d" = (
+/obj/structure/shuttle/engine/propulsion/left{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"e" = (
+/obj/docking_port/mobile/arrivals{
+	dir = 2;
+	dwidth = 4;
+	height = 12;
+	name = "cog arrivals shuttle";
+	width = 9
+	},
+/turf/template_noop,
+/area/template_noop)
+"f" = (
+/turf/closed/wall/mineral/titanium/nosmooth,
+/area/shuttle/arrival)
+"g" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 1
+	},
+/obj/structure/window/reinforced/spawner,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"h" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 1
+	},
+/turf/closed/wall/mineral/titanium/nosmooth,
+/area/shuttle/arrival)
+"i" = (
+/obj/machinery/sleeper,
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"j" = (
+/obj/structure/closet/emcloset/anchored,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"k" = (
+/obj/structure/table/reinforced,
+/obj/item/radio,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"l" = (
+/obj/machinery/sleeper,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"m" = (
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"n" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"o" = (
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"p" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"q" = (
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"r" = (
+/obj/machinery/door/airlock/external{
+	name = "Arrival Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"s" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"t" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"u" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"v" = (
+/obj/structure/table/reinforced,
+/obj/item/radio,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"w" = (
+/obj/machinery/computer{
+	dir = 1;
+	name = "Shuttle computer"
+	},
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"x" = (
+/obj/machinery/computer{
+	dir = 1;
+	name = "Shuttle computer"
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+"y" = (
+/obj/machinery/computer{
+	dir = 1;
+	name = "Shuttle computer"
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+c
+h
+b
+a
+a
+a
+a
+a
+a
+a
+a
+"}
+(2,1,1) = {"
+b
+f
+b
+b
+n
+b
+b
+r
+b
+b
+b
+a
+"}
+(3,1,1) = {"
+c
+g
+i
+m
+o
+o
+p
+m
+s
+u
+b
+b
+"}
+(4,1,1) = {"
+d
+g
+j
+m
+o
+o
+o
+m
+o
+o
+w
+n
+"}
+(5,1,1) = {"
+e
+f
+k
+m
+m
+m
+m
+m
+m
+m
+x
+n
+"}
+(6,1,1) = {"
+c
+g
+j
+m
+o
+o
+o
+m
+o
+o
+y
+n
+"}
+(7,1,1) = {"
+d
+g
+l
+m
+o
+o
+q
+m
+t
+v
+b
+b
+"}
+(8,1,1) = {"
+b
+f
+b
+b
+n
+b
+b
+r
+b
+b
+b
+a
+"}
+(9,1,1) = {"
+a
+d
+h
+b
+a
+a
+a
+a
+a
+a
+a
+a
+"}

_maps/shuttles/arrival_kilo.dmm

@@ -0,0 +1,558 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/arrival)
+"b" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"c" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"d" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Arrival Shuttle Airlock"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"e" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"f" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"g" = (
+/turf/template_noop,
+/area/template_noop)
+"h" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"i" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"j" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/arrows{
+	icon_state = "arrows";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"k" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"l" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"m" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/status_display/evac{
+	pixel_y = 32
+	},
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"n" = (
+/obj/structure/shuttle/engine/propulsion/left{
+	icon_state = "propulsion_l";
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"o" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/obj/structure/shuttle/engine/heater{
+	icon_state = "heater";
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/shuttle/arrival)
+"p" = (
+/obj/structure/table,
+/obj/item/flashlight{
+	pixel_y = 8
+	},
+/obj/item/flashlight,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"q" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/arrows{
+	icon_state = "arrows";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"r" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/arrows{
+	icon_state = "arrows";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"s" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"t" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"u" = (
+/obj/structure/shuttle/engine/propulsion{
+	icon_state = "propulsion";
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/docking_port/mobile/arrivals{
+	dir = 4;
+	name = "kilo arrivals shuttle"
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"v" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/item/radio{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_y = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"w" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/item/radio/intercom{
+	pixel_x = 28
+	},
+/obj/effect/turf_decal/arrows{
+	icon_state = "arrows";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"x" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"y" = (
+/obj/machinery/requests_console{
+	department = "Arrival shuttle";
+	name = "Arrivals Shuttle console"
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"z" = (
+/obj/structure/flora/ausbushes/grassybush,
+/obj/structure/flora/ausbushes/lavendergrass,
+/obj/structure/flora/ausbushes/ywflowers,
+/obj/structure/flora/ausbushes/fernybush,
+/obj/structure/window/shuttle,
+/turf/open/floor/grass,
+/area/shuttle/arrival)
+"A" = (
+/obj/machinery/vending/wallmed{
+	name = "Emergency NanoMed";
+	use_power = 0
+	},
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/arrival)
+"B" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"C" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"D" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 2
+	},
+/obj/machinery/door/airlock/shuttle{
+	name = "Arrival Shuttle Airlock"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"E" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"F" = (
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"G" = (
+/obj/structure/shuttle/engine/propulsion/right{
+	icon_state = "propulsion_r";
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/arrival)
+"H" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency,
+/obj/item/crowbar/red,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"I" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"J" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"K" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"L" = (
+/obj/machinery/status_display/ai,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/arrival)
+"M" = (
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"N" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"O" = (
+/obj/effect/turf_decal/tile/blue{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/blue,
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/arrival)
+"P" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+"Q" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/status_display/evac{
+	pixel_y = -32
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/arrival)
+
+(1,1,1) = {"
+a
+a
+n
+u
+G
+a
+a
+"}
+(2,1,1) = {"
+b
+h
+o
+o
+o
+h
+b
+"}
+(3,1,1) = {"
+c
+i
+p
+v
+H
+i
+c
+"}
+(4,1,1) = {"
+d
+j
+r
+x
+I
+O
+f
+"}
+(5,1,1) = {"
+e
+l
+s
+B
+J
+P
+e
+"}
+(6,1,1) = {"
+f
+k
+s
+y
+J
+N
+f
+"}
+(7,1,1) = {"
+f
+k
+s
+z
+J
+N
+f
+"}
+(8,1,1) = {"
+f
+k
+s
+A
+J
+N
+f
+"}
+(9,1,1) = {"
+c
+m
+s
+B
+J
+Q
+c
+"}
+(10,1,1) = {"
+d
+q
+w
+C
+K
+x
+f
+"}
+(11,1,1) = {"
+b
+c
+c
+D
+L
+c
+b
+"}
+(12,1,1) = {"
+c
+e
+t
+E
+M
+e
+c
+"}
+(13,1,1) = {"
+g
+c
+k
+F
+N
+c
+g
+"}
+(14,1,1) = {"
+g
+c
+f
+f
+f
+c
+g
+"}

_maps/shuttles/cargo_kilo.dmm

@@ -0,0 +1,391 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/supply)
+"b" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"c" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"d" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"e" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"f" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"g" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"h" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"i" = (
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor";
+	name = "Supply Dock Loading Door"
+	},
+/obj/machinery/conveyor{
+	dir = 8;
+	id = "QMLoad";
+	name = "off ramp"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"j" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/supply)
+"k" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"l" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"m" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Supply Shuttle Airlock";
+	req_access_txt = "31"
+	},
+/obj/effect/decal/cleanable/dirt,
+/obj/docking_port/mobile/supply{
+	dir = 4;
+	dwidth = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/supply)
+"n" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"o" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"p" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/machinery/button/door{
+	id = "QMLoaddoor";
+	layer = 4;
+	name = "Off Ramp Toggle";
+	pixel_x = -24;
+	pixel_y = 6;
+	req_access_txt = "31"
+	},
+/obj/machinery/button/door{
+	id = "QMLoaddoor2";
+	layer = 4;
+	name = "On Ramp Toggle";
+	pixel_x = -24;
+	pixel_y = -6;
+	req_access_txt = "31"
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"q" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/structure/sign/departments/cargo{
+	pixel_x = 32
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"r" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Supply Shuttle Airlock";
+	req_access_txt = "31"
+	},
+/obj/effect/decal/cleanable/dirt,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/supply)
+"s" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"t" = (
+/obj/machinery/door/poddoor{
+	id = "QMLoaddoor2";
+	name = "Supply Dock Loading Door"
+	},
+/obj/machinery/conveyor{
+	dir = 4;
+	id = "QMLoad2";
+	name = "on ramp"
+	},
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"u" = (
+/obj/effect/turf_decal/loading_area{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/supply)
+"v" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/end{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"w" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"x" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"y" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/supply)
+"z" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/supply)
+"A" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating,
+/area/shuttle/supply)
+"B" = (
+/turf/template_noop,
+/area/template_noop)
+"C" = (
+/obj/structure/shuttle/engine/propulsion/burst/left,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"D" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+"E" = (
+/obj/structure/shuttle/engine/propulsion/burst/right,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/supply)
+
+(1,1,1) = {"
+a
+a
+a
+i
+m
+a
+r
+t
+a
+a
+a
+B
+"}
+(2,1,1) = {"
+a
+b
+e
+j
+f
+p
+n
+u
+v
+y
+a
+C
+"}
+(3,1,1) = {"
+a
+c
+o
+g
+k
+g
+o
+g
+s
+e
+A
+D
+"}
+(4,1,1) = {"
+a
+c
+g
+g
+g
+g
+g
+g
+g
+z
+A
+D
+"}
+(5,1,1) = {"
+a
+c
+g
+g
+g
+g
+g
+g
+w
+x
+A
+D
+"}
+(6,1,1) = {"
+a
+d
+h
+l
+h
+q
+h
+l
+x
+y
+a
+E
+"}
+(7,1,1) = {"
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+a
+B
+"}

_maps/shuttles/emergency_cog.dmm

@@ -0,0 +1,546 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"c" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"d" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"e" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"f" = (
+/obj/machinery/status_display/evac,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"g" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"h" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"i" = (
+/obj/machinery/light{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"j" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/toolbox/emergency,
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"k" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"l" = (
+/obj/machinery/vending/wallmed,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/escape)
+"m" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"n" = (
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"o" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Emergency Shuttle Airlock"
+	},
+/obj/structure/fans/tiny,
+/obj/docking_port/mobile/emergency{
+	dheight = 0;
+	dir = 2;
+	dwidth = 9;
+	name = "NES Classic";
+	width = 22
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"p" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"q" = (
+/obj/machinery/sleeper,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"r" = (
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"s" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"t" = (
+/obj/structure/table/reinforced,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"u" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"v" = (
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/obj/structure/table/reinforced,
+/obj/item/radio,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"w" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Infirmary"
+	},
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"x" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Cockpit";
+	req_access_txt = "19"
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"y" = (
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"z" = (
+/obj/machinery/computer/emergency_shuttle{
+	dir = 8
+	},
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"A" = (
+/obj/structure/chair/comfy/brown{
+	dir = 4
+	},
+/obj/machinery/light/small,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"B" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/obj/item/storage/firstaid/regular,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"C" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/regular,
+/obj/structure/window/reinforced,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/escape)
+"D" = (
+/obj/machinery/light,
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/blue,
+/area/shuttle/escape)
+"H" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"J" = (
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"K" = (
+/obj/machinery/door/airlock/public/glass{
+	name = "Emergency Shuttle Brig";
+	req_access_txt = "2"
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"P" = (
+/obj/structure/table/optable,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"Q" = (
+/obj/machinery/light,
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"R" = (
+/obj/machinery/light/small,
+/obj/structure/table,
+/obj/item/storage/backpack/duffelbag/med/surgery,
+/turf/open/floor/mineral/titanium/white,
+/area/shuttle/escape)
+"T" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/machinery/light/small{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium/red/brig,
+/area/shuttle/escape)
+"V" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium,
+/area/shuttle/escape)
+"W" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/obj/structure/window/reinforced{
+	dir = 1
+	},
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"X" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 4
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+"Y" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/obj/structure/window/reinforced,
+/turf/open/floor/plating,
+/area/shuttle/escape)
+
+(1,1,1) = {"
+a
+d
+b
+b
+b
+d
+b
+b
+b
+d
+a
+"}
+(2,1,1) = {"
+W
+d
+p
+p
+p
+d
+p
+p
+p
+d
+X
+"}
+(3,1,1) = {"
+c
+d
+q
+n
+P
+d
+H
+H
+H
+d
+Y
+"}
+(4,1,1) = {"
+d
+l
+q
+n
+R
+d
+T
+J
+H
+d
+d
+"}
+(5,1,1) = {"
+d
+d
+d
+w
+f
+d
+f
+K
+d
+d
+d
+"}
+(6,1,1) = {"
+d
+t
+t
+r
+s
+s
+s
+r
+s
+s
+d
+"}
+(7,1,1) = {"
+g
+r
+r
+r
+s
+s
+s
+r
+s
+s
+m
+"}
+(8,1,1) = {"
+m
+r
+r
+Q
+d
+m
+d
+V
+s
+s
+m
+"}
+(9,1,1) = {"
+g
+r
+r
+r
+r
+r
+r
+r
+s
+s
+m
+"}
+(10,1,1) = {"
+m
+r
+r
+s
+s
+s
+s
+r
+r
+r
+m
+"}
+(11,1,1) = {"
+d
+d
+r
+s
+s
+s
+s
+r
+r
+d
+d
+"}
+(12,1,1) = {"
+m
+h
+r
+r
+r
+r
+r
+r
+r
+h
+m
+"}
+(13,1,1) = {"
+d
+e
+s
+s
+s
+r
+s
+s
+s
+D
+d
+"}
+(14,1,1) = {"
+m
+s
+s
+s
+s
+r
+s
+s
+s
+s
+m
+"}
+(15,1,1) = {"
+o
+r
+r
+r
+r
+r
+s
+s
+s
+s
+m
+"}
+(16,1,1) = {"
+m
+r
+r
+s
+s
+r
+s
+s
+s
+s
+m
+"}
+(17,1,1) = {"
+g
+r
+r
+r
+i
+r
+i
+r
+r
+r
+d
+"}
+(18,1,1) = {"
+d
+d
+d
+m
+d
+x
+f
+m
+d
+d
+d
+"}
+(19,1,1) = {"
+a
+a
+m
+j
+k
+y
+k
+C
+m
+a
+a
+"}
+(20,1,1) = {"
+a
+a
+d
+d
+u
+k
+A
+d
+d
+a
+a
+"}
+(21,1,1) = {"
+a
+a
+a
+m
+v
+z
+B
+m
+a
+a
+a
+"}
+(22,1,1) = {"
+a
+a
+a
+d
+m
+m
+m
+d
+a
+a
+a
+"}

_maps/shuttles/emergency_pubby.dmm

@@ -520,7 +520,7 @@
 /obj/structure/window/reinforced,
 /obj/structure/table,
 /obj/item/storage/bag/tray,
-/obj/item/clothing/under/waiter,
+/obj/item/clothing/under/suit/waiter,
 /turf/open/floor/plasteel/cafeteria,
 /area/shuttle/escape)
 "bg" = (

_maps/shuttles/ferry_kilo.dmm

@@ -0,0 +1,293 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/template_noop,
+/area/template_noop)
+"b" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/transport)
+"c" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/transport)
+"d" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/transport)
+"e" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/transport)
+"f" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Ferry Shuttle Airlock"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/fans/tiny,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"g" = (
+/obj/structure/sign/nanotrasen,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/transport)
+"h" = (
+/obj/structure/shuttle/engine/propulsion/left{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"i" = (
+/obj/structure/window/shuttle,
+/obj/structure/grille,
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/shuttle/transport)
+"j" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/transport)
+"k" = (
+/obj/structure/table/reinforced,
+/obj/item/storage/firstaid/o2{
+	pixel_x = 4;
+	pixel_y = 4
+	},
+/obj/item/storage/firstaid/regular,
+/obj/item/crowbar,
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"l" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"m" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"n" = (
+/obj/structure/table/reinforced,
+/obj/machinery/recharger,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"o" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle,
+/obj/machinery/light{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"p" = (
+/obj/structure/shuttle/engine/propulsion{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"q" = (
+/obj/machinery/computer/shuttle/ferry/request{
+	dir = 4
+	},
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"r" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"s" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner,
+/obj/effect/turf_decal/stripes/corner{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"t" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Ferry Shuttle Airlock"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/structure/fans/tiny,
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 11;
+	id = "ferry";
+	name = "ferry shuttle";
+	preferred_direction = 4;
+	width = 5
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"u" = (
+/obj/structure/shuttle/engine/propulsion/right{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/transport)
+"v" = (
+/obj/structure/rack,
+/obj/effect/turf_decal/bot,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral{
+	dir = 4
+	},
+/obj/item/radio{
+	pixel_x = -6;
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_x = 6;
+	pixel_y = 6
+	},
+/obj/item/radio{
+	pixel_y = 4
+	},
+/obj/machinery/light{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"w" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+"x" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/obj/machinery/light,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/transport)
+
+(1,1,1) = {"
+a
+h
+p
+u
+a
+"}
+(2,1,1) = {"
+b
+i
+i
+i
+b
+"}
+(3,1,1) = {"
+c
+j
+q
+j
+c
+"}
+(4,1,1) = {"
+d
+k
+r
+v
+d
+"}
+(5,1,1) = {"
+e
+l
+r
+w
+e
+"}
+(6,1,1) = {"
+d
+l
+r
+w
+d
+"}
+(7,1,1) = {"
+f
+m
+s
+m
+f
+"}
+(8,1,1) = {"
+g
+n
+r
+n
+g
+"}
+(9,1,1) = {"
+e
+l
+r
+w
+e
+"}
+(10,1,1) = {"
+d
+o
+r
+x
+d
+"}
+(11,1,1) = {"
+d
+e
+t
+e
+d
+"}

_maps/shuttles/labour_cog.dmm

@@ -0,0 +1,349 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/labor)
+"b" = (
+/obj/structure/shuttle/engine/propulsion{
+	icon_state = "propulsion";
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+"c" = (
+/obj/structure/shuttle/engine/heater{
+	icon_state = "heater";
+	dir = 1
+	},
+/obj/structure/window/reinforced,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+"d" = (
+/obj/structure/closet/crate/internals,
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen/double{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/effect/turf_decal/delivery,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"e" = (
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"f" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"g" = (
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/door/airlock/shuttle{
+	id_tag = "prisonshuttle";
+	name = "Labor Shuttle Airlock"
+	},
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"h" = (
+/obj/structure/grille,
+/obj/structure/cable/yellow{
+	icon_state = "0-8"
+	},
+/obj/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"i" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"j" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"k" = (
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 25
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"l" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"m" = (
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"n" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/labor)
+"o" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 2;
+	pixel_x = 30
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"p" = (
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+"q" = (
+/obj/machinery/light{
+	dir = 1;
+	light_color = "#c1caff"
+	},
+/obj/machinery/button/flasher{
+	dir = 1;
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	pixel_y = 26;
+	req_access_txt = "1"
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+"r" = (
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp";
+	name = "labor camp shuttle";
+	port_direction = 4;
+	width = 9
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/machinery/door/airlock/shuttle{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"s" = (
+/obj/machinery/computer/shuttle/labor{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -31
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+"t" = (
+/obj/structure/chair/office/dark,
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+"u" = (
+/obj/structure/table/reinforced,
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+"v" = (
+/obj/structure/window/shuttle,
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+"w" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"x" = (
+/obj/machinery/mineral/stacking_machine/laborstacker{
+	input_dir = 2;
+	output_dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/labor)
+"y" = (
+/obj/machinery/mineral/stacking_unit_console{
+	machinedir = 2;
+	pixel_x = 30;
+	pixel_y = -32
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/labor)
+
+(1,1,1) = {"
+a
+a
+a
+h
+a
+a
+h
+a
+a
+"}
+(2,1,1) = {"
+b
+a
+d
+j
+l
+w
+p
+s
+v
+"}
+(3,1,1) = {"
+b
+c
+f
+e
+m
+n
+q
+t
+v
+"}
+(4,1,1) = {"
+b
+a
+i
+k
+o
+x
+y
+u
+v
+"}
+(5,1,1) = {"
+a
+a
+g
+a
+a
+a
+r
+a
+a
+"}

_maps/shuttles/labour_kilo.dmm

@@ -0,0 +1,312 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/labor)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"c" = (
+/obj/machinery/computer/shuttle/labor{
+	dir = 4
+	},
+/obj/structure/reagent_dispensers/peppertank{
+	pixel_x = -31
+	},
+/obj/effect/turf_decal/bot,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"d" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"e" = (
+/obj/structure/table,
+/obj/item/folder/red,
+/obj/item/restraints/handcuffs,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"f" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/obj/effect/turf_decal/stripes/corner,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"g" = (
+/obj/machinery/button/flasher{
+	id = "gulagshuttleflasher";
+	name = "Flash Control";
+	pixel_y = -26;
+	req_access_txt = "1"
+	},
+/obj/machinery/light,
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"h" = (
+/obj/machinery/mineral/stacking_unit_console{
+	machinedir = 2;
+	pixel_x = 30;
+	pixel_y = 30
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"i" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"j" = (
+/obj/machinery/door/airlock/titanium{
+	name = "Labor Shuttle Airlock";
+	req_access_txt = "2"
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"k" = (
+/obj/machinery/mineral/stacking_machine/laborstacker{
+	input_dir = 2;
+	output_dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"l" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"m" = (
+/obj/machinery/light{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"n" = (
+/obj/machinery/mineral/labor_claim_console{
+	machinedir = 1;
+	pixel_x = 30
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"o" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"p" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"q" = (
+/obj/machinery/flasher{
+	id = "gulagshuttleflasher";
+	pixel_x = 25
+	},
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 6
+	},
+/turf/open/floor/mineral/plastitanium/red,
+/area/shuttle/labor)
+"r" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/structure/closet/crate,
+/obj/effect/turf_decal/delivery,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/labor)
+"s" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/loading_area{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/labor)
+"t" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/labor)
+"u" = (
+/obj/machinery/door/airlock/titanium{
+	id_tag = "prisonshuttle";
+	name = "Labor Shuttle Airlock"
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 2;
+	height = 5;
+	id = "laborcamp";
+	name = "labor camp shuttle";
+	port_direction = 4;
+	width = 9
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/labor)
+"v" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/labor)
+"w" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating,
+/area/shuttle/labor)
+"x" = (
+/turf/closed/wall/mineral/plastitanium,
+/area/shuttle/labor)
+"y" = (
+/obj/structure/shuttle/engine/propulsion,
+/turf/open/floor/plating/airless,
+/area/shuttle/labor)
+
+(1,1,1) = {"
+a
+a
+b
+a
+b
+a
+b
+v
+x
+"}
+(2,1,1) = {"
+b
+c
+f
+j
+l
+o
+r
+w
+y
+"}
+(3,1,1) = {"
+b
+d
+g
+a
+m
+p
+s
+w
+y
+"}
+(4,1,1) = {"
+b
+e
+h
+k
+n
+q
+t
+w
+y
+"}
+(5,1,1) = {"
+a
+a
+i
+a
+a
+a
+u
+v
+x
+"}

_maps/shuttles/mining_kilo.dmm

@@ -0,0 +1,242 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"b" = (
+/obj/effect/spawner/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"c" = (
+/obj/structure/table,
+/obj/item/storage/toolbox/emergency,
+/obj/machinery/light/small{
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"d" = (
+/obj/effect/turf_decal/bot,
+/obj/machinery/computer/shuttle/mining,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"e" = (
+/obj/structure/table,
+/obj/item/crowbar/red,
+/obj/item/radio/intercom{
+	pixel_y = 22
+	},
+/obj/machinery/light/small{
+	dir = 4
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"f" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 9
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"g" = (
+/obj/effect/turf_decal/bot,
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"h" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 1
+	},
+/obj/structure/chair/comfy/shuttle{
+	dir = 1
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"i" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 5
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"j" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/machinery/status_display/evac{
+	pixel_x = -32
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 10
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"k" = (
+/obj/machinery/door/airlock/shuttle{
+	name = "Mining Shuttle Airlock"
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/line{
+	dir = 4
+	},
+/obj/docking_port/mobile{
+	dir = 8;
+	dwidth = 3;
+	height = 5;
+	id = "mining";
+	name = "mining shuttle";
+	port_direction = 4;
+	width = 7
+	},
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+	icon_state = "pipe11-2";
+	dir = 8
+	},
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"l" = (
+/obj/effect/spawner/structure/window/shuttle,
+/obj/structure/shuttle/engine/heater,
+/turf/open/floor/plating,
+/area/shuttle/mining)
+"m" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/components/unary/vent_pump/on{
+	dir = 4
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"n" = (
+/obj/structure/sign/warning/fire,
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/mining)
+"o" = (
+/obj/structure/shuttle/engine/propulsion,
+/obj/effect/turf_decal/stripes/line,
+/turf/open/floor/plating/airless,
+/area/shuttle/mining)
+"p" = (
+/obj/effect/turf_decal/tile/brown,
+/obj/effect/turf_decal/tile/brown{
+	dir = 1
+	},
+/obj/effect/turf_decal/stripes/line,
+/obj/machinery/atmospherics/pipe/simple/general/hidden{
+	icon_state = "pipe11-2";
+	dir = 8
+	},
+/obj/effect/turf_decal/stripes/corner{
+	dir = 8
+	},
+/turf/open/floor/mineral/titanium/yellow,
+/area/shuttle/mining)
+"q" = (
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/clothing/suit/hazardvest{
+	desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks.";
+	name = "emergency lifejacket"
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/tank/internals/emergency_oxygen{
+	pixel_x = 3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/mask/breath{
+	pixel_x = -3;
+	pixel_y = -3
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/item/clothing/head/hardhat/orange{
+	name = "protective hat";
+	pixel_y = 9
+	},
+/obj/structure/closet/crate/internals,
+/obj/machinery/airalarm{
+	dir = 4;
+	pixel_x = -22
+	},
+/obj/machinery/light/small,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+"r" = (
+/obj/structure/ore_box,
+/obj/machinery/light/small,
+/obj/effect/turf_decal/box,
+/turf/open/floor/mineral/plastitanium,
+/area/shuttle/mining)
+
+(1,1,1) = {"
+a
+a
+b
+a
+b
+a
+a
+"}
+(2,1,1) = {"
+a
+c
+f
+j
+g
+q
+n
+"}
+(3,1,1) = {"
+b
+d
+h
+m
+g
+l
+o
+"}
+(4,1,1) = {"
+a
+e
+i
+p
+g
+r
+n
+"}
+(5,1,1) = {"
+a
+a
+b
+k
+b
+a
+a
+"}

_maps/shuttles/ruin_pirate_cutter.dmm

@@ -82,7 +82,7 @@
 	},
 /obj/item/clothing/head/collectable/pirate,
 /obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
+/obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/head/bandana,
 /turf/open/floor/plasteel/dark/side{
@@ -387,7 +387,7 @@
 	},
 /obj/item/clothing/head/collectable/pirate,
 /obj/item/clothing/suit/pirate,
-/obj/item/clothing/under/pirate,
+/obj/item/clothing/under/costume/pirate,
 /obj/item/clothing/shoes/jackboots,
 /obj/item/clothing/head/bandana,
 /obj/effect/turf_decal/tile/red{

_maps/shuttles/whiteship_cog.dmm

@@ -0,0 +1,428 @@
+//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
+"a" = (
+/obj/structure/shuttle/engine/propulsion/left{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
+"b" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/nosmooth,
+/area/shuttle/abandoned)
+"c" = (
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/abandoned)
+"d" = (
+/turf/template_noop,
+/area/template_noop)
+"e" = (
+/obj/structure/shuttle/engine/propulsion/burst{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
+"f" = (
+/obj/structure/shuttle/engine/heater{
+	dir = 8
+	},
+/turf/closed/wall/mineral/titanium/interior,
+/area/shuttle/abandoned)
+"g" = (
+/turf/closed/wall/mineral/titanium/nodiagonal,
+/area/shuttle/abandoned)
+"h" = (
+/obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
+"i" = (
+/obj/machinery/suit_storage_unit/security,
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/obj/machinery/airalarm/all_access{
+	pixel_y = 24
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned)
+"j" = (
+/turf/closed/wall/mineral/titanium,
+/area/shuttle/abandoned)
+"k" = (
+/obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned)
+"l" = (
+/obj/structure/shuttle/engine/propulsion/right{
+	dir = 8
+	},
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
+"m" = (
+/obj/structure/bed,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"n" = (
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"o" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"p" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"q" = (
+/obj/structure/table/reinforced,
+/obj/structure/window/reinforced/spawner/east,
+/obj/machinery/recharger,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned)
+"r" = (
+/obj/structure/filingcabinet,
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"s" = (
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"t" = (
+/turf/closed/wall/mineral/titanium/nosmooth,
+/area/shuttle/abandoned)
+"u" = (
+/obj/machinery/door/airlock/security,
+/obj/machinery/door/firedoor,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"v" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"w" = (
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/effect/turf_decal/tile/red,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"x" = (
+/obj/machinery/door/firedoor/border_only/closed{
+	icon_state = "door_closed";
+	dir = 4
+	},
+/obj/machinery/door/window/eastright,
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned)
+"y" = (
+/obj/structure/table/reinforced,
+/obj/item/paper_bin,
+/obj/item/pen,
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"z" = (
+/obj/structure/window/shuttle,
+/turf/open/floor/plating,
+/area/shuttle/abandoned)
+"A" = (
+/obj/machinery/door/window/eastright,
+/obj/structure/toilet{
+	contents = newlist(/obj/item/toy/snappop/phoenix);
+	dir = 4
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"B" = (
+/obj/machinery/light{
+	dir = 4;
+	light_color = "#c1caff"
+	},
+/obj/machinery/flasher{
+	id = "cogws";
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"C" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 1
+	},
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/item/gun/energy/laser/carbine,
+/obj/machinery/button/flasher{
+	id = "cogws";
+	pixel_x = -24;
+	pixel_y = 8
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"D" = (
+/obj/effect/turf_decal/tile/red,
+/obj/effect/turf_decal/tile/red{
+	dir = 8
+	},
+/obj/structure/closet/crate/secure/weapon,
+/obj/effect/turf_decal/tile/red{
+	dir = 4
+	},
+/obj/item/gun/energy/e_gun/stun,
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"E" = (
+/obj/machinery/light{
+	dir = 8;
+	light_color = "#e8eaff"
+	},
+/obj/machinery/airalarm/all_access{
+	dir = 4;
+	pixel_x = -24
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"F" = (
+/obj/structure/chair/comfy/shuttle{
+	dir = 4
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"G" = (
+/obj/machinery/computer/shuttle/white_ship{
+	dir = 8
+	},
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"H" = (
+/obj/item/clothing/glasses/sunglasses/blindfold,
+/obj/machinery/airalarm/all_access{
+	dir = 8;
+	pixel_x = 24
+	},
+/turf/open/floor/plasteel,
+/area/shuttle/abandoned)
+"I" = (
+/obj/structure/table/reinforced,
+/obj/item/clothing/glasses/sunglasses,
+/turf/open/floor/plasteel/grimy,
+/area/shuttle/abandoned)
+"J" = (
+/obj/structure/curtain,
+/obj/machinery/shower{
+	name = "shower";
+	pixel_y = 12
+	},
+/obj/item/soap/nanotrasen,
+/turf/open/floor/plasteel/white,
+/area/shuttle/abandoned)
+"K" = (
+/obj/structure/mirror{
+	pixel_y = 32
+	},
+/obj/structure/sink{
+	pixel_y = 28
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/abandoned)
+"L" = (
+/obj/machinery/door/airlock/shuttle,
+/turf/open/floor/plasteel/white,
+/area/shuttle/abandoned)
+"M" = (
+/obj/structure/toilet{
+	dir = 8
+	},
+/obj/machinery/light/small{
+	brightness = 3;
+	dir = 8
+	},
+/obj/machinery/airalarm/all_access{
+	dir = 1;
+	pixel_y = -24
+	},
+/turf/open/floor/plasteel/white,
+/area/shuttle/abandoned)
+"N" = (
+/obj/machinery/door/airlock/external,
+/obj/structure/fans/tiny,
+/obj/docking_port/mobile{
+	dir = 2;
+	dwidth = 7;
+	height = 9;
+	id = "whiteship";
+	movement_force = list("KNOCKDOWN" = 0, "THROW" = 0);
+	name = "Prisoner Transport";
+	port_direction = 8;
+	preferred_direction = 4;
+	width = 13
+	},
+/turf/open/floor/plasteel/dark,
+/area/shuttle/abandoned)
+
+(1,1,1) = {"
+a
+e
+l
+g
+c
+g
+a
+e
+l
+"}
+(2,1,1) = {"
+b
+f
+f
+t
+A
+t
+f
+f
+b
+"}
+(3,1,1) = {"
+c
+g
+m
+n
+n
+n
+m
+g
+c
+"}
+(4,1,1) = {"
+d
+c
+m
+n
+n
+n
+m
+c
+d
+"}
+(5,1,1) = {"
+d
+h
+n
+n
+B
+H
+n
+h
+d
+"}
+(6,1,1) = {"
+d
+g
+c
+u
+c
+g
+c
+g
+d
+"}
+(7,1,1) = {"
+c
+c
+o
+v
+C
+c
+J
+c
+c
+"}
+(8,1,1) = {"
+c
+i
+p
+w
+D
+c
+K
+M
+c
+"}
+(9,1,1) = {"
+c
+g
+q
+x
+c
+g
+L
+g
+c
+"}
+(10,1,1) = {"
+d
+j
+r
+s
+E
+s
+s
+j
+d
+"}
+(11,1,1) = {"
+d
+N
+s
+s
+F
+s
+s
+k
+d
+"}
+(12,1,1) = {"
+d
+j
+j
+y
+G
+I
+j
+j
+d
+"}
+(13,1,1) = {"
+d
+d
+j
+z
+z
+z
+j
+d
+d
+"}

_maps/shuttles/whiteship_delta.dmm

@@ -909,11 +909,11 @@
 	dir = 1
 	},
 /obj/item/storage/wallet/random,
-/obj/item/clothing/under/rank/centcom_officer{
+/obj/item/clothing/under/rank/centcom/officer{
 	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
 	name = "\improper dusty old CentCom jumpsuit"
 	},
-/obj/item/clothing/under/rank/centcom_commander{
+/obj/item/clothing/under/rank/centcom/commander{
 	desc = "A badge on the arm indicates that it's meant to be worn by CentCom recovery teams. This one seems dusty and clearly hasn't been cleaned in some time.";
 	name = "\improper dusty old CentCom jumpsuit"
 	},

code/__DEFINES/DNA.dm

@@ -2,32 +2,57 @@
 
 #define CHECK_DNA_AND_SPECIES(C) if((!(C.dna)) || (!(C.dna.species))) return
 
-//Defines copying names of mutations in all cases, make sure to change this if you change mutation's name
-#define HULK		"Hulk"
-#define XRAY		"X Ray Vision"
-#define COLDRES		"Cold Resistance"
-#define TK			"Telekinesis"
-#define NERVOUS		"Nervousness"
-#define EPILEPSY	"Epilepsy"
-#define MUTATE		"Unstable DNA"
-#define COUGH		"Cough"
-#define DWARFISM	"Dwarfism"
-#define CLOWNMUT	"Clumsiness"
-#define TOURETTES	"Tourettes Syndrome"
-#define DEAFMUT		"Deafness"
-#define BLINDMUT	"Blindness"
-#define RACEMUT		"Monkified"
-#define BADSIGHT	"Near Sightness"
-#define LASEREYES	"Laser Eyes"
-#define CHAMELEON	"Chameleon"
-#define WACKY		"Wacky"
-#define MUT_MUTE	"Mute"
-#define SMILE		"Smile"
-#define STONER		"Stoner"
-#define UNINTELLIGIBLE		"Unintelligible"
-#define SWEDISH		"Swedish"
-#define CHAV		"Chav"
-#define ELVIS		"Elvis"
+//Defines copying names of mutations in all cases, make sure to change this if you change mutation's type
+#define HULK		/datum/mutation/human/hulk
+#define XRAY		/datum/mutation/human/thermal/x_ray
+#define SPACEMUT	/datum/mutation/human/space_adaptation
+#define TK			/datum/mutation/human/telekinesis
+#define NERVOUS		/datum/mutation/human/nervousness
+#define EPILEPSY	/datum/mutation/human/epilepsy
+#define MUTATE		/datum/mutation/human/bad_dna
+#define COUGH		/datum/mutation/human/cough
+#define DWARFISM	/datum/mutation/human/dwarfism
+#define GIGANTISM	/datum/mutation/human/gigantism
+#define CLOWNMUT	/datum/mutation/human/clumsy
+#define TOURETTES	/datum/mutation/human/tourettes
+#define DEAFMUT		/datum/mutation/human/deaf
+#define BLINDMUT	/datum/mutation/human/blind
+#define RACEMUT		/datum/mutation/human/race
+#define BADSIGHT	/datum/mutation/human/nearsight
+#define LASEREYES	/datum/mutation/human/laser_eyes
+#define CHAMELEON	/datum/mutation/human/chameleon
+#define WACKY		/datum/mutation/human/wacky
+#define MUT_MUTE	/datum/mutation/human/mute
+#define SMILE		/datum/mutation/human/smile
+#define STONER		/datum/mutation/human/stoner
+#define UNINTELLIGIBLE		/datum/mutation/human/unintelligible
+#define SWEDISH		/datum/mutation/human/swedish
+#define CHAV		/datum/mutation/human/chav
+#define ELVIS		/datum/mutation/human/elvis
+#define RADIOACTIVE	/datum/mutation/human/radioactive
+#define GLOWY		/datum/mutation/human/glow
+#define ANTIGLOWY	/datum/mutation/human/glow/anti
+#define TELEPATHY	/datum/mutation/human/telepathy
+#define FIREBREATH	/datum/mutation/human/firebreath
+#define VOID		/datum/mutation/human/void
+#define TONGUESPIKE	/datum/mutation/human/tongue_spike
+#define TONGUESPIKECHEM		/datum/mutation/human/tongue_spike/chem
+#define STRONG    	/datum/mutation/human/strong
+#define STIMMED		/datum/mutation/human/stimmed
+#define FIRESWEAT	/datum/mutation/human/fire
+#define THERMAL		/datum/mutation/human/thermal
+#define ANTENNA		/datum/mutation/human/antenna
+#define PARANOIA	/datum/mutation/human/paranoia
+#define MINDREAD	/datum/mutation/human/mindreader
+#define INSULATED	/datum/mutation/human/insulated
+#define SHOCKTOUCH	/datum/mutation/human/shock
+#define OLFACTION	/datum/mutation/human/olfaction
+#define ACIDFLESH	/datum/mutation/human/acidflesh
+#define BADBLINK	/datum/mutation/human/badblink
+#define SPASTIC		/datum/mutation/human/spastic
+#define GELADIKINESIS		/datum/mutation/human/geladikinesis
+#define CRYOKINESIS /datum/mutation/human/cryokinesis
+#define SPIDER_WEB	/datum/mutation/human/webbing
 
 #define UI_CHANGED "ui changed"
 #define UE_CHANGED "ue changed"
@@ -39,10 +64,12 @@
 //Types of usual mutations
 #define	POSITIVE 			1
 #define	NEGATIVE			2
-#define	MINOR_NEGATIVE		3
+#define	MINOR_NEGATIVE		4
 
-//Mutations that cant be taken from genetics and are not in SE
-#define	NON_SCANNABLE		-1
+//Mutation classes. Normal being on them, extra being additional mutations with instability and other being stuff you dont want people to fuck with like wizard mutate
+#define MUT_NORMAL 1
+#define MUT_EXTRA 2
+#define MUT_OTHER 3
 
 //DNA - Because fuck you and your magic numbers being all over the codebase.
 #define DNA_BLOCK_SIZE				3
@@ -63,7 +90,8 @@
 #define DNA_MUTANTMARKING_BLOCK		13
 #define DNA_TAUR_BLOCK 				14
 
-#define DNA_STRUC_ENZYMES_BLOCKS	18
+#define DNA_SEQUENCE_LENGTH			4
+#define DNA_MUTATION_BLOCKS			8
 #define DNA_UNIQUE_ENZYMES_LEN		32
 
 //Transformation proc stuff
@@ -141,7 +169,13 @@
 #define STANDARD_ORGAN_HEALING 		(1/(15 MINUTES / (2 SECONDS)))
 #define STANDARD_ORGAN_DECAY		(1/(15 MINUTES / (2 SECONDS)))		//designed to fail organs when left to decay for ~15 minutes. 2 SECOND is SSmobs tickrate.
 
+
+//used for the can_chromosome var on mutations
+#define CHROMOSOME_NEVER 0
+#define CHROMOSOME_NONE 1
+#define CHROMOSOME_USED 2
+
 #define G_MALE 1
 #define G_FEMALE 2
 #define G_PLURAL 3
-#define G_NEUTER 4
+#define G_NEUTER 4

code/__DEFINES/antagonists.dm

@@ -1,3 +1,6 @@
+#define TRAITOR_HUMAN /datum/traitor_class/human/freeform
+#define TRAITOR_AI /datum/traitor_class/ai
+
 #define NUKE_RESULT_FLUKE 0
 #define NUKE_RESULT_NUKE_WIN 1
 #define NUKE_RESULT_CREW_WIN 2
@@ -34,6 +37,21 @@
 #define HIJACK_HIJACKER 1 //Needs to be present for shuttle to be hijacked
 #define HIJACK_PREVENT 2 //Prevents hijacking same way as non-antags
 
+//Syndicate Contracts
+#define CONTRACT_STATUS_INACTIVE 1
+#define CONTRACT_STATUS_ACTIVE 2
+#define CONTRACT_STATUS_BOUNTY_CONSOLE_ACTIVE 3
+#define CONTRACT_STATUS_EXTRACTING 4
+#define CONTRACT_STATUS_COMPLETE 5
+#define CONTRACT_STATUS_ABORTED 6
+
+#define CONTRACT_PAYOUT_LARGE 1
+#define CONTRACT_PAYOUT_MEDIUM 2
+#define CONTRACT_PAYOUT_SMALL 3
+
+#define CONTRACT_UPLINK_PAGE_CONTRACTS "CONTRACTS"
+#define CONTRACT_UPLINK_PAGE_HUB "HUB"
+
 //Overthrow time to update heads obj
 #define OBJECTIVE_UPDATING_TIME 300
 
@@ -57,3 +75,9 @@
 #define CAT_STRUCTURE	"Structures"
 
 #define MARTIALART_HUNTER "hunter-fu"
+
+//Blob
+#define BLOB_REROLL_TIME 2400 // blob gets a free reroll every X time
+#define BLOB_SPREAD_COST 4
+#define BLOB_ATTACK_REFUND 2 //blob refunds this much if it attacks and doesn't spread
+#define BLOB_REFLECTOR_COST 15

code/__DEFINES/citadel_defines.dm

@@ -2,18 +2,6 @@
 //Be sure to update the min/max of these if you do change them.
 //Measurements are in imperial units. Inches, feet, yards, miles. Tsp, tbsp, cups, quarts, gallons, etc
 
-//HUD stuff
-#define  ui_arousal "EAST-1:28,CENTER-4:8"//Below the health doll
-#define ui_stamina "EAST-1:28,CENTER:17" // replacing internals button
-#define ui_overridden_resist "EAST-3:24,SOUTH+1:7"
-#define ui_combat_toggle "EAST-4:22,SOUTH:5"
-
-//1:1 HUD layout stuff
-#define ui_boxcraft "EAST-4:22,SOUTH+1:6"
-#define ui_boxarea "EAST-4:6,SOUTH+1:6"
-#define ui_boxlang "EAST-5:22,SOUTH+1:6"
-#define ui_boxvore	"EAST-5:22,SOUTH+1:6"
-
 //Filters
 #define CIT_FILTER_STAMINACRIT filter(type="drop_shadow", x=0, y=0, size=-3, color="#04080F")
 
@@ -35,44 +23,50 @@
 #define MASTURBATE_LINKED_ORGAN	(1<<6) //used to pass our mission to the linked organ
 #define CAN_CLIMAX_WITH			(1<<7)
 #define GENITAL_CAN_AROUSE		(1<<8)
+#define GENITAL_UNDIES_HIDDEN	(1<<9)
+#define UPDATE_OWNER_APPEARANCE	(1<<10)
 
-#define COCK_SIZE_MIN		1
-#define COCK_SIZE_MAX		20
 
-#define COCK_GIRTH_RATIO_MAX		1.25
-#define COCK_GIRTH_RATIO_DEF		0.75
-#define COCK_GIRTH_RATIO_MIN		0.5
+#define DEF_VAGINA_SHAPE	"Human"
 
-#define KNOT_GIRTH_RATIO_MAX		3
-#define KNOT_GIRTH_RATIO_DEF		2.1
-#define KNOT_GIRTH_RATIO_MIN		1.25
+#define COCK_SIZE_DEF		6
+
+#define COCK_DIAMETER_RATIO_MAX		0.42
+#define COCK_DIAMETER_RATIO_DEF		0.25
+#define COCK_DIAMETER_RATIO_MIN		0.15
+
+#define DEF_COCK_SHAPE		"Human"
 
 #define BALLS_VOLUME_BASE	25
 #define BALLS_VOLUME_MULT	1
 
+#define DEF_BALLS_SHAPE		"Single"
+
 #define BALLS_SIZE_MIN		1
 #define BALLS_SIZE_DEF		2
 #define BALLS_SIZE_MAX		3
 
-#define BALLS_SACK_SIZE_MIN 1
-#define BALLS_SACK_SIZE_DEF	8
-#define BALLS_SACK_SIZE_MAX 40
-
 #define CUM_RATE			2 // holy shit what a really shitty define name - relates to units per arbitrary measure of time?
 #define CUM_RATE_MULT		1
 #define CUM_EFFICIENCY		1 //amount of nutrition required per life()
 
-#define EGG_GIRTH_MIN		1//inches
-#define EGG_GIRTH_DEF		6
-#define EGG_GIRTH_MAX		16
-
 #define BREASTS_VOLUME_BASE	50	//base volume for the reagents in the breasts, multiplied by the size then multiplier. 50u for A cups, 850u for HH cups.
 #define BREASTS_VOLUME_MULT	1	//global multiplier for breast volume.
 
+#define BREASTS_SIZE_DEF	"c" //lowercase cause those sprite accessory don't use uppercased letters.
+
+#define DEF_BREASTS_SHAPE	"Pair"
+
 #define MILK_RATE			5
 #define MILK_RATE_MULT		1
 #define MILK_EFFICIENCY		1
 
+//visibility toggles defines to avoid errors typos code errors.
+#define GEN_VISIBLE_ALWAYS "Always visible"
+#define GEN_VISIBLE_NO_CLOTHES "Hidden by clothes"
+#define GEN_VISIBLE_NO_UNDIES "Hidden by underwear"
+#define GEN_VISIBLE_NEVER "Always hidden"
+
 //Individual logging define
 #define INDIVIDUAL_LOOC_LOG "LOOC log"
 
@@ -83,8 +77,6 @@
 //Citadel istypes
 #define isgenital(A) (istype(A, /obj/item/organ/genital))
 
-#define isborer(A) (istype(A, /mob/living/simple_animal/borer))
-
 #define CITADEL_MENTOR_OOC_COLOUR "#224724"
 
 //xenobio console upgrade stuff
@@ -92,14 +84,6 @@
 #define XENOBIO_UPGRADE_SLIMEBASIC			2
 #define XENOBIO_UPGRADE_SLIMEADV			4
 
-//stamina stuff
-#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
-#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
-#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
-#define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
-
-#define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob
-
 //Citadel toggles because bitflag memes
 #define MEDIHOUND_SLEEPER	(1<<0)
 #define EATING_NOISES		(1<<1)
@@ -117,8 +101,6 @@
 #define TOGGLES_CITADEL (EATING_NOISES|DIGESTION_NOISES|BREAST_ENLARGEMENT|PENIS_ENLARGEMENT)
 
 //component stuff
-#define COMSIG_COMBAT_TOGGLED "combatmode_toggled" //called by combat mode toggle on all equipped items. args: (mob/user, combatmode)
-
 #define COMSIG_VORE_TOGGLED "voremode_toggled" // totally not copypasta
 
 //belly sound pref things

code/__DEFINES/combat.dm

@@ -29,12 +29,60 @@
 #define EFFECT_DROWSY		"drowsy"
 #define EFFECT_JITTER		"jitter"
 
+// /mob/living/combat_flags
+#define CAN_TOGGLE_COMBAT_MODE(mob)			FORCE_BOOLEAN((mob.stat == CONSCIOUS) && !(mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT))
+
+/// Default combat flags for those affected by ((stamina combat))
+#define COMBAT_FLAGS_DEFAULT					NONE
+/// Default combat flags for everyone else (so literally everyone but humans)
+#define COMBAT_FLAGS_STAMSYSTEM_EXEMPT			(COMBAT_FLAG_SPRINT_ACTIVE | COMBAT_FLAG_COMBAT_ACTIVE | COMBAT_FLAG_SPRINT_TOGGLED | COMBAT_FLAG_COMBAT_TOGGLED)
+/// Default combat flags for those only affected by sprint (so just silicons)
+#define COMBAT_FLAGS_STAMEXEMPT_YESSPRINT		(COMBAT_FLAG_COMBAT_ACTIVE | COMBAT_FLAG_COMBAT_TOGGLED)
+
+/// The user wants combat mode on
+#define COMBAT_FLAG_COMBAT_TOGGLED			(1<<0)
+/// The user wants sprint mode on
+#define COMBAT_FLAG_SPRINT_TOGGLED			(1<<1)
+/// Combat mode is currently active
+#define COMBAT_FLAG_COMBAT_ACTIVE			(1<<2)
+/// Sprint is currently active
+#define COMBAT_FLAG_SPRINT_ACTIVE			(1<<3)
+/// Currently attempting to crawl under someone
+#define COMBAT_FLAG_ATTEMPTING_CRAWL		(1<<4)
+/// Currently stamcritted
+#define COMBAT_FLAG_HARD_STAMCRIT			(1<<5)
+/// Currently attempting to resist up from the ground
+#define COMBAT_FLAG_RESISTING_REST			(1<<6)
+/// Intentionally resting
+#define COMBAT_FLAG_INTENTIONALLY_RESTING	(1<<7)
+/// Currently stamcritted but not as violently
+#define COMBAT_FLAG_SOFT_STAMCRIT			(1<<8)
+
+// Helpers for getting someone's stamcrit state. Cast to living.
+#define NOT_STAMCRIT 0
+#define SOFT_STAMCRIT 1
+#define HARD_STAMCRIT 2
+
+// Stamcrit check helpers
+#define IS_STAMCRIT(mob)					(CHECK_STAMCRIT(mob) != NOT_STAMCRIT)
+#define CHECK_STAMCRIT(mob)					((mob.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)? HARD_STAMCRIT : ((mob.combat_flags & COMBAT_FLAG_SOFT_STAMCRIT)? SOFT_STAMCRIT : NOT_STAMCRIT))
+
+//stamina stuff
+#define STAMINA_SOFTCRIT					100 //softcrit for stamina damage. prevents standing up, prevents performing actions that cost stamina, etc, but doesn't force a rest or stop movement
+#define STAMINA_CRIT						140 //crit for stamina damage. forces a rest, and stops movement until stamina goes back to stamina softcrit
+#define STAMINA_SOFTCRIT_TRADITIONAL		0	//same as STAMINA_SOFTCRIT except for the more traditional health calculations
+#define STAMINA_CRIT_TRADITIONAL			-40 //ditto, but for STAMINA_CRIT
+
+#define CRAWLUNDER_DELAY							30 //Delay for crawling under a standing mob
+
 //Bitflags defining which status effects could be or are inflicted on a mob
+// This is a bit out of date/inaccurate in light of all the new status effects and is probably pending rework.
 #define CANSTUN			(1<<0)
 #define CANKNOCKDOWN	(1<<1)
 #define CANUNCONSCIOUS	(1<<2)
 #define CANPUSH			(1<<3)
 #define GODMODE			(1<<4)
+#define CANSTAGGER		(1<<5)
 
 //Health Defines
 #define HEALTH_THRESHOLD_CRIT 0
@@ -203,3 +251,5 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list(
 #define BULLET_ACT_BLOCK			"BLOCK"		//It's a blocked hit, whatever that means in the context of the thing it's hitting.
 #define BULLET_ACT_FORCE_PIERCE		"PIERCE"	//It pierces through the object regardless of the bullet being piercing by default.
 #define BULLET_ACT_TURF				"TURF"		//It hit us but it should hit something on the same turf too. Usually used for turfs.
+
+

code/__DEFINES/construction.dm

@@ -79,17 +79,19 @@
 #define CAT_BREAD	"Breads"
 #define CAT_BURGER	"Burgers"
 #define CAT_CAKE	"Cakes"
+#define CAT_DONUT	"Donuts"
 #define CAT_EGG	"Egg-Based Food"
 #define CAT_MEAT	"Meats"
+#define CAT_MEXICAN	"Mexican"
 #define CAT_MISCFOOD	"Misc. Food"
 #define CAT_PASTRY	"Pastries"
-#define CAT_PIE	"Pies"
+#define CAT_PIE	"Pies & Sweets"
 #define CAT_PIZZA	"Pizzas"
 #define CAT_SALAD	"Salads"
+#define CAT_SEAFOOD    "Seafood"
 #define CAT_SANDWICH	"Sandwiches"
 #define CAT_SOUP	"Soups"
 #define CAT_SPAGHETTI	"Spaghettis"
-#define CAT_FISH	"Fish"
 #define CAT_ICE	"Frozen"
 
 #define RCD_FLOORWALL 1

code/__DEFINES/dcs/flags.dm

@@ -0,0 +1,41 @@
+/// Return this from `/datum/component/Initialize` or `datum/component/OnTransfer` to have the component be deleted if it's applied to an incorrect type.
+/// `parent` must not be modified if this is to be returned.
+/// This will be noted in the runtime logs
+#define COMPONENT_INCOMPATIBLE 1
+/// Returned in PostTransfer to prevent transfer, similar to `COMPONENT_INCOMPATIBLE`
+#define COMPONENT_NOTRANSFER 2
+
+/// Return value to cancel attaching
+#define ELEMENT_INCOMPATIBLE 1
+
+// /datum/element flags
+/// Causes the detach proc to be called when the host object is being deleted
+#define ELEMENT_DETACH		(1 << 0)
+/**
+  * Only elements created with the same arguments given after `id_arg_index` share an element instance
+  * The arguments are the same when the text and number values are the same and all other values have the same ref
+  */
+#define ELEMENT_BESPOKE		(1 << 1)
+
+// How multiple components of the exact same type are handled in the same datum
+/// old component is deleted (default)
+#define COMPONENT_DUPE_HIGHLANDER		0
+/// duplicates allowed
+#define COMPONENT_DUPE_ALLOWED			1
+/// new component is deleted
+#define COMPONENT_DUPE_UNIQUE			2
+/// old component is given the initialization args of the new
+#define COMPONENT_DUPE_UNIQUE_PASSARGS	4
+/// each component of the same type is consulted as to whether the duplicate should be allowed
+#define COMPONENT_DUPE_SELECTIVE		5
+
+//Redirection component init flags
+#define REDIRECT_TRANSFER_WITH_TURF 1
+
+//Arch
+#define ARCH_PROB "probability"					//Probability for each item
+#define ARCH_MAXDROP "max_drop_amount"				//each item's max drop amount
+
+//Ouch my toes!
+#define CALTROP_BYPASS_SHOES 1
+#define CALTROP_IGNORE_WALKERS 2

code/__DEFINES/dcs/helpers.dm

@@ -0,0 +1,16 @@
+/// Used to trigger signals and call procs registered for that signal
+/// The datum hosting the signal is automaticaly added as the first argument
+/// Returns a bitfield gathered from all registered procs
+/// Arguments given here are packaged in a list and given to _SendSignal
+#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.comp_lookup || !target.comp_lookup[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) )
+
+#define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) )
+
+/// A wrapper for _AddElement that allows us to pretend we're using normal named arguments
+#define AddElement(arguments...) _AddElement(list(##arguments))
+
+/// A wrapper for _RemoveElement that allows us to pretend we're using normal named arguments
+#define RemoveElement(arguments...) _RemoveElement(list(##arguments))
+
+/// A wrapper for _AddComponent that allows us to pretend we're using normal named arguments
+#define AddComponent(arguments...) _AddComponent(list(##arguments))

code/__DEFINES/dcs/signals.dm

@@ -1,28 +1,3 @@
-#define SEND_SIGNAL(target, sigtype, arguments...) ( !target.comp_lookup || !target.comp_lookup[sigtype] ? NONE : target._SendSignal(sigtype, list(target, ##arguments)) )
-
-#define SEND_GLOBAL_SIGNAL(sigtype, arguments...) ( SEND_SIGNAL(SSdcs, sigtype, ##arguments) )
-
-#define COMPONENT_INCOMPATIBLE 1
-#define COMPONENT_NOTRANSFER 2
-
-#define ELEMENT_INCOMPATIBLE 1 // Return value to cancel attaching
-
-// /datum/element flags
-/// Causes the detach proc to be called when the host object is being deleted
-#define ELEMENT_DETACH		(1 << 0)
-/**
-  * Only elements created with the same arguments given after `id_arg_index` share an element instance
-  * The arguments are the same when the text and number values are the same and all other values have the same ref
-  */
-#define ELEMENT_BESPOKE		(1 << 1)
-
-// How multiple components of the exact same type are handled in the same datum
-
-#define COMPONENT_DUPE_HIGHLANDER		0		//old component is deleted (default)
-#define COMPONENT_DUPE_ALLOWED			1	//duplicates allowed
-#define COMPONENT_DUPE_UNIQUE			2	//new component is deleted
-#define COMPONENT_DUPE_UNIQUE_PASSARGS	4	//old component is given the initialization args of the new
-
 // All signals. Format:
 // When the signal is called: (signal arguments)
 // All signals send the source datum of the signal as the first argument
@@ -33,6 +8,10 @@
 #define COMSIG_GLOB_NEW_Z "!new_z"								//from base of datum/controller/subsystem/mapping/proc/add_new_zlevel(): (list/args)
 #define COMSIG_GLOB_VAR_EDIT "!var_edit"						//called after a successful var edit somewhere in the world: (list/args)
 #define COMSIG_GLOB_LIVING_SAY_SPECIAL "!say_special"			//global living say plug - use sparingly: (mob/speaker , message)
+
+// signals from globally accessible objects
+/// from SSsun when the sun changes position : (azimuth)
+#define COMSIG_SUN_MOVED "sun_moved"
 //////////////////////////////////////////////////////////////////
 
 // /datum signals
@@ -43,6 +22,10 @@
 #define COMSIG_PARENT_PREQDELETED "parent_preqdeleted"			//before a datum's Destroy() is called: (force), returning a nonzero value will cancel the qdel operation
 #define COMSIG_PARENT_QDELETING "parent_qdeleting"				//just before a datum's Destroy() is called: (force), at this point none of the other components chose to interrupt qdel and Destroy will be called
 
+/// Trait signals
+#define COMPONENT_ADD_TRAIT (1<<0)
+#define COMPONENT_REMOVE_TRAIT (1<<1)
+
 // /atom signals
 #define COMSIG_PARENT_ATTACKBY "atom_attackby"			        //from base of atom/attackby(): (/obj/item, /mob/living, params)
 	#define COMPONENT_NO_AFTERATTACK 1								//Return this in response if you don't want afterattack to be called
@@ -58,6 +41,7 @@
 	#define COMSIG_ATOM_NO_UPDATE_ICON_STATE 1
 	#define COMSIG_ATOM_NO_UPDATE_OVERLAYS		2
 #define COMSIG_ATOM_UPDATE_OVERLAYS "atom_update_overlays"		//from base of atom/update_overlays(): (list/new_overlays)
+#define COMSIG_ATOM_UPDATED_ICON "atom_updated_icon"			//from base of atom/update_icon(): (signalOut, did_anything)
 #define COMSIG_ATOM_ENTERED "atom_entered"                      //from base of atom/Entered(): (atom/movable/entering, /atom)
 #define COMSIG_ATOM_EXIT "atom_exit"							//from base of atom/Exit(): (/atom/movable/exiting, /atom/newloc)
 	#define COMPONENT_ATOM_BLOCK_EXIT 1
@@ -191,20 +175,36 @@
 	#define SPEECH_LANGUAGE 5
 //	#define SPEECH_IGNORE_SPAM 6
 //	#define SPEECH_FORCED 7
+#define COMSIG_MOB_ANTAG_ON_GAIN "mob_antag_on_gain"			//from base of /datum/antagonist/on_gain(): (antag_datum)
 
 // /mob/living signals
 #define COMSIG_LIVING_REGENERATE_LIMBS "living_regenerate_limbs"	//from base of /mob/living/regenerate_limbs(): (noheal, excluded_limbs)
 #define COMSIG_LIVING_RESIST "living_resist"					//from base of mob/living/resist() (/mob/living)
 #define COMSIG_LIVING_IGNITED "living_ignite"					//from base of mob/living/IgniteMob() (/mob/living)
 #define COMSIG_LIVING_EXTINGUISHED "living_extinguished"		//from base of mob/living/ExtinguishMob() (/mob/living)
-#define COMSIG_LIVING_ELECTROCUTE_ACT "living_electrocute_act"		//from base of mob/living/electrocute_act(): (shock_damage)
+#define COMSIG_LIVING_ELECTROCUTE_ACT "living_electrocute_act"		//from base of mob/living/electrocute_act(): (shock_damage, source, siemens_coeff, flags)
 #define COMSIG_LIVING_MINOR_SHOCK "living_minor_shock"			//sent by stuff like stunbatons and tasers: ()
 #define COMSIG_LIVING_REVIVE "living_revive"					//from base of mob/living/revive() (full_heal, admin_revive)
 #define COMSIG_MOB_CLIENT_LOGIN "comsig_mob_client_login"		//sent when a mob/login() finishes: (client)
+#define COMSIG_MOB_CLIENT_MOVE "comsig_mob_client_move"			//sent when client/Move() finishes with no early returns: (client, direction, n, oldloc)
 #define COMSIG_LIVING_GUN_PROCESS_FIRE "living_gun_process_fire"	//from base of /obj/item/gun/proc/process_fire(): (atom/target, params, zone_override)
+#define COMSIG_LIVING_COMBAT_ENABLED "combatmode_enabled"		//from base of mob/living/enable_combat_mode() (was_forced)
+#define COMSIG_LIVING_COMBAT_DISABLED "combatmode_disabled"		//from base of mob/living/disable_combat_mode() (was_forced)
+
+//ALL OF THESE DO NOT TAKE INTO ACCOUNT WHETHER AMOUNT IS 0 OR LOWER AND ARE SENT REGARDLESS!
+#define COMSIG_LIVING_STATUS_STUN "living_stun"					//from base of mob/living/Stun() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_KNOCKDOWN "living_knockdown"		//from base of mob/living/Knockdown() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_PARALYZE "living_paralyze"			//from base of mob/living/Paralyze() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_IMMOBILIZE "living_immobilize"		//from base of mob/living/Immobilize() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_UNCONSCIOUS "living_unconscious"	//from base of mob/living/Unconscious() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_SLEEP "living_sleeping"			//from base of mob/living/Sleeping() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_DAZE "living_daze"					//from base of mob/living/Daze() (amount, update, ignore)
+#define COMSIG_LIVING_STATUS_STAGGER "living_stagger"			//from base of mob/living/Stagger() (amount, update, ignore)
+	#define COMPONENT_NO_STUN 1			//For all of them
 
 // /mob/living/carbon signals
 #define COMSIG_CARBON_SOUNDBANG "carbon_soundbang"					//from base of mob/living/carbon/soundbang_act(): (list(intensity))
+#define COMSIG_CARBON_IDENTITY_TRANSFERRED_TO "carbon_id_transferred_to" //from datum/dna/transfer_identity(): (datum/dna, transfer_SE)
 
 // /mob/living/simple_animal/hostile signals
 #define COMSIG_HOSTILE_ATTACKINGTARGET "hostile_attackingtarget"
@@ -228,6 +228,7 @@
 #define COMSIG_ITEM_PRE_ATTACK "item_pre_attack"				//from base of obj/item/pre_attack(): (atom/target, mob/user, params)
 	#define COMPONENT_NO_ATTACK 1
 #define COMSIG_ITEM_AFTERATTACK "item_afterattack"				//from base of obj/item/afterattack(): (atom/target, mob/user, params)
+#define COMSIG_ITEM_ALT_AFTERATTACK "item_alt_afterattack"		//from base of obj/item/altafterattack(): (atom/target, mob/user, proximity, params)
 #define COMSIG_ITEM_EQUIPPED "item_equip"						//from base of obj/item/equipped(): (/mob/equipper, slot)
 #define COMSIG_ITEM_DROPPED "item_drop"							//from base of obj/item/dropped(): (mob/user)
 #define COMSIG_ITEM_PICKUP "item_pickup"						//from base of obj/item/pickup(): (/mob/taker)
@@ -269,6 +270,9 @@
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACK "human_melee_unarmed_attack"			//from mob/living/carbon/human/UnarmedAttack(): (atom/target)
 #define COMSIG_HUMAN_MELEE_UNARMED_ATTACKBY "human_melee_unarmed_attackby"		//from mob/living/carbon/human/UnarmedAttack(): (mob/living/carbon/human/attacker)
 #define COMSIG_HUMAN_DISARM_HIT	"human_disarm_hit"	//Hit by successful disarm attack (mob/living/carbon/human/attacker,zone_targeted)
+#define COMSIG_HUMAN_PREFS_COPIED_TO "human_prefs_copied_to"					//from datum/preferences/copy_to(): (datum/preferences, icon_updates, roundstart_checks)
+#define COMSIG_HUMAN_HARDSET_DNA "human_hardset_dna"							//from mob/living/carbon/human/hardset_dna(): (ui, list/mutation_index, newreal_name, newblood_type, datum/species, newfeatures)
+#define COMSIG_HUMAN_ON_RANDOMIZE "humman_on_randomize"							//from base of proc/randomize_human()
 
 // /datum/species signals
 #define COMSIG_SPECIES_GAIN "species_gain"						//from datum/species/on_species_gain(): (datum/species/new_species, datum/species/old_species)
@@ -335,19 +339,6 @@
 #define COMSIG_ACTION_TRIGGER "action_trigger"						//from base of datum/action/proc/Trigger(): (datum/action)
 	#define COMPONENT_ACTION_BLOCK_TRIGGER 1
 
-/*******Non-Signal Component Related Defines*******/
-
-//Redirection component init flags
-#define REDIRECT_TRANSFER_WITH_TURF 1
-
-//Arch
-#define ARCH_PROB "probability"					//Probability for each item
-#define ARCH_MAXDROP "max_drop_amount"				//each item's max drop amount
-
-//Ouch my toes!
-#define CALTROP_BYPASS_SHOES 1
-#define CALTROP_IGNORE_WALKERS 2
-
 //Xenobio hotkeys
 #define COMSIG_XENO_SLIME_CLICK_CTRL "xeno_slime_click_ctrl"				//from slime CtrlClickOn(): (/mob)
 #define COMSIG_XENO_SLIME_CLICK_ALT "xeno_slime_click_alt"					//from slime AltClickOn(): (/mob)

code/__DEFINES/dynamic.dm

@@ -6,6 +6,7 @@
 #define NO_ASSASSIN				(1<<0)
 #define WAROPS_ALWAYS_ALLOWED	(1<<1)
 #define USE_PREF_WEIGHTS		(1<<2)
+#define FORCE_IF_WON			(1<<3)
 
 #define ONLY_RULESET       (1<<0)
 #define HIGHLANDER_RULESET (1<<1)

code/__DEFINES/flags.dm

@@ -92,3 +92,30 @@ GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 204
 // radiation
 #define RAD_PROTECT_CONTENTS (1<<0)
 #define RAD_NO_CONTAMINATE (1<<1)
+
+//Mob mobility var flags
+/// any flag
+#define CHECK_MOBILITY(target, flags) CHECK_BITFIELD(target.mobility_flags, flags)
+#define CHECK_ALL_MOBILITY(target, flags) CHECK_MULTIPLE_BITFIELDS(target.mobility_flags, flags)
+
+/// can move
+#define MOBILITY_MOVE			(1<<0)
+/// can, and is, standing up.
+#define MOBILITY_STAND			(1<<1)
+/// can pickup items
+#define MOBILITY_PICKUP			(1<<2)
+/// can use items and interact with world objects like opening closets/etc
+#define MOBILITY_USE			(1<<3)
+/// can use interfaces like consoles
+#define MOBILITY_UI				(1<<4)
+/// can use storage item
+#define MOBILITY_STORAGE		(1<<5)
+/// can pull things
+#define MOBILITY_PULL			(1<<6)
+/// can hold non-nodropped items voluntarily
+#define MOBILITY_HOLD			(1<<7)
+/// Can resist out of buckling, grabs, cuffs, etc, in the usual order (buckle --> cuffs --> grab)
+#define MOBILITY_RESIST			(1<<8)
+
+#define MOBILITY_FLAGS_DEFAULT (MOBILITY_MOVE | MOBILITY_STAND | MOBILITY_PICKUP | MOBILITY_USE | MOBILITY_UI | MOBILITY_STORAGE | MOBILITY_PULL | MOBILITY_RESIST)
+#define MOBILITY_FLAGS_ANY_INTERACTION (MOBILITY_USE | MOBILITY_PICKUP | MOBILITY_UI | MOBILITY_STORAGE)

code/__DEFINES/jobs.dm

@@ -23,6 +23,7 @@
 #define DOCTOR			(1<<4)
 #define GENETICIST		(1<<5)
 #define VIROLOGIST		(1<<6)
+#define PARAMEDIC		(1<<7)
 
 
 #define CIVILIAN		(1<<2)
@@ -58,32 +59,33 @@
 #define JOB_DISPLAY_ORDER_ASSISTANT 1
 #define JOB_DISPLAY_ORDER_CAPTAIN 2
 #define JOB_DISPLAY_ORDER_HEAD_OF_PERSONNEL 3
-#define JOB_DISPLAY_ORDER_BARTENDER 4
-#define JOB_DISPLAY_ORDER_COOK 5
-#define JOB_DISPLAY_ORDER_BOTANIST 6
-#define JOB_DISPLAY_ORDER_JANITOR 7
-#define JOB_DISPLAY_ORDER_CLOWN 8
-#define JOB_DISPLAY_ORDER_MIME 9
-#define JOB_DISPLAY_ORDER_CURATOR 10
-#define JOB_DISPLAY_ORDER_LAWYER 11
-#define JOB_DISPLAY_ORDER_CHAPLAIN 12
-#define JOB_DISPLAY_ORDER_QUARTERMASTER 13
-#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 14
-#define JOB_DISPLAY_ORDER_SHAFT_MINER 15
-#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 16
-#define JOB_DISPLAY_ORDER_STATION_ENGINEER 17
-#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 18
-#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 19
-#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 20
-#define JOB_DISPLAY_ORDER_CHEMIST 21
-#define JOB_DISPLAY_ORDER_GENETICIST 22
-#define JOB_DISPLAY_ORDER_VIROLOGIST 23
-#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 24
-#define JOB_DISPLAY_ORDER_SCIENTIST 25
-#define JOB_DISPLAY_ORDER_ROBOTICIST 26
-#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 27
-#define JOB_DISPLAY_ORDER_WARDEN 28
-#define JOB_DISPLAY_ORDER_DETECTIVE 29
-#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 30
-#define JOB_DISPLAY_ORDER_AI 31
-#define JOB_DISPLAY_ORDER_CYBORG 32
+#define JOB_DISPLAY_ORDER_QUARTERMASTER 4
+#define JOB_DISPLAY_ORDER_CARGO_TECHNICIAN 5
+#define JOB_DISPLAY_ORDER_SHAFT_MINER 6
+#define JOB_DISPLAY_ORDER_BARTENDER 7
+#define JOB_DISPLAY_ORDER_COOK 8
+#define JOB_DISPLAY_ORDER_BOTANIST 9
+#define JOB_DISPLAY_ORDER_JANITOR 10
+#define JOB_DISPLAY_ORDER_CLOWN 11
+#define JOB_DISPLAY_ORDER_MIME 12
+#define JOB_DISPLAY_ORDER_CURATOR 13
+#define JOB_DISPLAY_ORDER_LAWYER 14
+#define JOB_DISPLAY_ORDER_CHAPLAIN 15
+#define JOB_DISPLAY_ORDER_AI 16
+#define JOB_DISPLAY_ORDER_CYBORG 17
+#define JOB_DISPLAY_ORDER_CHIEF_ENGINEER 18
+#define JOB_DISPLAY_ORDER_STATION_ENGINEER 19
+#define JOB_DISPLAY_ORDER_ATMOSPHERIC_TECHNICIAN 20
+#define JOB_DISPLAY_ORDER_CHIEF_MEDICAL_OFFICER 21
+#define JOB_DISPLAY_ORDER_MEDICAL_DOCTOR 22
+#define JOB_DISPLAY_ORDER_PARAMEDIC 23
+#define JOB_DISPLAY_ORDER_CHEMIST 24
+#define JOB_DISPLAY_ORDER_VIROLOGIST 25
+#define JOB_DISPLAY_ORDER_GENETICIST 26
+#define JOB_DISPLAY_ORDER_RESEARCH_DIRECTOR 27
+#define JOB_DISPLAY_ORDER_SCIENTIST 28
+#define JOB_DISPLAY_ORDER_ROBOTICIST 29
+#define JOB_DISPLAY_ORDER_HEAD_OF_SECURITY 30
+#define JOB_DISPLAY_ORDER_WARDEN 31
+#define JOB_DISPLAY_ORDER_DETECTIVE 32
+#define JOB_DISPLAY_ORDER_SECURITY_OFFICER 33

code/__DEFINES/logging.dm

@@ -41,7 +41,7 @@
 //Individual logging panel pages
 #define INDIVIDUAL_ATTACK_LOG		(LOG_ATTACK)
 #define INDIVIDUAL_SAY_LOG			(LOG_SAY | LOG_WHISPER | LOG_DSAY)
-#define INDIVIDUAL_EMOTE_LOG		(LOG_EMOTE)
+#define INDIVIDUAL_EMOTE_LOG		(LOG_EMOTE | LOG_SUBTLER)
 #define INDIVIDUAL_COMMS_LOG		(LOG_PDA | LOG_CHAT | LOG_COMMENT | LOG_TELECOMMS)
 #define INDIVIDUAL_OOC_LOG			(LOG_OOC | LOG_ADMIN)
 #define INDIVIDUAL_OWNERSHIP_LOG	(LOG_OWNERSHIP)

code/__DEFINES/materials.dm

@@ -4,11 +4,8 @@
 /// Hard materials, such as iron or metal
 #define MAT_CATEGORY_RIGID "rigid material"
 
-
-/// Gets the reference for the material type that was given
-#define getmaterialref(A) (SSmaterials.materials[A] || A)
-
 /// Flag for atoms, this flag ensures it isn't re-colored by materials. Useful for snowflake icons such as default toolboxes.
 #define MATERIAL_COLOR (1<<0)
 #define MATERIAL_ADD_PREFIX (1<<1)
 #define MATERIAL_NO_EFFECTS (1<<2)
+#define MATERIAL_AFFECT_STATISTICS (1<<3)

code/__DEFINES/maths.dm

@@ -30,7 +30,7 @@
 #define FLOOR(x, y) ( round((x) / (y)) * (y) )
 
 // Similar to clamp but the bottom rolls around to the top and vice versa. min is inclusive, max is exclusive
-#define WRAP(val, min, max) ( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) )
+#define WRAP(val, min, max) CLAMP(( min == max ? min : (val) - (round(((val) - (min))/((max) - (min))) * ((max) - (min))) ),min,max-1)
 
 // Real modulus that handles decimals
 #define MODULUS(x, y) ( (x) - (y) * round((x) / (y)) )
@@ -201,4 +201,9 @@
 #define RULE_OF_THREE(a, b, x) ((a*x)/b)
 // )
 
-#define MANHATTAN_DISTANCE(a, b) (abs(a.x - b.x) + abs(a.y - b.y))
+#define MANHATTAN_DISTANCE(a, b) (abs(a.x - b.x) + abs(a.y - b.y))
+
+#define LOGISTIC_FUNCTION(L,k,x,x_0) (L/(1+(NUM_E**(-k*(x-x_0)))))
+
+/// Make sure something is a boolean TRUE/FALSE 1/0 value, since things like bitfield & bitflag doesn't always give 1s and 0s.
+#define FORCE_BOOLEAN(x) ((x)? TRUE : FALSE)

code/__DEFINES/misc.dm

@@ -345,11 +345,10 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define COLOUR_PRIORITY_AMOUNT 4 //how many priority levels there are.
 
 //Endgame Results
-#define NUKE_NEAR_MISS 1
-#define NUKE_MISS_STATION 2
-#define NUKE_SYNDICATE_BASE 3
-#define STATION_DESTROYED_NUKE 4
-#define STATION_EVACUATED 5
+#define NUKE_MISS_STATION 1
+#define NUKE_SYNDICATE_BASE 2
+#define STATION_DESTROYED_NUKE 3
+#define STATION_EVACUATED 4
 #define BLOB_WIN 8
 #define BLOB_NUKE 9
 #define BLOB_DESTROYED 10
@@ -407,6 +406,7 @@ GLOBAL_LIST_INIT(pda_reskins, list(PDA_SKIN_CLASSIC = 'icons/obj/pda.dmi', PDA_S
 #define DUMMY_HUMAN_SLOT_ADMIN "admintools"
 #define DUMMY_HUMAN_SLOT_MANIFEST "dummy_manifest_generation"
 #define DUMMY_HUMAN_SLOT_HALLUCINATION "dummy_hallucination"
+#define DUMMY_HUMAN_SLOT_EXAMINER "dummy_examiner"
 
 #define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
 									//This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored

code/__DEFINES/mobs.dm

@@ -58,8 +58,10 @@
 #define BODYPART_DISABLED_DAMAGE 1
 #define BODYPART_DISABLED_PARALYSIS 2
 
+#define DEFAULT_BODYPART_ICON 'icons/mob/human_parts.dmi'
 #define DEFAULT_BODYPART_ICON_ORGANIC 'icons/mob/human_parts_greyscale.dmi'
 #define DEFAULT_BODYPART_ICON_ROBOTIC 'icons/mob/augmentation/augments.dmi'
+#define DEFAULT_BODYPART_ICON_CITADEL 'modular_citadel/icons/mob/mutant_bodyparts.dmi'
 
 #define MONKEY_BODYPART "monkey"
 #define ALIEN_BODYPART "alien"
@@ -208,6 +210,17 @@
 
 #define MAX_CHICKENS 50
 
+///Flags used by the flags parameter of electrocute act.
+
+///Makes it so that the shock doesn't take gloves into account.
+#define SHOCK_NOGLOVES (1 << 0)
+///Used when the shock is from a tesla bolt.
+#define SHOCK_TESLA (1 << 1)
+///Used when an illusion shocks something. Makes the shock deal stamina damage and not trigger certain secondary effects.
+#define SHOCK_ILLUSION (1 << 2)
+///The shock doesn't stun.
+#define SHOCK_NOSTUN (1 << 3)
+
 
 #define INCORPOREAL_MOVE_BASIC 1
 #define INCORPOREAL_MOVE_SHADOW 2 // leaves a trail of shadows
@@ -276,4 +289,5 @@
 #define HUMAN_FIRE_STACK_ICON_NUM	3
 
 #define PULL_PRONE_SLOWDOWN 0.6
-#define HUMAN_CARRY_SLOWDOWN 0
+#define FIREMAN_CARRY_SLOWDOWN 0
+#define PIGGYBACK_CARRY_SLOWDOWN 1

code/__DEFINES/movespeed_modification.dm

@@ -17,6 +17,9 @@
 //ids
 
 #define MOVESPEED_ID_MOB_WALK_RUN_CONFIG_SPEED			"MOB_WALK_RUN"
+#define MOVESPEED_ID_MOB_GRAB_STATE						"MOB_GRAB_STATE"
+#define MOVESPEED_ID_MOB_EQUIPMENT						"MOB_EQUIPMENT"
+#define MOVESPEED_ID_MOB_GRAVITY						"MOB_GRAVITY"
 #define MOVESPEED_ID_CONFIG_SPEEDMOD					"MOB_CONFIG_MODIFIER"
 
 #define MOVESPEED_ID_SLIME_REAGENTMOD					"SLIME_REAGENT_MODIFIER"
@@ -28,6 +31,7 @@
 #define MOVESPEED_ID_TARANTULA_WEB						"TARANTULA_WEB"
 
 #define MOVESPEED_ID_LIVING_TURF_SPEEDMOD				"LIVING_TURF_SPEEDMOD"
+#define MOVESPEED_ID_LIVING_LIMBLESS					"LIVING_LIMBLESS"
 
 #define MOVESPEED_ID_CARBON_SOFTCRIT					"CARBON_SOFTCRIT"
 #define MOVESPEED_ID_CARBON_OLDSPEED					"CARBON_DEPRECATED_SPEED"
@@ -59,13 +63,19 @@
 #define MOVESPEED_ID_HUMAN_CARRYING                     "HUMAN_CARRY"
 #define MOVESPEED_ID_SHRINK_RAY							"SHRUNKEN_SPEED_MODIFIER"
 
-#define MOVESPEED_ID_TASED_STATUS						"TASED"
-
 #define MOVESPEED_ID_SLAUGHTER                          "SLAUGHTER"
 
 #define MOVESPEED_ID_CYBER_THRUSTER						"CYBER_IMPLANT_THRUSTER"
 #define MOVESPEED_ID_JETPACK							"JETPACK"
 
-#define MOVESPEED_ID_SHOVE 								"SHOVE"
+#define MOVESPEED_ID_MKULTRA							"MKULTRA"
 
-#define MOVESPEED_ID_MKULTRA							"MKULTRA"
+#define MOVESPEED_ID_TASED_STATUS						"TASED"
+#define MOVESPEED_ID_ELECTROSTAFF						"ELECTROSTAFF"
+
+#define MOVESPEED_ID_SHOVE 								"SHOVE"
+#define MOVESPEED_ID_FAT                                "FAT"
+#define MOVESPEED_ID_COLD                               "COLD"
+#define MOVESPEED_ID_HUNGRY                             "HUNGRY"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN                    "DAMAGE"
+#define MOVESPEED_ID_DAMAGE_SLOWDOWN_FLYING				"FLYING"

code/__DEFINES/power.dm

@@ -0,0 +1,3 @@
+#define SOLAR_TRACK_OFF 0
+#define SOLAR_TRACK_TIMED 1
+#define SOLAR_TRACK_AUTO 2

code/__DEFINES/radiation.dm

@@ -23,6 +23,10 @@ Ask ninjanomnom if they're around
 
 #define RAD_MOB_MUTATE 1250							// How much stored radiation to check for mutation
 
+#define RAD_MONKEY_GORILLIZE 1650					// How much stored radiation to check for Harambe time.
+#define RAD_MOB_GORILLIZE_FACTOR 100
+#define RAD_MONKEY_GORILLIZE_EXPONENT 0.5
+
 #define RAD_MOB_VOMIT 2000							// The amount of radiation to check for vomitting
 #define RAD_MOB_VOMIT_PROB 1						// Chance per tick of vomitting
 

code/__DEFINES/say.dm

@@ -81,7 +81,8 @@
 
 //Don't set this very much higher then 1024 unless you like inviting people in to dos your server with message spam
 #define MAX_MESSAGE_LEN			2048		//Citadel edit: What's the WORST that could happen?
-#define MAX_FAVOR_LEN			4096		//double the maximum message length.
+#define MAX_FLAVOR_LEN			4096		//double the maximum message length.
+#define MAX_TASTE_LEN			40 //lick... vore... ew...
 #define MAX_NAME_LEN			42
 #define MAX_BROADCAST_LEN		512
 #define MAX_CHARTER_LEN			80

code/__DEFINES/status_effects.dm

@@ -37,15 +37,25 @@
 /////////////
 // DEBUFFS //
 /////////////
+/// The affected is unable to move, or to use, hold, or pickup items.
+#define STATUS_EFFECT_STUN /datum/status_effect/incapacitating/stun
 
-#define STATUS_EFFECT_STUN /datum/status_effect/incapacitating/stun //the affected is stunned
+#define STATUS_EFFECT_KNOCKDOWN /datum/status_effect/incapacitating/knockdown //the affected is unable to stand up
 
-#define STATUS_EFFECT_KNOCKDOWN /datum/status_effect/incapacitating/knockdown //the affected is knocked down
+#define STATUS_EFFECT_IMMOBILIZED /datum/status_effect/incapacitating/immobilized //the affected is unable to move
+
+#define STATUS_EFFECT_PARALYZED /datum/status_effect/incapacitating/paralyzed //the affected is unable to move, use items, or stand up.
+
+/// The affected is unable to use or pickup items
+#define STATUS_EFFECT_DAZED /datum/status_effect/incapacitating/dazed
 
 #define STATUS_EFFECT_UNCONSCIOUS /datum/status_effect/incapacitating/unconscious //the affected is unconscious
 
 #define STATUS_EFFECT_SLEEPING /datum/status_effect/incapacitating/sleeping //the affected is asleep
 
+/// Blocks sprint
+#define STATUS_EFFECT_STAGGERED /datum/status_effect/staggered
+
 #define STATUS_EFFECT_TASED_WEAK /datum/status_effect/electrode				//not as crippling, just slows down
 
 #define STATUS_EFFECT_TASED /datum/status_effect/electrode/no_combat_mode //the affected has been tased, preventing fine muscle control
@@ -90,6 +100,9 @@
 
 #define STATUS_EFFECT_NO_COMBAT_MODE /datum/status_effect/no_combat_mode //Wont allow combat mode and will disable it
 #define STATUS_EFFECT_MESMERIZE /datum/status_effect/no_combat_mode/mesmerize //Just reskinned no_combat_mode
+
+#define STATUS_EFFECT_ELECTROSTAFF /datum/status_effect/electrostaff		//slows down victim
+
 /////////////
 // NEUTRAL //
 /////////////
@@ -108,3 +121,4 @@
 
 #define STATUS_EFFECT_RAINBOWPROTECTION /datum/status_effect/rainbow_protection //Invulnerable and pacifistic
 #define STATUS_EFFECT_SLIMESKIN /datum/status_effect/slimeskin //Increased armor
+#define STATUS_EFFECT_DNA_MELT /datum/status_effect/dna_melt //usually does something horrible to you when you hit 100 genetic instability

code/__DEFINES/subsystems.dm

@@ -56,7 +56,6 @@
 #define INIT_ORDER_SERVER_MAINT		93
 #define INIT_ORDER_INPUT			85
 #define INIT_ORDER_VIS				80
-#define INIT_ORDER_MATERIALS		76
 #define INIT_ORDER_RESEARCH			75
 #define INIT_ORDER_EVENTS			70
 #define INIT_ORDER_JOBS				65

code/__DEFINES/traits.dm

@@ -1,3 +1,5 @@
+#define SIGNAL_TRAIT(trait_ref) "trait [trait_ref]"
+
 // trait accessor defines
 #define ADD_TRAIT(target, trait, source) \
 	do { \
@@ -6,12 +8,14 @@
 			target.status_traits = list(); \
 			_L = target.status_traits; \
 			_L[trait] = list(source); \
+			SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_ADD_TRAIT); \
 		} else { \
 			_L = target.status_traits; \
 			if (_L[trait]) { \
 				_L[trait] |= list(source); \
 			} else { \
 				_L[trait] = list(source); \
+				SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_ADD_TRAIT); \
 			} \
 		} \
 	} while (0)
@@ -31,7 +35,8 @@
 				} \
 			};\
 			if (!length(_L[trait])) { \
-				_L -= trait \
+				_L -= trait; \
+				SEND_SIGNAL(target, SIGNAL_TRAIT(trait), COMPONENT_REMOVE_TRAIT); \
 			}; \
 			if (!length(_L)) { \
 				target.status_traits = null \
@@ -46,7 +51,8 @@
 			for (var/_T in _L) { \
 				_L[_T] &= _S;\
 				if (!length(_L[_T])) { \
-					_L -= _T } \
+					_L -= _T ; \
+					SEND_SIGNAL(target, SIGNAL_TRAIT(_T), COMPONENT_REMOVE_TRAIT); } \
 				};\
 				if (!length(_L)) { \
 					target.status_traits = null\
@@ -77,6 +83,7 @@
 #define TRAIT_DISFIGURED		"disfigured"
 #define TRAIT_XENO_HOST			"xeno_host"	//Tracks whether we're gonna be a baby alien's mummy.
 #define TRAIT_STUNIMMUNE		"stun_immunity"
+#define TRAIT_TASED_RESISTANCE	"tased_resistance" //prevents you from suffering most of the effects of being tased
 #define TRAIT_SLEEPIMMUNE		"sleep_immunity"
 #define TRAIT_PUSHIMMUNE		"push_immunity"
 #define TRAIT_SHOCKIMMUNE		"shock_immunity"
@@ -124,6 +131,8 @@
 #define TRAIT_UNINTELLIGIBLE_SPEECH "unintelligible-speech"
 #define TRAIT_SOOTHED_THROAT    "soothed-throat"
 #define TRAIT_LAW_ENFORCEMENT_METABOLISM "law-enforcement-metabolism"
+#define TRAIT_QUICK_CARRY		"quick-carry"
+#define TRAIT_QUICKER_CARRY		"quicker-carry"
 #define TRAIT_STRONG_GRABBER	"strong_grabber"
 #define TRAIT_CALCIUM_HEALER	"calcium_healer"
 #define TRAIT_MAGIC_CHOKE		"magic_choke"
@@ -137,8 +146,31 @@
 #define TRAIT_NOMARROW			"nomarrow"		// You don't make blood, with chemicals or nanites.
 #define TRAIT_NOPULSE			"nopulse"		// Your heart doesn't beat.
 #define TRAIT_EXEMPT_HEALTH_EVENTS	"exempt-health-events"
+#define TRAIT_NO_MIDROUND_ANTAG	"no-midround-antag" //can't be turned into an antag by random events
+
+// mobility flag traits
+// IN THE FUTURE, IT WOULD BE NICE TO DO SOMETHING SIMILAR TO https://github.com/tgstation/tgstation/pull/48923/files (ofcourse not nearly the same because I have my.. thoughts on it)
+// BUT FOR NOW, THESE ARE HOOKED TO DO update_mobility() VIA COMSIG IN living_mobility.dm
+// SO IF YOU ADD MORE, BESURE TO UPDATE IT THERE.
+
+/// Disallow movement
+#define TRAIT_MOBILITY_NOMOVE		"mobility_nomove"
+/// Disallow pickup
+#define TRAIT_MOBILITY_NOPICKUP		"mobility_nopickup"
+/// Disallow item use
+#define TRAIT_MOBILITY_NOUSE		"mobility_nouse"
+
 #define TRAIT_SWIMMING			"swimming"			//only applied by /datum/element/swimming, for checking
 
+/**
+  * COMBAT MODE/SPRINT MODE TRAITS
+  */
+
+/// Prevents combat mode from being active.
+#define TRAIT_COMBAT_MODE_LOCKED		"combatmode_locked"
+/// Prevents sprinting from being active.
+#define TRAIT_SPRINT_LOCKED				"sprint_locked"
+
  //non-mob traits
 #define TRAIT_PARALYSIS			"paralysis" //Used for limb-based paralysis, where replacing the limb will fix it
 
@@ -175,6 +207,8 @@
 #define TRAIT_AUTO_CATCH_ITEM	"auto_catch_item"
 #define TRAIT_CLOWN_MENTALITY	"clown_mentality" // The future is now, clownman.
 #define TRAIT_FREESPRINT		"free_sprinting"
+#define TRAIT_XRAY_VISION       "xray_vision"
+#define TRAIT_THERMAL_VISION    "thermal_vision"
 #define TRAIT_NO_TELEPORT		"no-teleport" //you just can't
 #define TRAIT_NO_INTERNALS		"no-internals"
 #define TRAIT_NO_ALCOHOL		"alcohol_intolerance"
@@ -200,10 +234,14 @@
 #define ROUNDSTART_TRAIT "roundstart" //cannot be removed without admin intervention
 #define GHOSTROLE_TRAIT "ghostrole"
 #define APHRO_TRAIT "aphro"
+#define BLOODSUCKER_TRAIT "bloodsucker"
+#define CLOTHING_TRAIT "clothing" //used for quirky carrygloves
+#define SHOES_TRAIT "shoes" //inherited from your sweet kicks
 
 // unique trait sources, still defines
 #define STATUE_MUTE "statue"
 #define CLONING_POD_TRAIT "cloning-pod"
+#define VIRTUAL_REALITY_TRAIT "vr_trait"
 #define CHANGELING_DRAIN "drain"
 #define CHANGELING_HIVEMIND_MUTE "ling_mute"
 #define ABYSSAL_GAZE_BLIND "abyssal_gaze"

code/__DEFINES/vote.dm

@@ -5,6 +5,11 @@
 #define MAJORITY_JUDGEMENT_VOTING 4
 #define INSTANT_RUNOFF_VOTING 5
 
+#define SHOW_RESULTS (1<<0)
+#define SHOW_VOTES (1<<1)
+#define SHOW_WINNER (1<<2)
+#define SHOW_ABSTENTION (1<<3)
+
 GLOBAL_LIST_INIT(vote_score_options,list("Bad","Poor","Acceptable","Good","Great"))
 
 GLOBAL_LIST_INIT(vote_type_names,list(\
@@ -15,3 +20,10 @@ GLOBAL_LIST_INIT(vote_type_names,list(\
 "Raw Score (returns results from 0 to 1, winner is 1)" = SCORE_VOTING,\
 "Majority Judgement (single-winner score voting)" = MAJORITY_JUDGEMENT_VOTING,\
 ))
+
+GLOBAL_LIST_INIT(display_vote_settings, list(\
+"Results" = SHOW_RESULTS,
+"Ongoing Votes" = SHOW_VOTES,
+"Winner" =  SHOW_WINNER,
+"Abstainers" = SHOW_ABSTENTION
+))

code/__HELPERS/_cit_helpers.dm

@@ -58,15 +58,13 @@ GLOBAL_LIST_EMPTY(ipc_antennas_list)
 	//Genitals and Arousal Lists
 GLOBAL_LIST_EMPTY(genitals_list)
 GLOBAL_LIST_EMPTY(cock_shapes_list)
-GLOBAL_LIST_EMPTY(gentlemans_organ_names)
 GLOBAL_LIST_EMPTY(balls_shapes_list)
-GLOBAL_LIST_EMPTY(breasts_size_list)
 GLOBAL_LIST_EMPTY(breasts_shapes_list)
 GLOBAL_LIST_EMPTY(vagina_shapes_list)
-GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc
-GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft"))
-GLOBAL_LIST_INIT(cum_id_list,"semen")
-GLOBAL_LIST_INIT(milk_id_list,"milk")
+//longcat memes.
+GLOBAL_LIST_INIT(dick_nouns, list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ", "cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret", "One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett", "Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior"))
+
+GLOBAL_LIST_INIT(genitals_visibility_toggles, list(GEN_VISIBLE_ALWAYS, GEN_VISIBLE_NO_CLOTHES, GEN_VISIBLE_NO_UNDIES, GEN_VISIBLE_NEVER))
 
 GLOBAL_LIST_INIT(dildo_shapes, list(
 		"Human"		= "human",
@@ -107,38 +105,6 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		if(!src.holder)	return
 		message_admins("[key_name_admin(usr)] manually reloaded mentors")
 
-//Flavor Text
-/mob/proc/set_flavor()
-	set name = "Set Flavor Text"
-	set desc = "Sets an extended description of your character's features."
-	set category = "IC"
-
-	var/new_flavor = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", flavor_text, MAX_FAVOR_LEN, TRUE)
-	if(!isnull(new_flavor))
-		flavor_text = new_flavor
-		to_chat(src, "Your flavor text has been updated.")
-
-//Flavor Text
-/mob/proc/set_flavor_2()
-	set name = "Set Temporary Flavor Text"
-	set desc = "Sets a description of your character's current appearance. Use this for emotions, poses etc."
-	set category = "IC"
-
-	var/new_flavor = stripped_multiline_input(usr, "Set the temporary flavor text in your 'examine' verb. This should be used only for things pertaining to the current round!", "Short-Term Flavor Text", flavor_text_2, MAX_FAVOR_LEN, TRUE)
-	if(!isnull(new_flavor))
-		flavor_text_2 = new_flavor
-		to_chat(src, "Your temporary flavor text has been updated.")
-
-/mob/proc/print_flavor_text(flavor,temp = FALSE)
-	if(!flavor)
-		return
-	// We are decoding and then encoding to not only get correct amount of characters, but also to prevent partial escaping characters being shown.
-	var/msg = html_decode(replacetext(flavor, "\n", " "))
-	if(length_char(msg) <= 40)
-		return "<span class='notice'>[html_encode(msg)]</span>"
-	else
-		return "<span class='notice'>[html_encode(copytext_char(msg, 1, 37))]... <a href='?src=[REF(src)];flavor[temp ? "2" : ""]_more=1'>More...</span></a>"
-
 //LOOC toggles
 /client/verb/listen_looc()
 	set name = "Show/Hide LOOC"
@@ -171,18 +137,6 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 		return TRUE
 	return FALSE
 
-/mob/living/carbon/proc/has_ovipositor()
-	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_PENIS)
-	if(G && istype(G, /obj/item/organ/genital/ovipositor))
-		return TRUE
-	return FALSE
-
-/mob/living/carbon/human/proc/has_eggsack()
-	var/obj/item/organ/genital/G = getorganslot(ORGAN_SLOT_TESTICLES)
-	if(G && istype(G, /obj/item/organ/genital/eggsack))
-		return TRUE
-	return FALSE
-
 /mob/living/carbon/proc/is_groin_exposed(list/L)
 	if(!L)
 		L = get_equipped_items()

code/__HELPERS/_lists.dm

@@ -174,6 +174,15 @@
 						L[T] = TRUE
 		return L
 
+/proc/typecacheof_assoc_list(list/pathlist, ignore_root_path = FALSE)
+	. = list()
+	if(!istype(pathlist))
+		return
+	for(var/P in pathlist)
+		var/value = pathlist[P]
+		for(var/T in (ignore_root_path ? subtypesof(P) : typesof(P)))
+			.[T] = value
+
 //Empties the list by setting the length to 0. Hopefully the elements get garbage collected
 /proc/clearlist(list/list)
 	if(istype(list))
@@ -579,4 +588,4 @@
 	var/list/ret = list()
 	for(var/key in input)
 		ret += key
-	return ret
+	return ret

code/__HELPERS/areas.dm

@@ -1,5 +1,10 @@
 #define BP_MAX_ROOM_SIZE 300
 
+GLOBAL_LIST_INIT(typecache_powerfailure_safe_areas, typecacheof(/area/engine/engineering, \
+															    /area/engine/supermatter, \
+															    /area/engine/atmospherics_engine, \
+															    /area/ai_monitored/turret_protected/ai))
+
 //Repopulates sortedAreas list
 /proc/repopulate_sorted_areas()
 	GLOB.sortedAreas = list()

code/__HELPERS/dna.dm

@@ -0,0 +1,12 @@
+//////////////////////////////////////////////////////////
+//A bunch of helpers to make genetics less of a headache//
+//////////////////////////////////////////////////////////
+
+#define GET_INITIALIZED_MUTATION(A) GLOB.all_mutations[A]
+#define GET_GENE_STRING(A, B) (B.mutation_index[A])
+#define GET_SEQUENCE(A) (GLOB.full_sequences[A])
+
+#define GET_MUTATION_STABILIZER(A) ((A.stabilizer_coeff < 0) ? 1 : A.stabilizer_coeff)
+#define GET_MUTATION_SYNCHRONIZER(A) ((A.synchronizer_coeff < 0) ? 1 : A.synchronizer_coeff)
+#define GET_MUTATION_POWER(A) ((A.power_coeff < 0) ? 1 : A.power_coeff)
+#define GET_MUTATION_ENERGY(A) ((A.energy_coeff < 0) ? 1 : A.energy_coeff)

code/__HELPERS/game.dm

@@ -425,7 +425,7 @@
 			candidates -= M
 
 /proc/pollGhostCandidates(Question, jobbanType, datum/game_mode/gametypeCheck, be_special_flag = 0, poll_time = 300, ignore_category = null, flashwindow = TRUE)
-	var/datum/element/ghost_role_eligibility/eligibility = SSdcs.GetElement(/datum/element/ghost_role_eligibility)
+	var/datum/element/ghost_role_eligibility/eligibility = SSdcs.GetElement(list(/datum/element/ghost_role_eligibility))
 	var/list/candidates = eligibility.get_all_ghost_role_eligible()
 	return pollCandidates(Question, jobbanType, gametypeCheck, be_special_flag, poll_time, ignore_category, flashwindow, candidates)
 
@@ -549,3 +549,36 @@
 	var/pressure = environment.return_pressure()
 	if(pressure <= LAVALAND_EQUIPMENT_EFFECT_PRESSURE)
 		. = TRUE
+
+/proc/ispipewire(item)
+	var/static/list/pipe_wire = list(
+		/obj/machinery/atmospherics,
+		/obj/structure/disposalpipe,
+		/obj/structure/cable
+	)
+	return (is_type_in_list(item, pipe_wire))
+
+// Find a obstruction free turf that's within the range of the center. Can also condition on if it is of a certain area type.
+/proc/find_obstruction_free_location(var/range, var/atom/center, var/area/specific_area)
+	var/list/turfs = RANGE_TURFS(range, center)
+	var/list/possible_loc = list()
+	for(var/turf/found_turf in turfs)
+		var/area/turf_area = get_area(found_turf)
+		if(specific_area)	// We check if both the turf is a floor, and that it's actually in the area. // We also want a location that's clear of any obstructions.
+			if(!istype(turf_area, specific_area))
+				continue
+		if(!isspaceturf(found_turf))
+			if(!is_blocked_turf(found_turf))
+				possible_loc.Add(found_turf)
+	if(possible_loc.len < 1)	// Need at least one free location.
+		return FALSE
+	return pick(possible_loc)
+
+/proc/power_fail(duration_min, duration_max)
+	for(var/P in GLOB.apcs_list)
+		var/obj/machinery/power/apc/C = P
+		if(C.cell && SSmapping.level_trait(C.z, ZTRAIT_STATION))
+			var/area/A = C.area
+			if(GLOB.typecache_powerfailure_safe_areas[A.type])
+				continue
+			C.energy_fail(rand(duration_min,duration_max))

code/__HELPERS/global_lists.dm

@@ -54,12 +54,6 @@
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/vagina, GLOB.vagina_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/breasts, GLOB.breasts_shapes_list)
 	init_sprite_accessory_subtypes(/datum/sprite_accessory/testicles, GLOB.balls_shapes_list)
-	GLOB.breasts_size_list = list ("a", "b", "c", "d", "e") //We need the list to choose from initialized, but it's no longer a sprite_accessory thing.
-	GLOB.gentlemans_organ_names = list("phallus", "willy", "dick", "prick", "member", "tool", "gentleman's organ",
-	"cock", "wang", "knob", "dong", "joystick", "pecker", "johnson", "weenie", "tadger", "schlong", "thirsty ferret",
-	"baloney pony", "schlanger", "Mutton dagger", "old blind bob","Hanging Johnny", "fishing rod", "Tally whacker", "polly rocket",
-	"One eyed trouser trout", "Ding dong", "ankle spanker", "Pork sword", "engine cranker", "Harry hot dog", "Davy Crockett",
-	"Kidney cracker", "Heat seeking moisture missile", "Giggle stick", "love whistle", "Tube steak", "Uncle Dick", "Purple helmet warrior")
 
 	for(var/gpath in subtypesof(/obj/item/organ/genital))
 		var/obj/item/organ/genital/G = gpath

code/__HELPERS/mobs.dm

@@ -47,7 +47,7 @@
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/underwear/socks, GLOB.socks_list)
 	return pick(GLOB.socks_list)
 
-/proc/random_features()
+/proc/random_features(intendedspecies)
 	if(!GLOB.tails_list_human.len)
 		init_sprite_accessory_subtypes(/datum/sprite_accessory/tails/human, GLOB.tails_list_human)
 	if(!GLOB.tails_list_lizard.len)
@@ -105,6 +105,8 @@
 		var/datum/sprite_accessory/mam_tails/instance = GLOB.mam_tails_list[mtpath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_mam_tails_list[S.name] = mtpath
 	var/list/snowflake_markings_list = list()
@@ -112,6 +114,8 @@
 		var/datum/sprite_accessory/mam_body_markings/instance = GLOB.mam_body_markings_list[mmpath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_markings_list[S.name] = mmpath
 	var/list/snowflake_ears_list = list()
@@ -119,6 +123,8 @@
 		var/datum/sprite_accessory/mam_ears/instance = GLOB.mam_ears_list[mepath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_ears_list[S.name] = mepath
 	var/list/snowflake_mam_snouts_list = list()
@@ -126,8 +132,19 @@
 		var/datum/sprite_accessory/mam_snouts/instance = GLOB.mam_snouts_list[mspath]
 		if(istype(instance, /datum/sprite_accessory))
 			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
 			if(!S.ckeys_allowed)
 				snowflake_mam_snouts_list[S.name] = mspath
+	var/list/snowflake_ipc_antenna_list = list()
+	for(var/mspath in GLOB.ipc_antennas_list)
+		var/datum/sprite_accessory/mam_snouts/instance = GLOB.ipc_antennas_list[mspath]
+		if(istype(instance, /datum/sprite_accessory))
+			var/datum/sprite_accessory/S = instance
+			if(intendedspecies && S.recommended_species && !S.recommended_species.Find(intendedspecies))
+				continue
+			if(!S.ckeys_allowed)
+				snowflake_ipc_antenna_list[S.name] = mspath
 	var/color1 = random_short_color()
 	var/color2 = random_short_color()
 	var/color3 = random_short_color()
@@ -153,10 +170,10 @@
 		"insect_fluff"		= "None",
 		"insect_markings"     = pick(GLOB.insect_markings_list),
 		"taur"				= "None",
-		"mam_body_markings" = pick(snowflake_markings_list),
-		"mam_ears" 			= pick(snowflake_ears_list),
-		"mam_snouts"		= pick(snowflake_mam_snouts_list),
-		"mam_tail"			= pick(snowflake_mam_tails_list),
+		"mam_body_markings" = snowflake_markings_list.len ? pick(snowflake_markings_list) : "None",
+		"mam_ears" 			= snowflake_ears_list ? pick(snowflake_ears_list) : "None",
+		"mam_snouts"		= snowflake_mam_snouts_list ? pick(snowflake_mam_snouts_list) : "None",
+		"mam_tail"			= snowflake_mam_tails_list ? pick(snowflake_mam_tails_list) : "None",
 		"mam_tail_animated" = "None",
 		"xenodorsal" 		= "Standard",
 		"xenohead" 			= "Standard",
@@ -164,50 +181,34 @@
 		"genitals_use_skintone"	= FALSE,
 		"has_cock"			= FALSE,
 		"cock_shape"		= pick(GLOB.cock_shapes_list),
-		"cock_length"		= 6,
-		"cock_girth_ratio"	= COCK_GIRTH_RATIO_DEF,
+		"cock_length"		= COCK_SIZE_DEF,
+		"cock_diameter_ratio"	= COCK_DIAMETER_RATIO_DEF,
 		"cock_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"has_sheath"		= FALSE,
-		"sheath_color"		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
 		"has_balls" 		= FALSE,
-		"balls_internal" 	= FALSE,
 		"balls_color" 		= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"balls_amount"		= 2,
-		"balls_sack_size"	= BALLS_SACK_SIZE_DEF,
 		"balls_size"		= BALLS_SIZE_DEF,
-		"balls_shape"		= "Single",
+		"balls_shape"		= DEF_BALLS_SHAPE,
 		"balls_cum_rate"	= CUM_RATE,
 		"balls_cum_mult"	= CUM_RATE_MULT,
 		"balls_efficiency"	= CUM_EFFICIENCY,
-		"has_ovi"			= FALSE,
-		"ovi_shape"			= "knotted",
-		"ovi_length"		= 6,
-		"ovi_color"			= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"has_eggsack" 		= FALSE,
-		"eggsack_internal" 	= TRUE,
-		"eggsack_color" 	= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"eggsack_size" 		= BALLS_SACK_SIZE_DEF,
-		"eggsack_egg_color" = pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"eggsack_egg_size" 	= EGG_GIRTH_DEF,
 		"has_breasts" 		= FALSE,
 		"breasts_color" 	= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"breasts_size" 		= pick(GLOB.breasts_size_list),
-		"breasts_shape"		= "Pair",
+		"breasts_size" 		= pick(CONFIG_GET(keyed_list/breasts_cups_prefs)),
+		"breasts_shape"		= DEF_BREASTS_SHAPE,
 		"breasts_producing" = FALSE,
 		"has_vag"			= FALSE,
 		"vag_shape"			= pick(GLOB.vagina_shapes_list),
 		"vag_color"			= pick("FFFFFF","7F7F7F", "7FFF7F", "7F7FFF", "FF7F7F", "7FFFFF", "FF7FFF", "FFFF7F"),
-		"vag_clits"			= 1,
-		"vag_clit_diam"		= 0.25,
-		"vag_clit_len"		= 0.25,
 		"has_womb"			= FALSE,
-		"womb_cum_rate"		= CUM_RATE,
-		"womb_cum_mult"		= CUM_RATE_MULT,
-		"womb_efficiency"	= CUM_EFFICIENCY,
-		"ipc_screen"		= "Sunburst",
+		"balls_visibility"	= GEN_VISIBLE_NO_UNDIES,
+		"breasts_visibility"= GEN_VISIBLE_NO_UNDIES,
+		"cock_visibility"	= GEN_VISIBLE_NO_UNDIES,
+		"vag_visibility"	= GEN_VISIBLE_NO_UNDIES,
+		"ipc_screen"		= snowflake_ipc_antenna_list ? pick(snowflake_ipc_antenna_list) : "None",
 		"ipc_antenna"		= "None",
 		"flavor_text"		= "",
-		"meat_type"			= "Mammalian"
+		"meat_type"			= "Mammalian",
+		"body_model"		= MALE
 		))
 
 /proc/random_hair_style(gender)
@@ -356,7 +357,7 @@ GLOBAL_LIST_EMPTY(species_list)
 		checked_health["health"] = health
 	return ..()
 
-/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null)
+/proc/do_after(mob/user, var/delay, needhand = 1, atom/target = null, progress = 1, datum/callback/extra_checks = null, required_mobility_flags = (MOBILITY_USE|MOBILITY_MOVE))
 	if(!user)
 		return 0
 	var/atom/Tloc = null
@@ -384,6 +385,7 @@ GLOBAL_LIST_EMPTY(species_list)
 	var/endtime = world.time + delay
 	var/starttime = world.time
 	. = 1
+	var/mob/living/L = isliving(user) && user			//evals to last thing eval'd
 	while (world.time < endtime)
 		stoplag(1)
 		if (progress)
@@ -393,15 +395,13 @@ GLOBAL_LIST_EMPTY(species_list)
 			drifting = 0
 			Uloc = user.loc
 
-		if(QDELETED(user) || user.stat || user.IsKnockdown() || user.IsStun() || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
+		if(L && !CHECK_ALL_MOBILITY(L, required_mobility_flags))
 			. = 0
 			break
 
-		if(isliving(user))
-			var/mob/living/L = user
-			if(L.recoveringstam)
-				. = 0
-				break
+		if(QDELETED(user) || user.stat || (!drifting && user.loc != Uloc) || (extra_checks && !extra_checks.Invoke()))
+			. = 0
+			break
 
 		if(!QDELETED(Tloc) && (QDELETED(target) || Tloc != target.loc))
 			if((Uloc != Tloc || Tloc != user) && !drifting)

code/__HELPERS/roundend.dm

@@ -320,8 +320,8 @@
 				parts += "[FOURSPACES]<i>Nobody died this shift!</i>"
 	if(istype(SSticker.mode, /datum/game_mode/dynamic))
 		var/datum/game_mode/dynamic/mode = SSticker.mode
-		parts += "[FOURSPACES]Threat level: [mode.threat_level]"
-		parts += "[FOURSPACES]Threat left: [mode.threat]"
+		parts += "[FOURSPACES]Final threat level: [mode.threat_level]"
+		parts += "[FOURSPACES]Final threat: [mode.threat]"
 		parts += "[FOURSPACES]Executed rules:"
 		for(var/datum/dynamic_ruleset/rule in mode.executed_rules)
 			parts += "[FOURSPACES][FOURSPACES][rule.ruletype] - <b>[rule.name]</b>: -[rule.cost + rule.scaled_times * rule.scaling_cost] threat"
@@ -331,7 +331,7 @@
 		for(var/entry in mode.threat_tallies)
 			parts += "[FOURSPACES][FOURSPACES][entry] added [mode.threat_tallies[entry]]"
 		SSblackbox.record_feedback("tally","dynamic_threat",mode.threat_level,"Final threat level")
-		SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Threat left")
+		SSblackbox.record_feedback("tally","dynamic_threat",mode.threat,"Final Threat")
 	return parts.Join("<br>")
 
 /client/proc/roundend_report_file()
@@ -354,6 +354,7 @@
 	roundend_report.set_content(content)
 	roundend_report.stylesheets = list()
 	roundend_report.add_stylesheet("roundend", 'html/browser/roundend.css')
+	roundend_report.add_stylesheet("font-awesome", 'html/font-awesome/css/all.min.css')
 	roundend_report.open(0)
 
 /datum/controller/subsystem/ticker/proc/personal_report(client/C, popcount)

code/__HELPERS/text.dm

@@ -49,7 +49,7 @@
 		alert("Invalid name.")
 		return ""
 	return sanitize(t)
-	
+
 /proc/sanitize_filename(t)
 	return sanitize_simple(t, list("\n"="", "\t"="", "/"="", "\\"="", "?"="", "%"="", "*"="", ":"="", "|"="", "\""="", "<"="", ">"=""))
 
@@ -798,3 +798,17 @@ GLOBAL_LIST_INIT(binary, list("0","1"))
 		out += prob(replaceprob)? pick(replacementchars) : char
 	return out.Join("")
 
+/proc/readable_corrupted_text(text)
+	var/list/corruption_options = list("..", "£%", "~~\"", "!!", "*", "^", "$!", "-", "}", "?")
+	var/corrupted_text = ""
+	for(var/letter_index = 1; letter_index <= length(text); letter_index++)	// Have every letter have a chance of creating corruption on either side
+		var/letter = text[letter_index]	// Small chance of letters being removed in place of corruption - still overall readable
+		if(prob(15))
+			corrupted_text += pick(corruption_options)
+		if(prob(95))
+			corrupted_text += letter
+		else
+			corrupted_text += pick(corruption_options)
+	if(prob(15))
+		corrupted_text += pick(corruption_options)
+	return corrupted_text

code/__HELPERS/type2type_vr.dm

@@ -1,111 +0,0 @@
-/*
-// Contains VOREStation based vore description type2type functions
-// list2text - takes delimiter and returns text
-// text2list - takes delimiter, and creates list
-//
-*/
-
-// Concatenates a list of strings into a single string.  A seperator may optionally be provided.
-/proc/list2text(list/ls, sep)
-	if (ls.len <= 1) // Early-out code for empty or singleton lists.
-		return ls.len ? ls[1] : ""
-
-	var/l = ls.len // Made local for sanic speed.
-	var/i = 0      // Incremented every time a list index is accessed.
-
-	if (sep <> null)
-		// Macros expand to long argument lists like so: sep, ls[++i], sep, ls[++i], sep, ls[++i], etc...
-		#define S1  sep, ls[++i]
-		#define S4  S1,  S1,  S1,  S1
-		#define S16 S4,  S4,  S4,  S4
-		#define S64 S16, S16, S16, S16
-
-		. = "[ls[++i]]" // Make sure the initial element is converted to text.
-
-		// Having the small concatenations come before the large ones boosted speed by an average of at least 5%.
-		if (l-1 & 0x01) // 'i' will always be 1 here.
-			. = text("[][][]", ., S1) // Append 1 element if the remaining elements are not a multiple of 2.
-		if (l-i & 0x02)
-			. = text("[][][][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
-		if (l-i & 0x04)
-			. = text("[][][][][][][][][]", ., S4) // And so on....
-		if (l-i & 0x08)
-			. = text("[][][][][][][][][][][][][][][][][]", ., S4, S4)
-		if (l-i & 0x10)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16)
-		if (l-i & 0x20)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
-		if (l-i & 0x40)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
-		while (l > i) // Chomp through the rest of the list, 128 elements at a time.
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
-
-		#undef S64
-		#undef S16
-		#undef S4
-		#undef S1
-	else
-		// Macros expand to long argument lists like so: ls[++i], ls[++i], ls[++i], etc...
-		#define S1  ls[++i]
-		#define S4  S1,  S1,  S1,  S1
-		#define S16 S4,  S4,  S4,  S4
-		#define S64 S16, S16, S16, S16
-
-		. = "[ls[++i]]" // Make sure the initial element is converted to text.
-
-		if (l-1 & 0x01) // 'i' will always be 1 here.
-			. += S1 // Append 1 element if the remaining elements are not a multiple of 2.
-		if (l-i & 0x02)
-			. = text("[][][]", ., S1, S1) // Append 2 elements if the remaining elements are not a multiple of 4.
-		if (l-i & 0x04)
-			. = text("[][][][][]", ., S4) // And so on...
-		if (l-i & 0x08)
-			. = text("[][][][][][][][][]", ., S4, S4)
-		if (l-i & 0x10)
-			. = text("[][][][][][][][][][][][][][][][][]", ., S16)
-		if (l-i & 0x20)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S16, S16)
-		if (l-i & 0x40)
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64)
-		while (l > i) // Chomp through the rest of the list, 128 elements at a time.
-			. = text("[][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]\
-			          [][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][][]", ., S64, S64)
-
-		#undef S64
-		#undef S16
-		#undef S4
-		#undef S1
-
-// Converts a string into a list by splitting the string at each delimiter found. (discarding the seperator)
-/proc/text2list(text, delimiter="\n")
-	var/delim_len = length(delimiter)
-	if (delim_len < 1)
-		return list(text)
-
-	. = list()
-	var/last_found = 1
-	var/found
-
-	do
-		found       = findtext(text, delimiter, last_found, 0)
-		.          += copytext(text, last_found, found)
-		last_found  = found + delim_len
-	while (found)
-
-// Returns true if val is from min to max, inclusive.
-/proc/IsInRange(val, min, max)
-	return (val >= min) && (val <= max)

code/__HELPERS/unsorted.dm

@@ -1426,7 +1426,9 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 
 /proc/get_random_drink()
 	var/list/blocked = list(/obj/item/reagent_containers/food/drinks/soda_cans,
-		/obj/item/reagent_containers/food/drinks/bottle
+		/obj/item/reagent_containers/food/drinks/bottle,
+		/obj/item/reagent_containers/food/drinks/flask/russian,
+		/obj/item/reagent_containers/food/drinks/flask/steel
 		)
 	return pick(subtypesof(/obj/item/reagent_containers/food/drinks) - blocked)
 
@@ -1562,4 +1564,4 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 			channels_to_use += channel
 
 	if(channels_to_use.len)
-		world.TgsChatBroadcast()
+		world.TgsChatBroadcast()

code/__HELPERS/unused.dm

@@ -1,39 +0,0 @@
-
-
-/datum/projectile_data
-	var/src_x
-	var/src_y
-	var/time
-	var/distance
-	var/power_x
-	var/power_y
-	var/dest_x
-	var/dest_y
-
-/datum/projectile_data/New(var/src_x, var/src_y, var/time, var/distance, \
-							var/power_x, var/power_y, var/dest_x, var/dest_y)
-	src.src_x = src_x
-	src.src_y = src_y
-	src.time = time
-	src.distance = distance
-	src.power_x = power_x
-	src.power_y = power_y
-	src.dest_x = dest_x
-	src.dest_y = dest_y
-
-/proc/projectile_trajectory(src_x, src_y, rotation, angle, power)
-
-	// returns the destination (Vx,y) that a projectile shot at [src_x], [src_y], with an angle of [angle],
-	// rotated at [rotation] and with the power of [power]
-	// Thanks to VistaPOWA for this function
-
-	var/power_x = power * cos(angle)
-	var/power_y = power * sin(angle)
-	var/time = 2* power_y / 10 //10 = g
-
-	var/distance = time * power_x
-
-	var/dest_x = src_x + distance*sin(rotation);
-	var/dest_y = src_y + distance*cos(rotation);
-
-	return new /datum/projectile_data(src_x, src_y, time, distance, power_x, power_y, dest_x, dest_y)

code/_globalvars/bitfields.dm

@@ -214,7 +214,7 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"CAN_MASTURBATE_WITH" = CAN_MASTURBATE_WITH,
 		"MASTURBATE_LINKED_ORGAN" = MASTURBATE_LINKED_ORGAN,
 		"CAN_CLIMAX_WITH" = CAN_CLIMAX_WITH
-		
+
 	),
 	"mob_biotypes" = list (
 		"MOB_ORGANIC" = MOB_ORGANIC,
@@ -227,5 +227,27 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"MOB_EPIC" = MOB_EPIC,
 		"MOB_REPTILE" = MOB_REPTILE,
 		"MOB_SPIRIT" = MOB_SPIRIT
+	),
+	"mobility_flags" = list(
+		"MOBILITY_MOVE" = MOBILITY_MOVE,
+		"MOBILITY_STAND" = MOBILITY_STAND,
+		"MOBILITY_PICKUP" = MOBILITY_PICKUP,
+		"MOBILITY_USE" = MOBILITY_USE,
+		"MOBILITY_UI" = MOBILITY_UI,
+		"MOBILITY_STORAGE" = MOBILITY_STORAGE,
+		"MOBILITY_PULL" = MOBILITY_PULL,
+		"MOBILITY_HOLD" = MOBILITY_HOLD,
+		"MOBILITY_RESIST" = MOBILITY_RESIST
+	),
+	"combat_flags" = list(
+		"COMBAT_FLAG_COMBAT_TOGGLED" = COMBAT_FLAG_COMBAT_TOGGLED,
+		"COMBAT_FLAG_SPRINT_TOGGLED" = COMBAT_FLAG_SPRINT_TOGGLED,
+		"COMBAT_FLAG_COMBAT_ACTIVE" = COMBAT_FLAG_COMBAT_ACTIVE,
+		"COMBAT_FLAG_SPRINT_ACTIVE" = COMBAT_FLAG_SPRINT_ACTIVE,
+		"COMBAT_FLAG_ATTEMPTING_CRAWL" = COMBAT_FLAG_ATTEMPTING_CRAWL,
+		"COMBAT_FLAG_HARD_STAMCRIT" = COMBAT_FLAG_HARD_STAMCRIT,
+		"COMBAT_FLAG_SOFT_STAMCRIT" = COMBAT_FLAG_SOFT_STAMCRIT,
+		"COMBAT_FLAG_INTENTIONALLY_RESTING" = COMBAT_FLAG_INTENTIONALLY_RESTING,
+		"COMBAT_FLAG_RESISTING_REST" = COMBAT_FLAG_RESISTING_REST
 	)
 	))

code/_globalvars/genetics.dm

@@ -21,8 +21,11 @@ GLOBAL_LIST(op_se_blocks)
 GLOBAL_VAR(NULLED_SE)
 GLOBAL_VAR(NULLED_UI)
 
-GLOBAL_LIST_EMPTY(global_mutations) // list of hidden mutation things
+GLOBAL_LIST_EMPTY(all_mutations)
+GLOBAL_LIST_EMPTY(full_sequences)
 
 GLOBAL_LIST_EMPTY(bad_mutations)
 GLOBAL_LIST_EMPTY(good_mutations)
-GLOBAL_LIST_EMPTY(not_good_mutations)
+GLOBAL_LIST_EMPTY(not_good_mutations)
+
+GLOBAL_LIST_EMPTY(mutation_recipes)

code/_globalvars/lists/maintenance_loot.dm

@@ -36,7 +36,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list(
 	/obj/item/clothing/head/welding = 1,
 	/obj/item/clothing/mask/gas = 15,
 	/obj/item/clothing/suit/hazardvest = 1,
-	/obj/item/clothing/under/rank/vice = 1,
+	/obj/item/clothing/under/misc/vice_officer = 1,
 	/obj/item/clothing/suit/hooded/flashsuit = 2,
 	/obj/item/clothing/accessory/medal/greytide	=	1,
 	/obj/item/assembly/prox_sensor = 4,

code/_globalvars/lists/mobs.dm

@@ -29,7 +29,6 @@ GLOBAL_LIST_EMPTY(available_ai_shells)
 GLOBAL_LIST_INIT(simple_animals, list(list(),list(),list(),list())) // One for each AI_* status define
 GLOBAL_LIST_EMPTY(spidermobs)				//all sentient spider mobs
 GLOBAL_LIST_EMPTY(bots_list)
-GLOBAL_LIST_EMPTY(living_cameras)
 GLOBAL_LIST_EMPTY(aiEyes)
 
 GLOBAL_LIST_EMPTY(language_datum_instances)

code/_globalvars/lists/poll_ignore.dm

@@ -18,6 +18,7 @@
 #define POLL_IGNORE_DEMON "demon"
 #define POLL_IGNORE_WIZARD "wizard"
 #define POLL_IGNORE_CLONE "clone"
+#define POLL_IGNORE_CONTRACTOR_SUPPORT "contractor_support"
 
 GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SENTIENCE_POTION = "Sentience potion",
@@ -37,7 +38,8 @@ GLOBAL_LIST_INIT(poll_ignore_desc, list(
 	POLL_IGNORE_SPLITPERSONALITY = "Split Personality",
 	POLL_IGNORE_DEMON = "Demons",
 	POLL_IGNORE_WIZARD = "Wizards",
-	POLL_IGNORE_CLONE = "Defective/SDGF clones"
+	POLL_IGNORE_CLONE = "Defective/SDGF clones",
+	POLL_IGNORE_CONTRACTOR_SUPPORT = "Contractor Support Unit"
 ))
 GLOBAL_LIST_INIT(poll_ignore, init_poll_ignore())
 

code/_onclick/click.dm

@@ -152,10 +152,10 @@
 		else
 			if(ismob(A))
 				changeNext_move(CLICK_CD_MELEE)
-			UnarmedAttack(A,1)
+			UnarmedAttack(A, 1)
 	else
 		if(W)
-			W.afterattack(A,src,0,params)
+			W.ranged_attack_chain(src, A, params)
 		else
 			RangedAttack(A,params)
 

code/_onclick/cyborg.dm

@@ -14,7 +14,7 @@
 	if(check_click_intercept(params,A))
 		return
 
-	if(stat || lockcharge || IsKnockdown() || IsStun() || IsUnconscious())
+	if(stat || locked_down || IsParalyzed() || IsStun() || IsUnconscious())
 		return
 
 	var/list/modifiers = params2list(params)
@@ -66,7 +66,7 @@
 				if(C.user_unbuckle_mob(C.buckled_mobs[1],src))
 					return
 
-	if(!W && get_dist(src,A) <= interaction_range)
+	if(!W && (get_dist(src,A) <= interaction_range))
 		A.attack_robot(src)
 		return
 

code/_onclick/hud/_defines.dm

@@ -163,3 +163,14 @@
 #define ui_ghost_reenter_corpse "SOUTH:6,CENTER:24"
 #define ui_ghost_teleport "SOUTH:6,CENTER+1:24"
 #define ui_ghost_pai "SOUTH: 6, CENTER+2:24"
+
+
+//UI position overrides for 1:1 screen layout. (default is 7:5)
+#define ui_stamina "EAST-1:28,CENTER:17" // replacing internals button
+#define ui_overridden_resist "EAST-3:24,SOUTH+1:7"
+#define ui_combat_toggle "EAST-4:22,SOUTH:5"
+
+#define ui_boxcraft "EAST-4:22,SOUTH+1:6"
+#define ui_boxarea "EAST-4:6,SOUTH+1:6"
+#define ui_boxlang "EAST-5:22,SOUTH+1:6"
+#define ui_boxvore	"EAST-5:22,SOUTH+1:6"

code/_onclick/hud/action_button.dm

@@ -72,6 +72,22 @@
 	var/hide_icon = 'icons/mob/actions.dmi'
 	var/hide_state = "hide"
 	var/show_state = "show"
+	var/mutable_appearance/hide_appearance
+	var/mutable_appearance/show_appearance
+
+/obj/screen/movable/action_button/hide_toggle/Initialize()
+	. = ..()
+	var/static/list/icon_cache = list()
+
+	var/cache_key = "[hide_icon][hide_state]"
+	hide_appearance = icon_cache[cache_key]
+	if(!hide_appearance)
+		hide_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, hide_state)
+
+	cache_key = "[hide_icon][show_state]"
+	show_appearance = icon_cache[cache_key]
+	if(!show_appearance)
+		show_appearance = icon_cache[cache_key] = mutable_appearance(hide_icon, show_state)
 
 /obj/screen/movable/action_button/hide_toggle/Click(location,control,params)
 	if (!can_use(usr))
@@ -137,9 +153,12 @@
 	show_state = settings["toggle_show"]
 	update_icon()
 
-/obj/screen/movable/action_button/hide_toggle/update_icon()
-	cut_overlays()
-	add_overlay(mutable_appearance(hide_icon, hidden ? show_state : hide_state))
+/obj/screen/movable/action_button/hide_toggle/update_overlays()
+	. = ..()
+	if(hidden)
+		. += show_appearance
+	else
+		. += hide_appearance
 
 
 /obj/screen/movable/action_button/MouseEntered(location,control,params)

code/_onclick/hud/alert.dm

@@ -273,7 +273,7 @@ or shoot a gun to move around via Newton's 3rd Law of Motion."
 	if(!istype(L) || !L.can_resist())
 		return
 	L.changeNext_move(CLICK_CD_RESIST)
-	if(L.canmove)
+	if(CHECK_MOBILITY(L, MOBILITY_MOVE))
 		return L.resist_fire() //I just want to start a flame in your hearrrrrrtttttt.
 
 
@@ -601,7 +601,7 @@ so as to remain in compliance with the most up-to-date laws."
 	if(!istype(L) || !L.can_resist())
 		return
 	L.changeNext_move(CLICK_CD_RESIST)
-	if((L.canmove) && (L.last_special <= world.time))
+	if(CHECK_MOBILITY(L, MOBILITY_MOVE) && (L.last_special <= world.time))
 		return L.resist_restraints()
 
 /obj/screen/alert/restrained/buckled/Click()