Merge remote-tracking branch 'upstream/master' into Lambdastation

2020-03-21 19:10:10 -06:00
parent cdb07797b2 cb537f431b
commit f1a21cfbe0
236 changed files with 5997 additions and 3684 deletions
@@ -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
+"}
@@ -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
+"}
@@ -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
+"}
@@ -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
+"}
@@ -36,39 +36,38 @@
 #define CAN_CLIMAX_WITH			(1<<7)
 #define GENITAL_CAN_AROUSE		(1<<8)

+
+#define DEF_VAGINA_SHAPE	"Human"
+
 #define COCK_SIZE_MIN		1
+#define COCK_SIZE_DEF		6
 #define COCK_SIZE_MAX		20

 #define COCK_DIAMETER_RATIO_MAX		0.42
 #define COCK_DIAMETER_RATIO_DEF		0.25
 #define COCK_DIAMETER_RATIO_MIN		0.15

-#define KNOT_GIRTH_RATIO_MAX		3
-#define KNOT_GIRTH_RATIO_DEF		2.1
-#define KNOT_GIRTH_RATIO_MIN		1.25
-
+#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
@@ -83,8 +82,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 +89,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 +106,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
@@ -29,7 +29,54 @@
 #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)
@@ -203,3 +250,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.
+
+
@@ -186,6 +186,8 @@
 #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_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)
@@ -195,6 +197,7 @@
 #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
@@ -201,4 +201,7 @@
 #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))
+
+/// 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)
@@ -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
@@ -53,6 +53,9 @@

 #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
@@ -131,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"
@@ -144,6 +146,7 @@
 #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)
@@ -159,6 +162,15 @@

 #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

@@ -222,10 +234,13 @@
 #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

 // 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"
@@ -139,18 +139,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()
@@ -181,35 +181,21 @@
 		"genitals_use_skintone"	= FALSE,
 		"has_cock"			= FALSE,
 		"cock_shape"		= pick(GLOB.cock_shapes_list),
-		"cock_length"		= 6,
+		"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_shape"		= DEF_BREASTS_SHAPE,
 		"breasts_producing" = FALSE,
 		"has_vag"			= FALSE,
 		"vag_shape"			= pick(GLOB.vagina_shapes_list),
@@ -238,5 +238,16 @@ GLOBAL_LIST_INIT(bitfields, list(
 		"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
 	)
 	))
@@ -128,7 +128,7 @@
 	//CITADEL CHANGES - sprint button
 	using = new /obj/screen/sprintbutton
 	using.icon = tg_ui_icon_to_cit_ui(ui_style)
-	using.icon_state = (owner.sprinting ? "act_sprint_on" : "act_sprint")
+	using.icon_state = ((owner.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) ? "act_sprint_on" : "act_sprint")
 	using.screen_loc = ui_movi
 	using.hud = src
 	static_inventory += using
@@ -11,7 +11,7 @@
 	if(item_flags & NO_ATTACK_CHAIN_SOFT_STAMCRIT)
 		if(isliving(user))
 			var/mob/living/L = user
-			if(L.getStaminaLoss() >= STAMINA_SOFTCRIT)
+			if(IS_STAMCRIT(L))
 				to_chat(L, "<span class='warning'>You are too exhausted to swing [src]!</span>")
 				return
 	if(tool_behaviour && target.tool_act(user, src, tool_behaviour))
@@ -58,7 +58,7 @@
 	if(item_flags & NOBLUDGEON)
 		return

-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) // CIT CHANGE - makes it impossible to attack in stamina softcrit
+	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
 		return // CIT CHANGE - ditto

@@ -88,7 +88,7 @@
 		return
 	if(item_flags & NOBLUDGEON)
 		return
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) // CIT CHANGE - makes it impossible to attack in stamina softcrit
+	if(IS_STAMCRIT(user)) // CIT CHANGE - makes it impossible to attack in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") // CIT CHANGE - ditto
 		return // CIT CHANGE - ditto
 	user.adjustStaminaLossBuffered(getweight()*1.2)//CIT CHANGE - makes attacking things cause stamina loss
@@ -109,10 +109,8 @@
 /mob/living/attacked_by(obj/item/I, mob/living/user)
 	//CIT CHANGES START HERE - combatmode and resting checks
 	var/totitemdamage = I.force
-	if(iscarbon(user))
-		var/mob/living/carbon/tempcarb = user
-		if(!tempcarb.combatmode)
-			totitemdamage *= 0.5
+	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+		totitemdamage *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		totitemdamage *= 0.5
 	//CIT CHANGES END HERE
@@ -257,8 +257,7 @@ SUBSYSTEM_DEF(air)
 		T.add_atom_colour("#00ff00", TEMPORARY_COLOUR_PRIORITY)
 		#endif
 		T.excited = TRUE
-		active_turfs |= T
-		SSair_turfs.currentrun |= T
+		active_turfs[T] = SSair_turfs.currentrun[T] = TRUE
 		if(blockchanges && T.excited_group)
 			T.excited_group.garbage_collect()
 		add_to_react_queue(T)
@@ -274,10 +273,9 @@ SUBSYSTEM_DEF(air)

 /datum/controller/subsystem/air/proc/add_to_react_queue(turf/open/T)
 	if(istype(T) && T.air)
-		turf_react_queue |= T
+		turf_react_queue[T] = TRUE
 		if(currentpart == SSAIR_REACTQUEUE)
-			currentrun |= T
-	return
+			currentrun[T] = TRUE

 /datum/controller/subsystem/air/proc/remove_from_react_queue(turf/open/T)
 	turf_react_queue -= T
@@ -0,0 +1,3 @@
+PROCESSING_SUBSYSTEM_DEF(status_effects)
+	wait = 1
+	flags = SS_TICKER
@@ -676,7 +676,8 @@

 //Preset for general and toggled actions
 /datum/action/innate
-	check_flags = 0
+	check_flags = NONE
+	required_mobility_flags = NONE
 	var/active = 0

 /datum/action/innate/Trigger()
@@ -278,7 +278,7 @@

 /datum/crafting_recipe/arrow
 	name = "Arrow"
-	result = /obj/item/ammo_casing/caseless/arrow
+	result = /obj/item/ammo_casing/caseless/arrow/wood
 	time = 30
 	reqs = list(/obj/item/stack/sheet/mineral/wood = 1,
 				 /obj/item/stack/sheet/silk = 1,
@@ -293,17 +293,17 @@
 	always_availible = FALSE
 	reqs = list(/obj/item/stack/sheet/bone = 1,
 				 /obj/item/stack/sheet/sinew = 1,
-				 /obj/item/ammo_casing/caseless/arrow/ashen = 1)
+				 /obj/item/ammo_casing/caseless/arrow/ash = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO

 /datum/crafting_recipe/ashen_arrow
 	name = "Fire Hardened Arrow"
-	result = /obj/item/ammo_casing/caseless/arrow/ashen
+	result = /obj/item/ammo_casing/caseless/arrow/ash
 	tools = list(TOOL_WELDER)
 	time = 30
 	always_availible = FALSE
-	reqs = list(/obj/item/ammo_casing/caseless/arrow = 1)
+	reqs = list(/obj/item/ammo_casing/caseless/arrow/wood = 1)
 	category = CAT_WEAPONRY
 	subcategory = CAT_AMMO

@@ -2,7 +2,7 @@

 /datum/component/wearertargeting/phantomthief
 	dupe_mode = COMPONENT_DUPE_UNIQUE_PASSARGS
-	signals = list(COMSIG_COMBAT_TOGGLED)
+	signals = list(COMSIG_LIVING_COMBAT_ENABLED)
 	proctype = .proc/handlefilterstuff
 	var/filter_x
 	var/filter_y
@@ -58,6 +58,7 @@
 	RegisterSignal(current_mind, COMSIG_PRE_MIND_TRANSFER, .proc/pre_player_transfer)
 	if(mastermind?.current)
 		mastermind.current.audiovisual_redirect = M
+	ADD_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG, VIRTUAL_REALITY_TRAIT)

 /datum/component/virtual_reality/UnregisterFromParent()
 	. = ..()
@@ -69,6 +70,7 @@
 	current_mind = null
 	if(mastermind?.current)
 		mastermind.current.audiovisual_redirect = null
+	REMOVE_TRAIT(parent, TRAIT_NO_MIDROUND_ANTAG, VIRTUAL_REALITY_TRAIT)

 /**
  * Called when attempting to connect a mob to a virtual reality mob.
@@ -235,7 +237,7 @@
 		qdel(src)

 /**
-  * Used for recursive virtual realities shenanigeans and should be called only through the above proc.
+  * Used for recursive virtual realities shenanigeans and should be called by the above proc.
  */
 /datum/component/virtual_reality/proc/vr_in_a_vr(mob/player, deathcheck = FALSE, lethal_cleanup = FALSE)
 	var/mob/M = parent
@@ -7,10 +7,10 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 	var/list/texts_by_atom = list()
 	var/addendum = "This can also be used for OOC notes and preferences!"
 	var/always_show = FALSE
-	var/max_len = MAX_FAVOR_LEN
+	var/max_len = MAX_FLAVOR_LEN
 	var/can_edit = TRUE

-/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FAVOR_LEN, _always_show = FALSE, _edit = TRUE)
+/datum/element/flavor_text/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE)
 	. = ..()

 	if(. == ELEMENT_INCOMPATIBLE || !isatom(target)) //no reason why this shouldn't work on atoms too.
@@ -115,7 +115,7 @@ GLOBAL_LIST_EMPTY(mobs_with_editable_flavor_text) //et tu, hacky code
 //subtypes with additional hooks for DNA and preferences.
 /datum/element/flavor_text/carbon

-/datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FAVOR_LEN, _always_show = FALSE, _edit = TRUE)
+/datum/element/flavor_text/carbon/Attach(datum/target, text = "", _name = "Flavor Text", _addendum, _max_len = MAX_FLAVOR_LEN, _always_show = FALSE, _edit = TRUE)
 	if(!iscarbon(target))
 		return ELEMENT_INCOMPATIBLE
 	. = ..()
@@ -15,4 +15,4 @@

 /datum/element/sword_point/proc/point(datum/source, atom/target, mob/user, proximity_flag, params)
 	if(!proximity_flag && ismob(target))
-		user.visible_message("<span class='notice'>[user] points the tip of [src] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
+		user.visible_message("<span class='notice'>[user] points the tip of [source] at [target].</span>", "<span class='notice'>You point the tip of [src] at [target].</span>")
@@ -95,8 +95,7 @@
 		SStgui.on_transfer(current, new_character)
 		if(iscarbon(current))
 			var/mob/living/carbon/C = current
-			if(C.combatmode)
-				C.toggle_combat_mode(TRUE, TRUE)
+			C.disable_intentional_combat_mode(TRUE)
 	if(!language_holder)
 		var/datum/language_holder/mob_holder = new_character.get_language_holder(shadow = FALSE)
 		language_holder = mob_holder.copy(src)
@@ -11,10 +11,6 @@
 		if(findtext(A, "[mutation1]") && findtext(A, "[mutation2]"))
 			return GLOB.mutation_recipes[A]

-/datum/generecipe/x_ray
-	required = "/datum/mutation/human/thermal; /datum/mutation/human/radioactive"
-	result = /datum/mutation/human/thermal/x_ray
-
 /datum/generecipe/shock
 	required = "/datum/mutation/human/insulated; /datum/mutation/human/radioactive"
 	result = SHOCKTOUCH
@@ -29,4 +25,4 @@

 /datum/generecipe/tonguechem
 	required = "/datum/mutation/human/tongue_spike; /datum/mutation/human/stimmed"
-	result = TONGUESPIKECHEM
+	result = TONGUESPIKECHEM
@@ -480,6 +480,12 @@
 	admin_notes = "Comes with turrets that will target any simplemob."
 	credit_cost = 12500

+/datum/map_template/shuttle/emergency/cog
+	suffix = "cog"
+	name = "NES Classic"
+	description = "A blast from the past! This recreation of the Nanotrasen Emergency Shuttle Port features the same focus on seating as the original, but on a slightly longer frame to better accommodate modern shuttle docks."
+	credit_cost = 750
+
 /datum/map_template/shuttle/arrival/box
 	suffix = "box"
 	name = "arrival shuttle (Box)"
@@ -500,6 +506,10 @@
 	suffix = "kilo"
 	name = "labour shuttle (Kilo)"

+/datum/map_template/shuttle/labour/cog
+	suffix = "cog"
+	name = "labour shuttle (Cog)"
+
 /datum/map_template/shuttle/infiltrator/basic
 	suffix = "basic"
 	name = "basic syndicate infiltrator"
@@ -544,6 +554,10 @@
 	suffix = "omega"
 	name = "arrival shuttle (Omega)"

+/datum/map_template/shuttle/arrival/cog
+	suffix = "cog"
+	name = "arrival shuttle (Cog)"
+
 /datum/map_template/shuttle/aux_base/default
 	suffix = "default"
 	name = "auxilliary base (Default)"
@@ -20,11 +20,11 @@
 	owner.adjustFireLoss(-15)

 /datum/status_effect/shadow_mend/on_remove()
+	. = ..()
 	owner.visible_message("<span class='warning'>The violet light around [owner] glows black!</span>", "<span class='warning'>The tendrils around you cinch tightly and reap their toll...</span>")
 	playsound(owner, 'sound/magic/teleport_diss.ogg', 50, 1)
 	owner.apply_status_effect(STATUS_EFFECT_VOID_PRICE)

-
 /datum/status_effect/void_price
 	id = "void_price"
 	duration = 300
@@ -84,6 +84,7 @@
 	progbar.update(duration - world.time)

 /datum/status_effect/vanguard_shield/on_remove()
+	. = ..()
 	var/vanguard = owner.stun_absorption["vanguard"]
 	var/stuns_blocked = 0
 	if(vanguard)
@@ -107,7 +108,6 @@
 		owner.visible_message("<span class='warning'>[owner]'s glowing aura fades!</span>", message_to_owner)
 		owner.log_message("lost Vanguard stun immunity[stuns_blocked ? "and was stunned for [stuns_blocked]":""]", LOG_ATTACK)

-
 /datum/status_effect/inathneqs_endowment
 	id = "inathneqs_endowment"
 	duration = 150
@@ -133,12 +133,12 @@
 	return ..()

 /datum/status_effect/inathneqs_endowment/on_remove()
+	. = ..()
 	owner.log_message("lost Inath-neq's invulnerability", LOG_ATTACK)
 	owner.visible_message("<span class='warning'>The light around [owner] flickers and dissipates!</span>", "<span class='boldwarning'>You feel Inath-neq's power fade from your body!</span>")
 	owner.status_flags &= ~GODMODE
 	playsound(owner, 'sound/magic/ethereal_exit.ogg', 50, 1)

-
 /datum/status_effect/cyborg_power_regen
 	id = "power_regen"
 	duration = 100
@@ -210,11 +210,11 @@
 	owner.adjustStaminaLoss(-(grace_heal * 25))

 /datum/status_effect/his_grace/on_remove()
+	. = ..()
 	owner.log_message("lost His Grace's stun immunity", LOG_ATTACK)
 	if(islist(owner.stun_absorption) && owner.stun_absorption["hisgrace"])
 		owner.stun_absorption -= "hisgrace"

-
 /datum/status_effect/wish_granters_gift //Fully revives after ten seconds.
 	id = "wish_granters_gift"
 	duration = 50
@@ -225,6 +225,7 @@
 	return ..()

 /datum/status_effect/wish_granters_gift/on_remove()
+	. = ..()
 	owner.revive(full_heal = TRUE, admin_revive = TRUE)
 	owner.visible_message("<span class='warning'>[owner] appears to wake from the dead, having healed all wounds!</span>", "<span class='notice'>You have regenerated.</span>")

@@ -366,6 +367,7 @@
 	last_health = owner.health

 /datum/status_effect/blooddrunk/on_remove()
+	. = ..()
 	tick()
 	owner.maxHealth *= 0.1
 	owner.bruteloss *= 0.1
@@ -404,7 +406,6 @@
 	playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0)
 	return ..()

-
 /datum/status_effect/sword_spin/tick()
 	playsound(owner, 'sound/weapons/fwoosh.wav', 75, 0)
 	var/obj/item/slashy
@@ -413,9 +414,9 @@
 		slashy.attack(M, owner)

 /datum/status_effect/sword_spin/on_remove()
+	. = ..()
 	owner.visible_message("<span class='warning'>[owner]'s inhuman strength dissipates and the sword's runes grow cold!</span>")

-
 //Used by changelings to rapidly heal
 //Heals 10 brute and oxygen damage every second, and 5 fire
 //Being on fire will suppress this healing
@@ -472,6 +473,7 @@
 	return ..()

 /datum/status_effect/hippocraticOath/on_remove()
+	. = ..()
 	REMOVE_TRAIT(owner, TRAIT_PACIFISM, "hippocraticOath")
 	var/datum/atom_hud/H = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
 	H.remove_hud_from(owner)
@@ -17,6 +17,7 @@
 				owner.update_stat()

 /datum/status_effect/incapacitating/on_remove()
+	. = ..()
 	owner.update_mobility()
 	if(needs_update_stat || issilicon(owner)) //silicons need stat updates in addition to normal canmove updates
 		owner.update_stat()
@@ -86,6 +87,15 @@
 		if(prob(10) && owner.health > owner.crit_threshold)
 			owner.emote("snore")

+/datum/status_effect/staggered
+	id = "staggered"
+	blocks_sprint = TRUE
+
+/datum/status_effect/staggered/on_creation(mob/living/new_owner, set_duration)
+	if(isnum(set_duration))
+		duration = set_duration
+	return ..()
+
 /obj/screen/alert/status_effect/asleep
 	name = "Asleep"
 	desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are."
@@ -101,10 +111,6 @@
 	if(isnum(set_duration))
 		duration = set_duration
 	. = ..()
-	if(iscarbon(owner))
-		var/mob/living/carbon/C = owner
-		if(C.combatmode)
-			C.toggle_combat_mode(TRUE)

 /datum/status_effect/no_combat_mode/mesmerize
 	id = "Mesmerize"
@@ -133,7 +139,7 @@
 	var/slowdown_priority = 50		//to make sure the stronger effect overrides
 	var/affect_crawl = FALSE
 	var/nextmove_modifier = 1
-	var/stamdmg_per_ds = 1		//a 20 duration would do 20 stamdmg, disablers do 24 or something
+	var/stamdmg_per_ds = 0		//a 20 duration would do 20 stamdmg, disablers do 24 or something
 	var/last_tick = 0			//fastprocess processing speed is a goddamn sham, don't trust it.

 /datum/status_effect/electrode/on_creation(mob/living/new_owner, set_duration)
@@ -143,8 +149,6 @@
 	last_tick = world.time
 	if(iscarbon(owner))
 		var/mob/living/carbon/C = owner
-		if(C.combatmode)
-			C.toggle_combat_mode(TRUE)
 		C.add_movespeed_modifier("[MOVESPEED_ID_TASED_STATUS]_[id]", TRUE, priority = slowdown_priority, override = TRUE, multiplicative_slowdown = slowdown, blacklisted_movetypes = affect_crawl? NONE : CRAWLING)

 /datum/status_effect/electrode/on_remove()
@@ -172,15 +176,7 @@
 	slowdown_priority = 100
 	nextmove_modifier = 2
 	blocks_combatmode = TRUE
-
-/datum/status_effect/electrode/no_combat_mode/on_creation(mob/living/new_owner, set_duration)
-	. = ..()
-	if(iscarbon(owner))
-		var/mob/living/carbon/C = owner
-		if(HAS_TRAIT(C, TRAIT_TASED_RESISTANCE))
-			return
-		if(C.combatmode)
-			C.toggle_combat_mode(TRUE)
+	stamdmg_per_ds = 1

 //OTHER DEBUFFS
 /datum/status_effect/his_wrath //does minor damage over time unless holding His Grace
@@ -219,6 +215,7 @@
 	alerttooltipstyle = "clockcult"

 /datum/status_effect/belligerent/on_apply()
+	. = ..()
 	return do_movement_toggle(TRUE)

 /datum/status_effect/belligerent/tick()
@@ -249,6 +246,7 @@
 /datum/status_effect/belligerent/on_remove()
 	if(owner.m_intent == MOVE_INTENT_WALK)
 		owner.toggle_move_intent()
+	return ..()

 /datum/status_effect/maniamotor
 	id = "maniamotor"
@@ -348,6 +346,7 @@
 	alert_type = null

 /datum/status_effect/cultghost/on_apply()
+	. = ..()
 	owner.see_invisible = SEE_INVISIBLE_OBSERVER
 	owner.see_in_dark = 2

@@ -369,6 +368,7 @@
 		hammer_synced = new_hammer_synced

 /datum/status_effect/crusher_mark/on_apply()
+	. = ..()
 	if(owner.mob_size >= MOB_SIZE_LARGE)
 		marked_underlay = mutable_appearance('icons/effects/effects.dmi', "shield2")
 		marked_underlay.pixel_x = -owner.pixel_x
@@ -450,6 +450,7 @@
 		qdel(src)

 /datum/status_effect/saw_bleed/on_remove()
+	. = ..()
 	if(needs_to_bleed)
 		var/turf/T = get_turf(owner)
 		new /obj/effect/temp_visual/bleed/explode(T)
@@ -508,6 +509,7 @@
 	return ..()

 /datum/status_effect/necropolis_curse/on_remove()
+	. = ..()
 	remove_curse(curse_flags)

 /datum/status_effect/necropolis_curse/proc/apply_curse(set_curse)
@@ -597,6 +599,7 @@
 	old_oxyloss = owner.getOxyLoss()

 /datum/status_effect/kindle/on_remove()
+	. = ..()
 	owner.visible_message("<span class='warning'>The light in [owner]'s eyes fades!</span>", \
 	"<span class='boldannounce'>You snap out of your daze!</span>")

@@ -616,11 +619,13 @@
 	alert_type = /obj/screen/alert/status_effect/ichorial_stain

 /datum/status_effect/ichorial_stain/on_apply()
+	. = ..()
 	owner.visible_message("<span class='danger'>[owner] gets back up, [owner.p_their()] body dripping blue ichor!</span>", \
 	"<span class='userdanger'>Thick blue ichor covers your body; you can't be revived like this again until it dries!</span>")
 	return TRUE

 /datum/status_effect/ichorial_stain/on_remove()
+	. = ..()
 	owner.visible_message("<span class='danger'>The blue ichor on [owner]'s body dries out!</span>", \
 	"<span class='boldnotice'>The ichor on your body is dry - you can now be revived by vitality matrices again!</span>")

@@ -642,6 +647,7 @@
 	owner.add_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF, multiplicative_slowdown = 1, movetypes = GROUND)

 /datum/status_effect/electrostaff/on_remove()
+	. = ..()
 	owner.remove_movespeed_modifier(MOVESPEED_ID_ELECTROSTAFF)

 //GOLEM GANG
@@ -693,6 +699,7 @@ datum/status_effect/pacify

 /datum/status_effect/pacify/on_remove()
 	REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect")
+	return ..()

 /datum/status_effect/trance
 	id = "trance"
@@ -714,6 +721,7 @@ datum/status_effect/pacify
 	owner.dizziness = 20

 /datum/status_effect/trance/on_apply()
+	. = ..()
 	if(!iscarbon(owner))
 		return FALSE
 	RegisterSignal(owner, COMSIG_MOVABLE_HEAR, .proc/hypnotize)
@@ -734,6 +742,7 @@ datum/status_effect/pacify
 	owner.dizziness = 0
 	owner.remove_client_colour(/datum/client_colour/monochrome/trance)
 	to_chat(owner, "<span class='warning'>You snap out of your trance!</span>")
+	return ..()

 /datum/status_effect/trance/proc/hypnotize(datum/source, list/hearing_args)
 	if(!owner.can_hear())
@@ -819,8 +828,9 @@ datum/status_effect/pacify
 		return
 	var/mob/living/carbon/human/H = owner
 	H.something_horrible(kill_either_way)
+	return ..()

 /obj/screen/alert/status_effect/dna_melt
 	name = "Genetic Breakdown"
 	desc = "I don't feel so good. Your body can't handle the mutations! You have one minute to remove your mutations, or you will be met with a horrible fate."
-	icon_state = "dna_melt"
+	icon_state = "dna_melt"
@@ -40,6 +40,7 @@
 	owner.adjust_bodytemperature(100)
 	owner.update_mobility()
 	UnregisterSignal(owner, COMSIG_LIVING_RESIST)
+	return ..()

 /datum/status_effect/freon/watcher
 	duration = 8
@@ -46,7 +46,7 @@

 /datum/status_effect/syphon_mark/on_remove()
 	get_kill()
-	. = ..()
+	return ..()

 /obj/screen/alert/status_effect/in_love
 	name = "In Love"
@@ -81,5 +81,5 @@
 	ADD_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")

 /datum/status_effect/throat_soothed/on_remove()
-	. = ..()
-	REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+	REMOVE_TRAIT(owner, TRAIT_SOOTHED_THROAT, "[STATUS_EFFECT_TRAIT]_[id]")
+	return ..()
@@ -11,7 +11,10 @@
 	var/on_remove_on_mob_delete = FALSE //if we call on_remove() when the mob is deleted
 	var/examine_text //If defined, this text will appear when the mob is examined - to use he, she etc. use "SUBJECTPRONOUN" and replace it in the examines themselves
 	var/alert_type = /obj/screen/alert/status_effect //the alert thrown by the status effect, contains name and description
-	var/blocks_combatmode //Does this status effect prevent the user from toggling combat mode?
+	/// If this is TRUE, the user will have combt mode forcefully disabled while this is active.
+	var/blocks_combatmode = FALSE
+	/// If this is TRUE, the user will have sprint forcefully disabled while this is active.
+	var/blocks_sprint = FALSE
 	var/obj/screen/alert/status_effect/linked_alert = null //the alert itself, if it exists

 /datum/status_effect/New(list/arguments)
@@ -32,11 +35,11 @@
 		var/obj/screen/alert/status_effect/A = owner.throw_alert(id, alert_type)
 		A.attached_effect = src //so the alert can reference us, if it needs to
 		linked_alert = A //so we can reference the alert, if we need to
-	START_PROCESSING(SSfastprocess, src)
+	START_PROCESSING(SSstatus_effects, src)
 	return TRUE

 /datum/status_effect/Destroy()
-	STOP_PROCESSING(SSfastprocess, src)
+	STOP_PROCESSING(SSstatus_effects, src)
 	if(owner)
 		owner.clear_alert(id)
 		LAZYREMOVE(owner.status_effects, src)
@@ -55,9 +58,21 @@
 		qdel(src)

 /datum/status_effect/proc/on_apply() //Called whenever the buff is applied; returning FALSE will cause it to autoremove itself.
+	SHOULD_CALL_PARENT(TRUE)
+	if(blocks_combatmode)
+		ADD_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
+	if(blocks_sprint)
+		ADD_TRAIT(owner, TRAIT_SPRINT_LOCKED, src)
 	return TRUE
+
 /datum/status_effect/proc/tick() //Called every tick.
+
 /datum/status_effect/proc/on_remove() //Called whenever the buff expires or is removed; do note that at the point this is called, it is out of the owner's status_effects but owner is not yet null
+	SHOULD_CALL_PARENT(TRUE)
+	REMOVE_TRAIT(owner, TRAIT_COMBAT_MODE_LOCKED, src)
+	REMOVE_TRAIT(owner, TRAIT_SPRINT_LOCKED, src)
+	return TRUE
+
 /datum/status_effect/proc/be_replaced() //Called instead of on_remove when a status effect is replaced by itself or when a status effect with on_remove_on_mob_delete = FALSE has its mob deleted
 	owner.clear_alert(id)
 	LAZYREMOVE(owner.status_effects, src)
@@ -94,7 +94,7 @@
 	if(is_ash_immune(L))
 		return
 	if(is_species(L, /datum/species/lizard/ashwalker))
-		if(L.getStaminaLoss() <= STAMINA_SOFTCRIT)
+		if(!IS_STAMCRIT(L))
 			L.adjustStaminaLossBuffered(4)
 		return
 	L.adjustFireLoss(4)
@@ -43,7 +43,7 @@
 		if (!istype(M, required_type))
 			trimmed_list.Remove(M)
 			continue
-		if (M.GetComponent(/datum/component/virtual_reality))
+		if (HAS_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG))
 			trimmed_list.Remove(M)
 			continue
 		if (!M.client) // Are they connected?
@@ -165,7 +165,7 @@
 /datum/outfit/syndicate/full
 	name = "Syndicate Operative - Full Kit"

-	glasses = /obj/item/clothing/glasses/night
+	glasses = /obj/item/clothing/glasses/night/syndicate
 	mask = /obj/item/clothing/mask/gas/syndicate
 	suit = /obj/item/clothing/suit/space/hardsuit/syndi
 	r_pocket = /obj/item/tank/internals/emergency_oxygen/engi
@@ -180,7 +180,7 @@
 /datum/outfit/syndicate/lone
 	name = "Syndicate Operative - Lone"

-	glasses = /obj/item/clothing/glasses/night
+	glasses = /obj/item/clothing/glasses/night/syndicate
 	mask = /obj/item/clothing/mask/gas/syndicate
 	suit = /obj/item/clothing/suit/space/syndicate/black/red
 	head = /obj/item/clothing/head/helmet/space/syndicate/black/red
@@ -205,13 +205,18 @@
 	difficulty = 10

 /datum/objective_item/special/boh
-	name = "a bag of holding."
+	name = "a type of bag of holding."
 	targetitem = /obj/item/storage/backpack/holding
 	difficulty = 10

-/datum/objective_item/special/hypercell
-	name = "a hyper-capacity power cell."
-	targetitem = /obj/item/stock_parts/cell/hyper
+/datum/objective_item/special/adv_surgical_drapes
+	name = "a set of smart surgical drapes."
+	targetitem = /obj/item/surgical_drapes/advanced
+	difficulty = 10 //would be 15 but cmo rarely have it on themselfs and leave it in their lockers...
+
+/datum/objective_item/special/bluespace
+	name = "a bluespace power cell."
+	targetitem = /obj/item/stock_parts/cell/bluespace
 	difficulty = 5

 /datum/objective_item/special/laserpointer
@@ -219,7 +219,7 @@
 	if(!is_operational()) //Autoeject if power is lost
 		if(mob_occupant)
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 			connected_message("Clone Ejected: Loss of power.")

 	else if(mob_occupant && (mob_occupant.loc == src))
@@ -229,7 +229,7 @@
 				SPEAK("The cloning has been \
 					aborted due to unrecoverable tissue failure.")
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()

 		else if(mob_occupant.cloneloss > (100 - heal_level))
 			mob_occupant.Unconscious(80)
@@ -275,7 +275,7 @@
 					BP.attach_limb(mob_occupant)

 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()

 	else if (!mob_occupant || mob_occupant.loc != src)
 		occupant = null
@@ -323,7 +323,7 @@
 			SPEAK("An emergency ejection of the current clone has occurred. Survival not guaranteed.")
 			to_chat(user, "<span class='notice'>You force an emergency ejection. </span>")
 			go_out()
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 	else
 		return ..()

@@ -421,7 +421,7 @@
 		if(mob_occupant && prob(100/(severity*efficiency)))
 			connected_message(Gibberish("EMP-caused Accidental Ejection", 0))
 			SPEAK(Gibberish("Exposure to electromagnetic fields has caused the ejection of, ERROR: John Doe, prematurely." ,0))
-			mob_occupant.apply_vore_prefs()
+			mob_occupant.copy_from_prefs_vr()
 			go_out()

 /obj/machinery/clonepod/ex_act(severity, target)
@@ -136,7 +136,7 @@
 	if(connected && connected.is_operational())
 		if(connected.occupant)	//set occupant_status message
 			viable_occupant = connected.occupant
-			if(viable_occupant.has_dna() && !HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) && !HAS_TRAIT(viable_occupant, TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
+			if(viable_occupant.has_dna() && !HAS_TRAIT_NOT_FROM(viable_occupant, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) && !HAS_TRAIT(viable_occupant, TRAIT_NOCLONE) || (connected.scan_level == 3)) //occupant is viable for dna modification
 				occupant_status += "[viable_occupant.name] => "
 				switch(viable_occupant.stat)
 					if(CONSCIOUS)
@@ -948,7 +948,7 @@
 	var/mob/living/carbon/viable_occupant = null
 	if(connected)
 		viable_occupant = connected.occupant
-		if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT(viable_occupant, TRAIT_RADIMMUNE) || HAS_TRAIT(viable_occupant, TRAIT_NOCLONE))
+		if(!istype(viable_occupant) || !viable_occupant.dna || HAS_TRAIT_NOT_FROM(viable_occupant, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) || HAS_TRAIT(viable_occupant, TRAIT_NOCLONE))
 			viable_occupant = null
 	return viable_occupant

@@ -17,7 +17,7 @@ Buildable meters
 	icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
 	icon_state = "simple"
 	item_state = "buildpipe"
-	w_class = WEIGHT_CLASS_NORMAL
+	w_class = WEIGHT_CLASS_SMALL
 	level = 2
 	var/piping_layer = PIPING_LAYER_DEFAULT
 	var/RPD_type
@@ -409,7 +409,7 @@
 		if(iscarbon(A))
 			var/mob/living/carbon/C = A
 			//If not emagged, only target non downed carbons
-			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || C.recoveringstam))//CIT CHANGE - replaces check for lying with check for recoveringstam
+			if(mode != TURRET_LETHAL && (C.stat || C.handcuffed || (C.combat_flags & COMBAT_FLAG_HARD_STAMCRIT)))//CIT CHANGE - replaces check for lying with check for recoveringstam
 				continue

 			//If emagged, target all but dead carbons
@@ -52,9 +52,7 @@
 		pixel_y += round((cos(angle_override)+16*cos(angle_override)*2), 1)

 /obj/effect/projectile_lighting
-	var/owner

-/obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity, owner_key)
+/obj/effect/projectile_lighting/Initialize(mapload, color, range, intensity)
 	. = ..()
 	set_light(range, intensity, color)
-	owner = owner_key
@@ -1,4 +1,4 @@
-/proc/generate_tracer_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5, light_range = 2, light_color_override, light_intensity = 1, instance_key)		//Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported!
+/proc/generate_tracer_between_points(datum/point/starting, datum/point/ending, beam_type, color, qdel_in = 5, light_range = 2, light_color_override, light_intensity = 1, list/turfs)		//Do not pass z-crossing points as that will not be properly (and likely will never be properly until it's absolutely needed) supported!
 	if(!istype(starting) || !istype(ending) || !ispath(beam_type))
 		return
 	var/datum/point/midpoint = point_midpoint_points(starting, ending)
@@ -9,17 +9,15 @@
 	. = PB
 	if(light_range > 0 && light_intensity > 0)
 		var/list/turf/line = getline(starting.return_turf(), ending.return_turf())
-		tracing_line:
-			for(var/i in line)
-				var/turf/T = i
-				for(var/obj/effect/projectile_lighting/PL in T)
-					if(PL.owner == instance_key)
-						continue tracing_line
-				QDEL_IN(new /obj/effect/projectile_lighting(T, light_color_override, light_range, light_intensity, instance_key), qdel_in > 0? qdel_in : 5)
+		for(var/i in line)
+			if(turfs[i])
+				continue
+			turfs[i] = TRUE
+			QDEL_IN(new /obj/effect/projectile_lighting(i, light_color_override, light_range, light_intensity), qdel_in > 0? qdel_in : 5)
 		line = null
 	if(qdel_in)
 		QDEL_IN(PB, qdel_in)
-
+d
 /obj/effect/projectile/tracer
 	name = "beam"
 	icon = 'icons/obj/projectiles_tracer.dmi'
@@ -399,7 +399,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 												//If this were before the above checks, then trying to click on items would act a little funky and signal overrides wouldn't work.
 	if(iscarbon(usr))
 		var/mob/living/carbon/C = usr
-		if(C.combatmode && ((C.CanReach(src) || (src in directaccess)) && (C.CanReach(over) || (over in directaccess))))
+		if((C.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && ((C.CanReach(src) || (src in directaccess)) && (C.CanReach(over) || (over in directaccess))))
 			if(!C.get_active_held_item())
 				C.UnarmedAttack(src, TRUE)
 				if(C.get_active_held_item() == src)
@@ -496,7 +496,7 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 		to_chat(user, "<span class='danger'>You cannot locate any organic eyes on this brain!</span>")
 		return

-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit
+	if(IS_STAMCRIT(user))//CIT CHANGE - makes eyestabbing impossible if you're in stamina softcrit
 		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
 		return //CIT CHANGE - ditto

@@ -855,4 +855,19 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	return

 /obj/item/proc/unembedded()
-	return
+	return
+
+/**
+  * Sets our slowdown and updates equipment slowdown of any mob we're equipped on.
+  */
+/obj/item/proc/set_slowdown(new_slowdown)
+	slowdown = new_slowdown
+	if(CHECK_BITFIELD(item_flags, IN_INVENTORY))
+		var/mob/living/L = loc
+		if(istype(L))
+			L.update_equipment_speed_mods()
+
+/obj/item/vv_edit_var(var_name, var_value)
+	. = ..()
+	if(var_name == NAMEOF(src, slowdown))
+		set_slowdown(var_value)			//don't care if it's a duplicate edit as slowdown'll be set, do it anyways to force normal behavior.
@@ -803,7 +803,7 @@ SLIME SCANNER

 /obj/item/sequence_scanner/attack(mob/living/M, mob/living/carbon/human/user)
 	add_fingerprint(user)
-	if (!HAS_TRAIT(M, TRAIT_RADIMMUNE)) //no scanning if its a husk or DNA-less Species
+	if (!HAS_TRAIT_NOT_FROM(M, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT)) //no scanning if its a husk or DNA-less Species
 		user.visible_message("<span class='notice'>[user] analyzes [M]'s genetic sequence.</span>", \
 							"<span class='notice'>You analyze [M]'s genetic sequence.</span>")
 		gene_scan(M, user)
@@ -879,4 +879,4 @@ SLIME SCANNER
 	if(mutation in discovered)
 		return  "[HM.name] ([HM.alias])"
 	else
-		return HM.alias
+		return HM.alias
@@ -20,7 +20,7 @@
 	return attack_hand(user)

 /obj/item/dnainjector/proc/inject(mob/living/carbon/M, mob/user)
-	if(M.has_dna() && !HAS_TRAIT(M, TRAIT_RADIMMUNE) && !HAS_TRAIT(M, TRAIT_NOCLONE))
+	if(M.has_dna() && !HAS_TRAIT_NOT_FROM(M, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) && !HAS_TRAIT(M, TRAIT_NOCLONE))
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		for(var/HM in remove_mutations)
@@ -525,7 +525,7 @@
 	var/filled = FALSE

 /obj/item/dnainjector/activator/inject(mob/living/carbon/M, mob/user)
-	if(M.has_dna() && !HAS_TRAIT(M, TRAIT_RADIMMUNE) && !HAS_TRAIT(M,TRAIT_NOCLONE))
+	if(M.has_dna() && !HAS_TRAIT_NOT_FROM(M, TRAIT_RADIMMUNE,BLOODSUCKER_TRAIT) && !HAS_TRAIT(M,TRAIT_NOCLONE))
 		M.radiation += rand(20/(damage_coeff  ** 2),50/(damage_coeff  ** 2))
 		var/log_msg = "[key_name(user)] injected [key_name(M)] with the [name]"
 		for(var/mutation in add_mutations)
@@ -143,33 +143,61 @@

 /obj/item/melee/rapier
 	name = "plastitanium rapier"
-	desc = "A impossibly thin blade made of plastitanium with a tip made of diamond. It looks to be able to cut through any armor."
+	desc = "A thin blade made of plastitanium with a diamond tip. It appears to be coated in a persistent layer of an unknown substance."
 	icon = 'icons/obj/items_and_weapons.dmi'
 	icon_state = "rapier"
 	item_state = "rapier"
 	lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/weapons/swords_righthand.dmi'
-	force = 25
-	throwforce = 35
-	block_chance = 0
-	armour_penetration = 100
+	force = 15
+	throwforce = 25
+	block_chance = 50
+	armour_penetration = 200 //Apparently this gives it the ability to pierce block
 	flags_1 = CONDUCT_1
 	obj_flags = UNIQUE_RENAME
 	w_class = WEIGHT_CLASS_BULKY
 	sharpness = IS_SHARP_ACCURATE //It cant be sharpend cook -_-
-	attack_verb = list("slashed", "cut", "pierces", "pokes")
-	total_mass = 3.4
+	attack_verb = list("stabs", "punctures", "pierces", "pokes")
+	hitsound = 'sound/weapons/rapierhit.ogg'
+	total_mass = 0.4

 /obj/item/melee/rapier/Initialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 20, 65, 0)

+/obj/item/melee/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+	if(attack_type == PROJECTILE_ATTACK)
+		final_block_chance = 0
+	return ..()
+
+/obj/item/melee/rapier/on_exit_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/rapier/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/unsheath.ogg', 25, 1)
+	..()
+
+/obj/item/melee/rapier/on_enter_storage(datum/component/storage/S)
+	var/obj/item/storage/belt/sabre/rapier/B = S.parent
+	if(istype(B))
+		playsound(B, 'sound/items/sheath.ogg', 25, 1)
+	..()
+
 /obj/item/melee/rapier/get_belt_overlay()
 	return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "rapier")

 /obj/item/melee/rapier/get_worn_belt_overlay(icon_file)
 	return mutable_appearance(icon_file, "-rapier")

+/obj/item/melee/rapier/attack(mob/living/target, mob/living/user)
+	. = ..()
+	if(iscarbon(target))
+		var/mob/living/carbon/H = target
+		var/loss = H.getStaminaLoss()
+		H.Dizzy(10)
+		H.adjustStaminaLoss(30)
+		if((loss > 40) && prob(loss)) // if above 40, roll for sleep using 1% every 1 stamina damage
+			H.Sleeping(180)
+
 /obj/item/melee/classic_baton
 	name = "police baton"
 	desc = "A wooden truncheon for beating criminal scum."
@@ -240,7 +268,7 @@
 	if(!on)
 		return ..()

-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes batons unusuable in stamina softcrit
+	if(IS_STAMCRIT(user))//CIT CHANGE - makes batons unusuable in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
 		return //CIT CHANGE - ditto

@@ -42,7 +42,7 @@

 	var/mob/living/L = user

-	if(istype(L) && L.getStaminaLoss() >= STAMINA_SOFTCRIT)
+	if(istype(L) && IS_STAMCRIT(L))
 		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")
 		return

@@ -80,7 +80,7 @@
 					else
 						user.visible_message("<span class='notice'>[user] hugs [M] to make [M.p_them()] feel better!</span>", \
 								"<span class='notice'>You hug [M] to make [M.p_them()] feel better!</span>")
-					if(M.resting && !M.recoveringstam)
+					if(M.resting && !(M.combat_flags & COMBAT_FLAG_HARD_STAMCRIT))
 						M.set_resting(FALSE, TRUE)
 				else
 					user.visible_message("<span class='notice'>[user] pets [M]!</span>", \
@@ -99,7 +99,7 @@
 					else
 						user.visible_message("<span class='warning'>[user] hugs [M] in a firm bear-hug! [M] looks uncomfortable...</span>", \
 								"<span class='warning'>You hug [M] firmly to make [M.p_them()] feel better! [M] looks uncomfortable...</span>")
-					if(!CHECK_MOBILITY(M, MOBILITY_STAND) && !M.recoveringstam)
+					if(!CHECK_MOBILITY(M, MOBILITY_STAND) && !(M.combat_flags & COMBAT_FLAG_HARD_STAMCRIT))
 						M.set_resting(FALSE, TRUE)
 				else
 					user.visible_message("<span class='warning'>[user] bops [M] on the head!</span>", \
@@ -795,18 +795,12 @@

 /obj/item/storage/belt/sabre/rapier
 	name = "rapier sheath"
-	desc = "A black, thin sheath that looks to house only a long thin blade. Feels like its made of metal."
+	desc = "A sinister, thin sheath, suitable for a rapier."
 	icon_state = "rsheath"
 	item_state = "rsheath"
 	force = 5
 	throwforce = 15
-	block_chance = 30
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb = list("bashed", "slashes", "prods", "pokes")
 	fitting_swords = list(/obj/item/melee/rapier)
 	starting_sword = /obj/item/melee/rapier
-
-/obj/item/storage/belt/sabre/rapier/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
-	if(attack_type == PROJECTILE_ATTACK)
-		final_block_chance = 0 //To thin to block bullets
-	return ..()
@@ -189,7 +189,7 @@
 	new /obj/item/reagent_containers/medspray/silver_sulf(src)
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for
-	new /obj/item/clothing/glasses/hud/health/night(src)
+	new /obj/item/clothing/glasses/hud/health/night/syndicate(src)

 /obj/item/storage/firstaid/tactical/nukeop
 	name = "improved combat medical kit"
@@ -204,7 +204,7 @@
 	new /obj/item/reagent_containers/medspray/silver_sulf(src)
 	new /obj/item/healthanalyzer/advanced(src)
 	new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for
-	new /obj/item/clothing/glasses/hud/health/night(src)
+	new /obj/item/clothing/glasses/hud/health/night/syndicate(src)

 /*
 * Pill Bottles
@@ -259,6 +259,42 @@ GLOBAL_LIST_EMPTY(rubber_toolbox_icons)
 	new /obj/item/ammo_box/a762(src)
 	new /obj/item/ammo_box/a762(src)

+/obj/item/storage/toolbox/infiltrator
+	name = "insidious case"
+	desc = "Bearing the emblem of the Syndicate, this case contains a full infiltrator stealth suit, and has enough room to fit weaponry if necessary while being quite the heavy bludgeoning implement when in a pinch."
+	icon_state = "infiltrator_case"
+	item_state = "infiltrator_case"
+	force = 12
+	throwforce = 16
+	w_class = WEIGHT_CLASS_NORMAL
+	has_latches = FALSE
+
+/obj/item/storage/toolbox/infiltrator/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage)
+	STR.silent = TRUE
+	STR.max_items = 10
+	STR.max_w_class = WEIGHT_CLASS_NORMAL
+	STR.can_hold = typecacheof(list(
+		/obj/item/clothing/head/helmet/infiltrator,
+		/obj/item/clothing/suit/armor/vest/infiltrator,
+		/obj/item/clothing/under/syndicate/bloodred,
+		/obj/item/clothing/gloves/color/latex/nitrile/infiltrator,
+		/obj/item/clothing/mask/infiltrator,
+		/obj/item/clothing/shoes/combat/sneakboots,
+		/obj/item/gun/ballistic/automatic/pistol,
+		/obj/item/gun/ballistic/revolver,
+		/obj/item/ammo_box
+		))
+
+/obj/item/storage/toolbox/infiltrator/PopulateContents()
+	new /obj/item/clothing/head/helmet/infiltrator(src)
+	new /obj/item/clothing/suit/armor/vest/infiltrator(src)
+	new /obj/item/clothing/under/syndicate/bloodred(src)
+	new /obj/item/clothing/gloves/color/latex/nitrile/infiltrator(src)
+	new /obj/item/clothing/mask/infiltrator(src)
+	new /obj/item/clothing/shoes/combat/sneakboots(src)
+
 /obj/item/storage/toolbox/plastitanium/gold_real
 	name = "golden toolbox"
 	desc = "A larger then normal toolbox made of gold plated plastitanium."
@@ -374,6 +374,12 @@
 	for(var/i in 1 to 3)
 		new /obj/item/grenade/spawnergrenade/buzzkill(src)

+/obj/item/storage/box/syndie_kit/sleepytime/PopulateContents()
+	new /obj/item/clothing/under/syndicate/bloodred/sleepytime(src)
+	new /obj/item/reagent_containers/food/drinks/mug/coco(src)
+	new /obj/item/toy/plush/carpplushie(src)
+	new /obj/item/bedsheet/syndie(src)
+
 /obj/item/storage/box/syndie_kit/kitchen_gun
 	name = "Kitchen Gun (TM) package"

@@ -153,7 +153,7 @@
 		return FALSE
 	if(status && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
 		clowning_around(user)
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)			//CIT CHANGE - makes it impossible to baton in stamina softcrit
+	if(IS_STAMCRIT(user))			//CIT CHANGE - makes it impossible to baton in stamina softcrit
 		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")
 		return TRUE
 	if(ishuman(M))
@@ -58,7 +58,7 @@
 	var/obj/item/twohanded/offhand/O = user.get_inactive_held_item()
 	if(O && istype(O))
 		O.unwield()
-	slowdown -= slowdown_wielded
+	set_slowdown(slowdown - slowdown_wielded)

 /obj/item/twohanded/proc/wield(mob/living/carbon/user)
 	if(wielded)
@@ -88,7 +88,7 @@
 	O.desc = "Your second grip on [src]."
 	O.wielded = TRUE
 	user.put_in_inactive_hand(O)
-	slowdown += slowdown_wielded
+	set_slowdown(slowdown + slowdown_wielded)

 /obj/item/twohanded/dropped(mob/user)
 	. = ..()
@@ -248,7 +248,7 @@

 /obj/item/twohanded/fireaxe/afterattack(atom/A, mob/living/user, proximity)
 	. = ..()
-	if(!proximity || (user.getStaminaLoss() > STAMINA_SOFTCRIT))
+	if(!proximity || IS_STAMCRIT(user))		//don't make stamcrit message they'll already have gotten one from the primary attack.
 		return
 	if(wielded) //destroys windows and grilles in one hit (or more if it has a ton of health like plasmaglass)
 		if(istype(A, /obj/structure/window))
@@ -1171,7 +1171,7 @@
 		turn_off()

 /obj/item/twohanded/electrostaff/attack(mob/living/target, mob/living/user)
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)//CIT CHANGE - makes it impossible to baton in stamina softcrit
+	if(IS_STAMCRIT(user))//CIT CHANGE - makes it impossible to baton in stamina softcrit
 		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")//CIT CHANGE - ditto
 		return //CIT CHANGE - ditto
 	if(on && HAS_TRAIT(user, TRAIT_CLUMSY) && prob(50))
@@ -101,7 +101,7 @@
 		if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
 			to_chat(user, "<span class='warning'>You can't do that right now!</span>")
 			return TRUE
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		if(IS_STAMCRIT(user))
 			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
 			return TRUE
 		var/mob/living/poordude = buckled_mobs[1]
@@ -15,7 +15,7 @@
 	new /obj/item/ammo_box/magazine/m10mm(src)
 	new /obj/item/storage/belt/military(src)
 	new /obj/item/crowbar/red(src)
-	new /obj/item/clothing/glasses/night(src)
+	new /obj/item/clothing/glasses/night/syndicate(src)

 /obj/structure/closet/syndicate/nuclear
 	desc = "It's a storage unit for a Syndicate boarding party."
@@ -195,9 +195,7 @@
 		return
 	if(isgolem(user) && can_transfer)
 		var/transfer_choice = alert("Transfer your soul to [src]? (Warning, your old body will die!)",,"Yes","No")
-		if(transfer_choice != "Yes")
-			return
-		if(QDELETED(src) || uses <= 0)
+		if(transfer_choice != "Yes" || QDELETED(src) || uses <= 0 || !user.canUseTopic(src, BE_CLOSE, NO_DEXTERY, NO_TK))
 			return
 		log_game("[key_name(user)] golem-swapped into [src]")
 		user.visible_message("<span class='notice'>A faint light leaves [user], moving to [src] and animating it!</span>","<span class='notice'>You leave your old body behind, and transfer into [src]!</span>")
@@ -680,8 +678,9 @@
 		new_spawn.AddElement(/datum/element/dusts_on_catatonia)
 		new_spawn.AddElement(/datum/element/dusts_on_leaving_area,list(A.type,/area/hilbertshotel))
 		ADD_TRAIT(new_spawn, TRAIT_SIXTHSENSE, GHOSTROLE_TRAIT)
-		ADD_TRAIT(new_spawn,TRAIT_EXEMPT_HEALTH_EVENTS,GHOSTROLE_TRAIT)
-		ADD_TRAIT(new_spawn,TRAIT_PACIFISM,GHOSTROLE_TRAIT)
+		ADD_TRAIT(new_spawn, TRAIT_EXEMPT_HEALTH_EVENTS, GHOSTROLE_TRAIT)
+		ADD_TRAIT(new_spawn, TRAIT_NO_MIDROUND_ANTAG, GHOSTROLE_TRAIT) //The mob can't be made into a random antag, they are still elegible for ghost roles popups.
+		ADD_TRAIT(new_spawn, TRAIT_PACIFISM, GHOSTROLE_TRAIT)
 		to_chat(new_spawn,"<span class='boldwarning'>You may be sharing your cafe with some ninja-captured individuals, so make sure to only interact with the ghosts you hear as a ghost!</span>")
 		to_chat(new_spawn,"<span class='boldwarning'>You can turn yourself into a ghost and freely reenter your body with the ghost action.</span>")
 		var/datum/action/ghost/G = new(new_spawn)
@@ -260,7 +260,7 @@
 				return FALSE
 			if(ishuman(C) && !(lube & SLIP_WHEN_JOGGING))
 				var/mob/living/carbon/human/H = C
-				if(!H.sprinting && H.getStaminaLoss() <= 20)
+				if(!(H.combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && H.getStaminaLoss() <= 20)
 					return FALSE
 	if(!(lube&SLIDE_ICE))
 		to_chat(C, "<span class='notice'>You slipped[ O ? " on the [O.name]" : ""]!</span>")
@@ -27,7 +27,7 @@
 	INVOKE_ASYNC(B, /obj/effect/mine/pickup/bloodbath/.proc/mineEffect, H) //could use moving out from the mine

 	for(var/mob/living/carbon/human/P in GLOB.player_list)
-		if(P == H)
+		if(P == H || HAS_TRAIT(P, TRAIT_NO_MIDROUND_ANTAG))
 			continue
 		to_chat(P, "<span class='userdanger'>You have an overwhelming desire to kill [H]. [H.p_theyve(TRUE)] been marked red! Whoever [H.p_they()] [H.p_were()], friend or foe, go kill [H.p_them()]!</span>")
 		P.put_in_hands(new /obj/item/kitchen/knife/butcher(P), TRUE)
@@ -185,10 +185,10 @@
 	BuyPower(new /datum/action/bloodsucker/veil)
 	// Traits
 	for(var/T in defaultTraits)
-		ADD_TRAIT(owner.current, T, "bloodsucker")
+		ADD_TRAIT(owner.current, T, BLOODSUCKER_TRAIT)
 	if(HAS_TRAIT(owner.current, TRAIT_TOXINLOVER)) //No slime bonuses here, no thank you
 		had_toxlover = TRUE
-		REMOVE_TRAIT(owner.current, TRAIT_TOXINLOVER, "species")
+		REMOVE_TRAIT(owner.current, TRAIT_TOXINLOVER, SPECIES_TRAIT)
 	// Traits: Species
 	if(ishuman(owner.current))
 		var/mob/living/carbon/human/H = owner.current
@@ -235,9 +235,9 @@
 		// owner.RemoveSpell(power)
 	// Traits
 	for(var/T in defaultTraits)
-		REMOVE_TRAIT(owner.current, T, "bloodsucker")
+		REMOVE_TRAIT(owner.current, T, BLOODSUCKER_TRAIT)
 	if(had_toxlover == TRUE)
-		ADD_TRAIT(owner.current, TRAIT_TOXINLOVER, "species")
+		ADD_TRAIT(owner.current, TRAIT_TOXINLOVER, SPECIES_TRAIT)

 	// Traits: Species
 	if(ishuman(owner.current))
@@ -387,7 +387,7 @@
 	add_objective(heartthief_objective)
 	/*
 	else
-	
+
 		// Solars Objective, doesnt work due to TG updates.
 		var/datum/objective/bloodsucker/solars/solars_objective = new
 		solars_objective.owner = owner
@@ -6,7 +6,7 @@

 /datum/traitor_class/human/freeform/forge_objectives(datum/antagonist/traitor/T)
 	var/datum/objective/escape/O = new
-	O.explanation_text = "You have no goals! Whatever you can do do antagonize Nanotrasen, do it! The gimmickier, the better! Make sure to escape alive, though!"
+	O.explanation_text = "You have no explicit goals! While we don't approve of mindless slaughter, you may antagonize nanotrasen any way you wish! Make sure to escape alive and not in custody, though!"
 	O.owner = T.owner
 	T.add_objective(O)
 	return
@@ -211,7 +211,7 @@
 /datum/export/weapon/arrows
 	cost = 150
 	unit_name = "arrow"
-	export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ashen)
+	export_types = list(/obj/item/ammo_casing/caseless/arrow, /obj/item/ammo_casing/caseless/arrow/bone, /obj/item/ammo_casing/caseless/arrow/ash)

 /datum/export/weapon/bow_teaching
 	cost = 500
@@ -223,7 +223,6 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 			new /datum/admins(localhost_rank, ckey, 1, 1)
 	//preferences datum - also holds some persistent data for the client (because we may as well keep these datums to a minimum)
 	prefs = GLOB.preferences_datums[ckey]
-	prefs_vr = GLOB.vore_preferences_datums[ckey] //CITADEL EDIT bypassing a failing hook

 	if(prefs)
 		prefs.parent = src
@@ -231,13 +230,6 @@ GLOBAL_LIST_EMPTY(external_rsc_urls)
 		prefs = new /datum/preferences(src)
 		GLOB.preferences_datums[ckey] = prefs

-	if(prefs_vr)		//CITADEL EDIT bypassing a failing hook START
-		prefs_vr.client = src
-	else
-		prefs_vr = new/datum/vore_preferences(src)
-		GLOB.vore_preferences_datums[ckey] = prefs_vr
-						//CITADEL EDIT bypassing a failing hook END
-
 	prefs.last_ip = address				//these are gonna be used for banning
 	prefs.last_id = computer_id			//these are gonna be used for banning
 	fps = prefs.clientfps
@@ -121,39 +121,25 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 		"taur" = "None",
 		"genitals_use_skintone" = FALSE,
 		"has_cock" = FALSE,
-		"cock_shape" = "Human",
-		"cock_length" = 6,
+		"cock_shape" = DEF_COCK_SHAPE,
+		"cock_length" = COCK_SIZE_DEF,
 		"cock_diameter_ratio" = COCK_DIAMETER_RATIO_DEF,
 		"cock_color" = "fff",
-		"has_sheath" = FALSE,
-		"sheath_color" = "fff",
 		"has_balls" = FALSE,
 		"balls_internal" = FALSE,
 		"balls_color" = "fff",
-		"balls_amount" = 2,
-		"balls_sack_size" = BALLS_SACK_SIZE_DEF,
-		"balls_shape" = "Single",
+		"balls_shape" = DEF_BALLS_SHAPE,
 		"balls_size" = BALLS_SIZE_DEF,
 		"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" = "fff",
-		"has_eggsack" = FALSE,
-		"eggsack_internal" = TRUE,
-		"eggsack_color" = "fff",
-		"eggsack_size" = BALLS_SACK_SIZE_DEF,
-		"eggsack_egg_color" = "fff",
-		"eggsack_egg_size" = EGG_GIRTH_DEF,
 		"has_breasts" = FALSE,
 		"breasts_color" = "fff",
-		"breasts_size" = "C",
-		"breasts_shape" = "Pair",
+		"breasts_size" = BREASTS_SIZE_DEF,
+		"breasts_shape" = DEF_BREASTS_SHAPE,
 		"breasts_producing" = FALSE,
 		"has_vag" = FALSE,
-		"vag_shape" = "Human",
+		"vag_shape" = DEF_VAGINA_SHAPE,
 		"vag_color" = "fff",
 		"vag_clits" = 1,
 		"vag_clit_diam" = 0.25,
@@ -205,6 +191,14 @@ GLOBAL_LIST_EMPTY(preferences_datums)

 	var/action_buttons_screen_locs = list()

+	//bad stuff
+	var/digestable = FALSE
+	var/devourable = FALSE
+	var/feeding = FALSE
+	var/lickable = FALSE
+	var/list/belly_prefs = list()
+	var/vore_taste = "nothing in particular"
+
 	//backgrounds
 	var/mutable_appearance/character_background
 	var/icon/bgstate = "steel"
@@ -1483,7 +1477,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						age = max(min( round(text2num(new_age)), AGE_MAX),AGE_MIN)

 				if("flavor_text")
-					var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], MAX_FAVOR_LEN, TRUE)
+					var/msg = stripped_multiline_input(usr, "Set the flavor text in your 'examine' verb. This can also be used for OOC notes and preferences!", "Flavor Text", features["flavor_text"], MAX_FLAVOR_LEN, TRUE)
 					if(!isnull(msg))
 						features["flavor_text"] = html_decode(msg)

@@ -1916,6 +1910,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					new_dors = input(user, "Choose your character's dorsal tube type:", "Character Preference") as null|anything in GLOB.xeno_dorsal_list
 					if(new_dors)
 						features["xenodorsal"] = new_dors
+
 				//Genital code
 				if("cock_color")
 					var/new_cockcolor = input(user, "Penis color:", "Character Preference") as color|null
@@ -1956,22 +1951,6 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 					if(new_shape)
 						features["balls_shape"] = new_shape

-				if("egg_size")
-					var/new_size
-					var/list/egg_sizes = list(1,2,3)
-					new_size = input(user, "Egg Diameter(inches):", "Egg Size") as null|anything in egg_sizes
-					if(new_size)
-						features["eggsack_egg_size"] = new_size
-
-				if("egg_color")
-					var/new_egg_color = input(user, "Egg Color:", "Character Preference") as color|null
-					if(new_egg_color)
-						var/temp_hsv = RGBtoHSV(new_egg_color)
-						if(ReadHSV(temp_hsv)[3] >= ReadHSV("#202020")[3])
-							features["eggsack_egg_color"] = sanitize_hexcolor(new_egg_color)
-						else
-							to_chat(user,"<span class='danger'>Invalid color. Your color is not bright enough.</span>")
-
 				if("breasts_size")
 					var/new_size
 					new_size = input(user, "Breast Size", "Character Preference") as null|anything in GLOB.breasts_size_list
@@ -2105,14 +2084,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 						features["has_balls"] = FALSE
 				if("has_balls")
 					features["has_balls"] = !features["has_balls"]
-				if("has_ovi")
-					features["has_ovi"] = !features["has_ovi"]
-				if("has_eggsack")
-					features["has_eggsack"] = !features["has_eggsack"]
 				if("balls_internal")
 					features["balls_internal"] = !features["balls_internal"]
-				if("eggsack_internal")
-					features["eggsack_internal"] = !features["eggsack_internal"]
 				if("has_breasts")
 					features["has_breasts"] = !features["has_breasts"]
 					if(features["has_breasts"] == FALSE)
@@ -2301,16 +2274,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 				if("load")
 					load_preferences()
 					load_character()
-					if(parent && parent.prefs_vr)
-						attempt_vr(parent.prefs_vr,"load_vore","")

 				if("changeslot")
 					if(!load_character(text2num(href_list["num"])))
 						random_character()
 						real_name = random_unique_name(gender)
 						save_character()
-					if(parent && parent.prefs_vr)
-						attempt_vr(parent.prefs_vr,"load_vore","")

 				if("tab")
 					if (href_list["tab"])
@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	25
+#define SAVEFILE_VERSION_MAX	26

 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -115,6 +115,36 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(digi == "Digitigrade Legs")
 			WRITE_FILE(S["feature_lizard_legs"], "Digitigrade")

+	if(current_version < 26)
+		var/vr_path = "data/player_saves/[parent.ckey[1]]/[parent.ckey]/vore/character[default_slot].json"
+		if(fexists(vr_path))
+			var/list/json_from_file = json_decode(file2text(vr_path))
+			if(json_from_file)
+				digestable = json_from_file["digestable"]
+				devourable = json_from_file["devourable"]
+				feeding = json_from_file["feeding"]
+				lickable = json_from_file["lickable"]
+				belly_prefs = json_from_file["belly_prefs"]
+				vore_taste = json_from_file["vore_taste"]
+
+		for(var/V in all_quirks) // quirk migration
+			switch(V)
+				if("Acute hepatic pharmacokinesis")
+					DISABLE_BITFIELD(cit_toggles, PENIS_ENLARGEMENT)
+					DISABLE_BITFIELD(cit_toggles, BREAST_ENLARGEMENT)
+					ENABLE_BITFIELD(cit_toggles,FORCED_FEM)
+					ENABLE_BITFIELD(cit_toggles,FORCED_MASC)
+					all_quirks -= V
+				if("Crocin Immunity")
+					ENABLE_BITFIELD(cit_toggles,NO_APHRO)
+					all_quirks -= V
+				if("Buns of Steel")
+					ENABLE_BITFIELD(cit_toggles,NO_ASS_SLAP)
+					all_quirks -= V
+
+		if(features["meat_type"] == "Inesct")
+			features["meat_type"] = "Insect"
+
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
 		return
@@ -422,7 +452,6 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	S["feature_balls_color"]			>> features["balls_color"]
 	S["feature_balls_size"]				>> features["balls_size"]
 	S["feature_balls_shape"]			>> features["balls_shape"]
-	S["feature_balls_sack_size"]		>> features["balls_sack_size"]
 	//breasts features
 	S["feature_has_breasts"]			>> features["has_breasts"]
 	S["feature_breasts_size"]			>> features["breasts_size"]
@@ -446,6 +475,12 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	else //We have no old flavortext, default to new
 		S["feature_flavor_text"]		>> features["flavor_text"]

+	S["digestable"]						>> digestable
+	S["devourable"]						>> devourable
+	S["feeding"]						>> feeding
+	S["vore_taste"]						>> vore_taste
+	S["lickable"]						>> lickable
+	S["belly_prefs"]					>> belly_prefs

 	//try to fix any outdated data if necessary
 	if(needs_update >= 0)
@@ -510,6 +545,19 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	features["insect_markings"] 	= sanitize_inlist(features["insect_markings"], GLOB.insect_markings_list, "None")
 	features["insect_wings"] 		= sanitize_inlist(features["insect_wings"], GLOB.insect_wings_list)

+	features["breasts_size"]		= sanitize_inlist(features["breasts_size"], GLOB.breasts_size_list, BREASTS_SIZE_DEF)
+	features["breasts_shape"]		= sanitize_inlist(features["breasts_shape"], GLOB.breasts_shapes_list, DEF_BREASTS_SHAPE)
+	features["cock_shape"]			= sanitize_inlist(features["cock_shape"], GLOB.cock_shapes_list, DEF_COCK_SHAPE)
+	features["cock_length"]			= sanitize_integer(features["cock_length"], COCK_SIZE_MIN, COCK_SIZE_MAX, COCK_SIZE_DEF)
+	features["balls_shape"]			= sanitize_inlist(features["balls_shape"], GLOB.balls_shapes_list, DEF_BALLS_SHAPE)
+	features["vag_shape"]			= sanitize_inlist(features["vag_shape"], GLOB.vagina_shapes_list, DEF_VAGINA_SHAPE)
+	features["breasts_color"]		= sanitize_hexcolor(features["breasts_color"], 3, FALSE, "FFF")
+	features["cock_color"]			= sanitize_hexcolor(features["cock_color"], 3, FALSE, "FFF")
+	features["balls_color"]			= sanitize_hexcolor(features["balls_color"], 3, FALSE, "FFF")
+	features["vag_color"]			= sanitize_hexcolor(features["vag_color"], 3, FALSE, "FFF")
+
+	features["flavor_text"]			= copytext(features["flavor_text"], 1, MAX_FLAVOR_LEN)
+
 	joblessrole	= sanitize_integer(joblessrole, 1, 3, initial(joblessrole))
 	//Validate job prefs
 	for(var/j in job_preferences)
@@ -518,23 +566,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car

 	all_quirks = SANITIZE_LIST(all_quirks)

-	for(var/V in all_quirks) // quirk migration
-		switch(V)
-			if("Acute hepatic pharmacokinesis")
-				DISABLE_BITFIELD(cit_toggles, PENIS_ENLARGEMENT)
-				DISABLE_BITFIELD(cit_toggles, BREAST_ENLARGEMENT)
-				ENABLE_BITFIELD(cit_toggles,FORCED_FEM)
-				ENABLE_BITFIELD(cit_toggles,FORCED_MASC)
-				all_quirks -= V
-			if("Crocin Immunity")
-				ENABLE_BITFIELD(cit_toggles,NO_APHRO)
-				all_quirks -= V
-			if("Buns of Steel")
-				ENABLE_BITFIELD(cit_toggles,NO_ASS_SLAP)
-				all_quirks -= V
+	lickable						= sanitize_integer(lickable, FALSE, TRUE, initial(lickable))
+	devourable						= sanitize_integer(devourable, FALSE, TRUE, initial(devourable))
+	digestable						= sanitize_integer(digestable, FALSE, TRUE, initial(digestable))
+	feeding							= sanitize_integer(feeding, FALSE, TRUE, initial(feeding))
+	vore_taste						= copytext(vore_taste, 1, MAX_TASTE_LEN)
+	belly_prefs 					= SANITIZE_LIST(belly_prefs)

-	if(features["meat_type"] == "Inesct")
-		features["meat_type"] = "Insect"
 	cit_character_pref_load(S)

 	return 1
@@ -613,6 +651,13 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Quirks
 	WRITE_FILE(S["all_quirks"]			, all_quirks)

+	WRITE_FILE(S["digestable"]			, digestable)
+	WRITE_FILE(S["devourable"]			, devourable)
+	WRITE_FILE(S["feeding"]				, feeding)
+	WRITE_FILE(S["vore_taste"]			, vore_taste)
+	WRITE_FILE(S["lickable"]			, lickable)
+	WRITE_FILE(S["belly_prefs"]			, belly_prefs)
+
 	cit_character_pref_save(S)

 	return 1
@@ -447,7 +447,7 @@
 	permeability_coefficient = 0.01
 	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH

-	var/vchange = 1
+	var/voice_change = 1 ///This determines if the voice changer is on or off.

 	var/datum/action/item_action/chameleon/change/chameleon_action

@@ -470,15 +470,14 @@
 	chameleon_action.emp_randomise(INFINITY)

 /obj/item/clothing/mask/chameleon/attack_self(mob/user)
-	vchange = !vchange
-	to_chat(user, "<span class='notice'>The voice changer is now [vchange ? "on" : "off"]!</span>")
-
+	voice_change = !voice_change
+	to_chat(user, "<span class='notice'>The voice changer is now [voice_change ? "on" : "off"]!</span>")

 /obj/item/clothing/mask/chameleon/drone
 	//Same as the drone chameleon hat, undroppable and no protection
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
 	// Can drones use the voice changer part? Let's not find out.
-	vchange = 0
+	voice_change = 0

 /obj/item/clothing/mask/chameleon/drone/Initialize()
 	. = ..()
@@ -82,6 +82,7 @@
 	icon_state = "nvgmeson"
 	item_state = "nvgmeson"
 	darkness_view = 8
+	flash_protect = -2
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

@@ -119,10 +120,11 @@

 /obj/item/clothing/glasses/night
 	name = "night vision goggles"
-	desc = "You can totally see in the dark now!"
+	desc = "You can totally see in the dark now! Just don't look too closely at bright lights. This lacks any flash correction."
 	icon_state = "night"
 	item_state = "glasses"
 	darkness_view = 8
+	flash_protect = -2
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

@@ -130,6 +132,12 @@
 	name = "prescription night vision goggles"
 	desc = "NVGs but for those with nearsightedness."
 	vision_correction = 1
+	
+/obj/item/clothing/glasses/night/syndicate
+	name = "combat night vision goggles"
+	desc = "See everything, without fear."
+	flash_protect = 1
+	vision_correction = 1

 /obj/item/clothing/glasses/science/suicide_act(mob/living/carbon/user)
 	user.visible_message("<span class='suicide'>[user] is tightening \the [src]'s straps around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -63,12 +63,19 @@

 /obj/item/clothing/glasses/hud/health/night
 	name = "night vision health scanner HUD"
-	desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
+	desc = "An advanced medical heads-up display that allows doctors to find patients in complete darkness."
 	icon_state = "healthhudnight"
 	item_state = "glasses"
 	darkness_view = 8
+	flash_protect = -2
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green
+	
+/obj/item/clothing/glasses/hud/health/night/syndicate
+	name = "combat night vision health scanner HUD"
+	desc = "An advanced shielded medical heads-up display that allows soldiers to approximate how much lead poisoning their allies have suffered in complete darkness."
+	flash_protect = 1
+	vision_correction = 1

 /obj/item/clothing/glasses/hud/health/sunglasses
 	name = "medical HUDSunglasses"
@@ -126,6 +133,7 @@
 	icon_state = "diagnostichudnight"
 	item_state = "glasses"
 	darkness_view = 8
+	flash_protect = -2
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

@@ -199,6 +207,7 @@
 	desc = "An advanced heads-up display which provides id data and vision in complete darkness."
 	icon_state = "securityhudnight"
 	darkness_view = 8
+	flash_protect = -2 //You either are flashproof or you can see in the dark, pick one.
 	lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
 	glass_colour_type = /datum/client_colour/glass_colour/green

@@ -35,10 +35,10 @@
 		return
 	if(slot != SLOT_GLASSES)
 		return
-	RegisterSignal(user, COMSIG_COMBAT_TOGGLED, .proc/injectadrenaline)
+	RegisterSignal(user, COMSIG_LIVING_COMBAT_ENABLED, .proc/injectadrenaline)

 /obj/item/clothing/glasses/phantomthief/syndicate/dropped(mob/user)
 	. = ..()
 	if(!istype(user))
 		return
-	UnregisterSignal(user, COMSIG_COMBAT_TOGGLED)
+	UnregisterSignal(user, COMSIG_LIVING_COMBAT_ENABLED)
@@ -194,7 +194,7 @@

 /obj/item/clothing/gloves/color/latex
 	name = "latex gloves"
-	desc = "Cheap sterile gloves made from latex."
+	desc = "Cheap sterile gloves made from latex. Transfers basic paramedical knowledge to the wearer via the use of nanochips."
 	icon_state = "latex"
 	item_state = "lgloves"
 	siemens_coefficient = 0.3
@@ -202,14 +202,34 @@
 	item_color="mime"
 	transfer_prints = TRUE
 	resistance_flags = NONE
+	var/carrytrait = TRAIT_QUICK_CARRY
+
+/obj/item/clothing/gloves/color/latex/equipped(mob/user, slot)
+	..()
+	if(slot == SLOT_GLOVES)
+		ADD_TRAIT(user, carrytrait, CLOTHING_TRAIT)
+
+/obj/item/clothing/gloves/color/latex/dropped(mob/user)
+	..()
+	REMOVE_TRAIT(user, carrytrait, CLOTHING_TRAIT)

 /obj/item/clothing/gloves/color/latex/nitrile
 	name = "nitrile gloves"
-	desc = "Pricy sterile gloves that are stronger than latex."
+	desc = "Pricy sterile gloves that are stronger than latex. Transfers advanced paramedical knowledge to the wearer via the use of nanochips."
 	icon_state = "nitrile"
 	item_state = "nitrilegloves"
 	item_color = "cmo"
 	transfer_prints = FALSE
+	carrytrait = TRAIT_QUICKER_CARRY
+
+/obj/item/clothing/gloves/color/latex/nitrile/infiltrator
+	name = "insidious combat gloves"
+	desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge to the user via the use of nanochips."
+	icon_state = "infiltrator"
+	item_state = "infiltrator"
+	siemens_coefficient = 0
+	permeability_coefficient = 0.3
+	resistance_flags = FIRE_PROOF | ACID_PROOF

 /obj/item/clothing/gloves/color/white
 	name = "white gloves"
@@ -256,6 +256,21 @@
 	strip_delay = 100
 	mutantrace_variation = STYLE_MUZZLE

+/obj/item/clothing/head/helmet/infiltrator
+	name = "insidious helmet"
+	desc = "An insidious armored combat helmet signed with Syndicate insignia. The visor is coated with a resistant paste guaranteed to withstand bright flashes perfectly."
+	icon_state = "infiltrator"
+	item_state = "infiltrator"
+	armor = list("melee" = 40, "bullet" = 40, "laser" = 30, "energy" = 40, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	flash_protect = 2
+	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEFACE|HIDEHAIR|HIDEFACIALHAIR|HIDESNOUT
+	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+	dynamic_hair_suffix = ""
+	dynamic_fhair_suffix = ""
+	strip_delay = 80
+	mutantrace_variation = STYLE_MUZZLE
+
 //LightToggle

 /obj/item/clothing/head/helment/ComponentInitialize()
@@ -12,6 +12,20 @@
 /obj/item/clothing/mask/balaclava/attack_self(mob/user)
 	adjustmask(user)

+/obj/item/clothing/mask/infiltrator
+	name = "insidious balaclava"
+	desc = "An incredibly suspicious balaclava made with Syndicate nanofibers to absorb impacts slightly while obfuscating the voice and face using a garbled vocoder."
+	icon_state = "syndicate_balaclava"
+	item_state = "syndicate_balaclava"
+	clothing_flags = ALLOWINTERNALS
+	flags_cover = HEADCOVERSEYES
+	flags_inv = HIDEFACE|HIDEHAIR|HIDEFACIALHAIR
+	visor_flags_inv = HIDEFACE|HIDEFACIALHAIR
+	w_class = WEIGHT_CLASS_SMALL
+	armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 100, "acid" = 40)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	var/voice_unknown = TRUE ///This makes it so that your name shows up as unknown when wearing the mask.
+
 /obj/item/clothing/mask/luchador
 	name = "Luchador Mask"
 	desc = "Worn by robust fighters, flying high to defeat their foes!"
@@ -19,6 +19,14 @@
 	permeability_coefficient = 0.05 //Thick soles, and covers the ankle
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes

+/obj/item/clothing/shoes/combat/sneakboots
+	name = "insidious sneakboots"
+	desc = "A pair of insidious boots with special noise muffling soles which very slightly drown out your footsteps. They would be absolutely perfect for stealth operations were it not for the iconic Syndicate flairs."
+	icon_state = "sneakboots"
+	item_state = "sneakboots"
+	resistance_flags = FIRE_PROOF |  ACID_PROOF
+	clothing_flags = TRAIT_SILENT_STEP
+
 /obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
 	name = "\improper SWAT boots"
 	desc = "High speed, no drag combat boots."
@@ -191,6 +191,15 @@
 	. = ..()
 	allowed = GLOB.detective_vest_allowed

+/obj/item/clothing/suit/armor/vest/infiltrator
+	name = "insidious combat vest"
+	desc = "An insidious combat vest designed using Syndicate nanofibers to absorb the supreme majority of kinetic blows. Although it doesn't look like it'll do too much for energy impacts."
+	icon_state = "infiltrator"
+	item_state = "infiltrator"
+	armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 30, "bomb" = 70, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	strip_delay = 80
+
 //All of the armor below is mostly unused

 /obj/item/clothing/suit/armor/centcom
@@ -12,6 +12,7 @@
 	var/can_adjust = TRUE
 	var/adjusted = NORMAL_STYLE
 	var/alt_covers_chest = FALSE // for adjusted/rolled-down jumpsuits, FALSE = exposes chest and arms, TRUE = exposes arms only
+	var/dummy_thick = FALSE // is able to hold accessories on its item
 	var/obj/item/clothing/accessory/attached_accessory
 	var/mutable_appearance/accessory_overlay
 	mutantrace_variation = STYLE_DIGITIGRADE
@@ -82,6 +83,10 @@
 			if(user)
 				to_chat(user, "<span class='warning'>[src] already has an accessory.</span>")
 			return
+		if(dummy_thick)
+			if(user)
+				to_chat(user, "<span class='warning'>[src] is too bulky and cannot have accessories attached to it!</span>")
+			return
 		else
 			if(user && !user.temporarilyRemoveItemFromInventory(I))
 				return
@@ -19,6 +19,25 @@
 	alt_covers_chest = TRUE
 	fitted = FEMALE_UNIFORM_TOP

+/obj/item/clothing/under/syndicate/bloodred
+	name = "blood-red sneaksuit"
+	desc = "An insidious armored jumpsuit lined with Syndicate nanofibers and prototype platings, slightly resistant to most forms of damage, but is far too bulky to have anything attached to it. It still counts as stealth if there are no witnesses."
+	icon_state = "bloodred_pajamas"
+	item_state = "bl_suit"
+	item_color = "bloodred_pajamas"
+	dummy_thick = TRUE
+	armor = list("melee" = 10, "bullet" = 10, "laser" = 10,"energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 10, "fire" = 50, "acid" = 40)
+	resistance_flags = FIRE_PROOF | ACID_PROOF
+	can_adjust = FALSE
+
+/obj/item/clothing/under/syndicate/bloodred/sleepytime
+	name = "blood-red pajamas"
+	desc = "Do operatives dream of nuclear sheep?"
+	icon_state = "bloodred_pajamas"
+	item_state = "bl_suit"
+	item_color = "bloodred_pajamas"
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40)
+
 /obj/item/clothing/under/syndicate/tacticool
 	name = "tacticool turtleneck"
 	desc = "Just looking at it makes you want to buy an SKS, go into the woods, and -operate-."
@@ -75,7 +94,7 @@
 	item_color = "rus_under"
 	can_adjust = FALSE
 	armor = list("melee" = 5, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
-	resistance_flags = NONE 
+	resistance_flags = NONE

 /obj/item/clothing/under/syndicate/baseball
 	name = "major league, number unknown"
@@ -16,13 +16,14 @@
 	..()
 	for(var/mob/living/carbon/human/H in GLOB.alive_mob_list)
 		H.put_in_hands(new /obj/item/valentine)
-		var/obj/item/storage/backpack/b = locate() in H.contents
-		new /obj/item/reagent_containers/food/snacks/candyheart(b)
-		new /obj/item/storage/fancy/heart_box(b)
+		var/obj/item/storage/backpack/B = locate() in H.contents
+		if(B)
+			new /obj/item/reagent_containers/food/snacks/candyheart(B)
+			new /obj/item/storage/fancy/heart_box(B)

 	var/list/valentines = list()
 	for(var/mob/living/M in GLOB.player_list)
-		if(!M.stat && M.client && M.mind)
+		if(!M.stat && M.client && M.mind && !HAS_TRAIT(M, TRAIT_NO_MIDROUND_ANTAG))
 			valentines |= M


@@ -4,11 +4,26 @@
 	weight = 10
 	max_occurrences = 2
 	min_players = 1
+	var/forced_hallucination
+
+/datum/round_event_control/mass_hallucination/admin_setup()
+	if(!check_rights(R_FUN))
+		return
+	
+	forced_hallucination = input(usr, "Choose the hallucination to apply","Send Hallucination") as null|anything in subtypesof(/datum/hallucination)

 /datum/round_event/mass_hallucination
 	fakeable = FALSE

 /datum/round_event/mass_hallucination/start()
+	var/datum/round_event_control/mass_hallucination/M = control
+	if(M.forced_hallucination)
+		for(var/mob/living/carbon/C in GLOB.alive_mob_list)
+			if (HAS_TRAIT(C,TRAIT_EXEMPT_HEALTH_EVENTS))
+				continue
+			new M.forced_hallucination(C, TRUE)
+		return
+
 	switch(rand(1,4))
 		if(1) //same sound for everyone
 			var/sound = pick("airlock","airlock_pry","console","explosion","far_explosion","mech","glass","alarm","beepsky","mech","wall_decon","door_hack","tesla")
@@ -37,4 +52,4 @@
 			for(var/mob/living/carbon/C in GLOB.alive_mob_list)
 				if (HAS_TRAIT(C,TRAIT_EXEMPT_HEALTH_EVENTS))
 					continue
-				new picked_hallucination(C, TRUE)
+				new picked_hallucination(C, TRUE)
@@ -49,6 +49,10 @@
 		to_chat(user, "<span class='notice'>You place [I] into [src] to start the fermentation process.</span>")
 		addtimer(CALLBACK(src, .proc/makeWine, fruit), rand(80, 120) * speed_multiplier)
 		return TRUE
+	var/obj/item/W = I
+	if(W)
+		if(W.is_refillable())
+			return FALSE //so we can refill them via their afterattack.
 	else
 		return ..()

@@ -4,6 +4,6 @@
 			toggle_throw_mode()
 			return
 		if("C")
-			toggle_combat_mode()
+			user_toggle_intentional_combat_mode()
 			return
 	return ..()
@@ -59,11 +59,11 @@
 	switch(_key)
 		if("Shift")
 			if(!user.prefs.sprint_spacebar)
-				user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE) //Yes, this looks hacky. Yes, this works.
+				user.prefs.sprint_toggle ? default_toggle_sprint() : sprint_hotkey(TRUE) //Yes, this looks hacky. Yes, this works.
 			return
 		if("Space")
 			if(user.prefs.sprint_spacebar)
-				user.prefs.sprint_toggle ? togglesprint() : sprint_hotkey(TRUE)
+				user.prefs.sprint_toggle ? default_toggle_sprint() : sprint_hotkey(TRUE)
 			return
 	return ..()

@@ -136,7 +136,7 @@
 	desc = "A device which causes kinetic accelerators to permanently gain damage against creature types killed with it."
 	id = "bountymod"
 	materials = list(/datum/material/iron = 4000, /datum/material/silver = 4000, /datum/material/gold = 4000, /datum/material/bluespace = 4000)
-	reagents_list = list("blood" = 40)
+	reagents_list = list(/datum/reagent/blood = 40)
 	build_path = /obj/item/borg/upgrade/modkit/bounty

 //Spooky special loot
@@ -237,7 +237,7 @@
 		return /datum/reagent/blood/jellyblood
 	if(dna?.species?.exotic_blood)
 		return dna.species.exotic_blood
-	else if((NOBLOOD in dna.species.species_traits) || (HAS_TRAIT(src, TRAIT_NOCLONE)))
+	else if((dna && (NOBLOOD in dna.species.species_traits)) || HAS_TRAIT(src, TRAIT_NOCLONE))
 		return
 	else
 		return /datum/reagent/blood
@@ -21,7 +21,7 @@ In all, this is a lot like the monkey code. /N
 		return
 	switch(M.a_intent)
 		if (INTENT_HELP)
-			if(!recoveringstam)
+			if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT))
 				set_resting(FALSE, TRUE, FALSE)
 			AdjustAllImmobility(-60, FALSE)
 			AdjustUnconscious(-60, FALSE)
@@ -27,7 +27,7 @@
 		else
 			if(stat == UNCONSCIOUS)
 				stat = CONSCIOUS
-				if(!recoveringstam)
+				if(!(combat_flags & COMBAT_FLAG_HARD_STAMCRIT))
 					set_resting(FALSE, TRUE)
 				adjust_blindness(-1)
 				update_mobility()
@@ -153,7 +153,7 @@
 		return

 	//CIT CHANGES - makes it impossible to throw while in stamina softcrit
-	if(getStaminaLoss() >= STAMINA_SOFTCRIT)
+	if(IS_STAMCRIT(src))
 		to_chat(src, "<span class='warning'>You're too exhausted.</span>")
 		return
 	var/random_turn = a_intent == INTENT_HARM
@@ -448,7 +448,7 @@
 		modifier -= 40 //Clumsy people are more likely to hit themselves -Honk!

 	//CIT CHANGES START HERE
-	else if(combatmode)
+	else if(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)
 		modifier += 50

 	if(modifier < 100)
@@ -820,15 +820,13 @@
 			return
 		if(IsUnconscious() || IsSleeping() || getOxyLoss() > 50 || (HAS_TRAIT(src, TRAIT_DEATHCOMA)) || (health <= HEALTH_THRESHOLD_FULLCRIT && !HAS_TRAIT(src, TRAIT_NOHARDCRIT)))
 			stat = UNCONSCIOUS
+			disable_intentional_combat_mode(FALSE, FALSE)
 			if(!eye_blind)
 				blind_eyes(1)
-			if(combatmode)
-				toggle_combat_mode(TRUE, TRUE)
 		else
 			if(health <= crit_threshold && !HAS_TRAIT(src, TRAIT_NOSOFTCRIT))
 				stat = SOFT_CRIT
-				if(combatmode)
-					toggle_combat_mode(TRUE, TRUE)
+				disable_intentional_combat_mode(FALSE, FALSE)
 			else
 				stat = CONSCIOUS
 			adjust_blindness(-1)
@@ -1011,8 +1009,7 @@
 			return TRUE

 /mob/living/carbon/transfer_ckey(mob/new_mob, send_signal = TRUE)
-	if(combatmode)
-		toggle_combat_mode(TRUE, TRUE)
+	disable_intentional_combat_mode(TRUE, FALSE)
 	return ..()

 /mob/living/carbon/can_see_reagents()
@@ -0,0 +1,6 @@
+/mob/living/carbon/enable_intentional_combat_mode()
+	. = ..()
+	if(.)
+		if(voremode)
+			toggle_vore_mode()
+
@@ -79,13 +79,11 @@
 /mob/living/carbon/attacked_by(obj/item/I, mob/living/user)
 	//CIT CHANGES START HERE - combatmode and resting checks
 	var/totitemdamage = I.force
-	if(iscarbon(user))
-		var/mob/living/carbon/tempcarb = user
-		if(!tempcarb.combatmode)
-			totitemdamage *= 0.5
+	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+		totitemdamage *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		totitemdamage *= 0.5
-	if(!combatmode)
+	if(!(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 		totitemdamage *= 1.5
 	//CIT CHANGES END HERE
 	if(user != src && check_shields(I, totitemdamage, "the [I.name]", MELEE_ATTACK, I.armour_penetration))
@@ -348,7 +346,7 @@
 		AdjustAllImmobility(-60, FALSE)
 		AdjustUnconscious(-60, FALSE)
 		AdjustSleeping(-100, FALSE)
-		if(recoveringstam)
+		if(combat_flags & COMBAT_FLAG_HARD_STAMCRIT)
 			adjustStaminaLoss(-15)
 		else
 			set_resting(FALSE, FALSE)
@@ -0,0 +1,18 @@
+/// Sprint buffer ///
+/mob/living/carbon/doSprintLossTiles(tiles)
+	doSprintBufferRegen(FALSE)		//first regen.
+	if(sprint_buffer)
+		var/use = min(tiles, sprint_buffer)
+		sprint_buffer -= use
+		tiles -= use
+	update_hud_sprint_bar()
+	if(!tiles)		//we had enough, we're done!
+		return
+	adjustStaminaLoss(tiles * sprint_stamina_cost)		//use stamina to cover deficit.
+
+/mob/living/carbon/proc/doSprintBufferRegen(updating = TRUE)
+	var/diff = world.time - sprint_buffer_regen_last
+	sprint_buffer_regen_last = world.time
+	sprint_buffer = min(sprint_buffer_max, sprint_buffer + sprint_buffer_regen_ds * diff)
+	if(updating)
+		update_hud_sprint_bar()
@@ -7,8 +7,8 @@

 	if(!gibbed)
 		emote("deathgasp")
-	if(combatmode)
-		toggle_combat_mode(TRUE, TRUE)
+
+	disable_intentional_combat_mode(TRUE, FALSE)

 	. = ..()

@@ -67,6 +67,5 @@
 		BP.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)

 /mob/living/carbon/ghostize(can_reenter_corpse = TRUE, special = FALSE, penalize = FALSE, voluntary = FALSE)
-	if(combatmode)
-		toggle_combat_mode(TRUE, TRUE)
+	disable_intentional_combat_mode(TRUE, FALSE)
 	return ..()
@@ -90,7 +90,7 @@
 		if(digitalcamo)
 			. += "[t_He] [t_is] moving [t_his] body in an unnatural and blatantly unsimian manner."

-	if(combatmode)
+	if(combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)
 		. += "[t_He] [t_is] visibly tense[CHECK_MOBILITY(src, MOBILITY_STAND) ? "." : ", and [t_is] standing in combative stance."]"

 	var/trait_exam = common_trait_examine()
@@ -29,7 +29,7 @@
 	. = ..()

 	if(CONFIG_GET(flag/disable_stambuffer))
-		togglesprint()
+		enable_intentional_sprint_mode()

 	RegisterSignal(src, COMSIG_COMPONENT_CLEAN_ACT, /atom.proc/clean_blood)

@@ -707,7 +707,7 @@

 /mob/living/carbon/human/wash_cream()
 	if(creamed) //clean both to prevent a rare bug
-		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_lizard"))
+		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_snout"))
 		cut_overlay(mutable_appearance('icons/effects/creampie.dmi', "creampie_human"))
 		creamed = FALSE

@@ -880,10 +880,20 @@
 	return (ishuman(target) && !CHECK_MOBILITY(target, MOBILITY_STAND))

 /mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target)
-	if(can_be_firemanned(target))
-		visible_message("<span class='notice'>[src] starts lifting [target] onto their back...</span>",
-			"<span class='notice'>You start lifting [target] onto your back...</span>")
-		if(do_after(src, 30, TRUE, target))
+	var/carrydelay = 50 //if you have latex you are faster at grabbing
+	var/skills_space = "" //cobby told me to do this
+	if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY))
+		carrydelay = 30
+		skills_space = "expertly"
+	else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY))
+		carrydelay = 40
+		skills_space = "quickly"
+	if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE))
+		visible_message("<span class='notice'>[src] starts [skills_space] lifting [target] onto their back..</span>",
+		//Joe Medic starts quickly/expertly lifting Grey Tider onto their back..
+		"<span class='notice'>[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]</span>")
+		//(Using your gloves' nanochips, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, while assisted by the nanochips in your gloves../...)
+		if(do_after(src, carrydelay, TRUE, target))
 			//Second check to make sure they're still valid to be carried
 			if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE))
 				target.set_resting(FALSE, TRUE)
@@ -6,6 +6,9 @@
 	can_buckle = TRUE
 	buckle_lying = FALSE
 	mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
+	/// Enable stamina combat
+	combat_flags = COMBAT_FLAGS_DEFAULT
+
 	//Hair colour and style
 	var/hair_color = "000"
 	var/hair_style = "Bald"
@@ -1,5 +1,5 @@
 /mob/living/carbon/human/resist_a_rest(automatic = FALSE, ignoretimer = FALSE)
-	if(!resting || stat || attemptingstandup)
+	if(!resting || stat || (combat_flags & COMBAT_FLAG_RESISTING_REST))
 		return FALSE
 	if(ignoretimer)
 		set_resting(FALSE, FALSE)
@@ -13,10 +13,10 @@
 		return FALSE
 	else
 		var/totaldelay = 3 //A little bit less than half of a second as a baseline for getting up from a rest
-		if(getStaminaLoss() >= STAMINA_SOFTCRIT)
+		if(IS_STAMCRIT(src))
 			to_chat(src, "<span class='warning'>You're too exhausted to get up!")
 			return FALSE
-		attemptingstandup = TRUE
+		combat_flags |= COMBAT_FLAG_RESISTING_REST
 		var/health_deficiency = max((maxHealth - (health - getStaminaLoss()))*0.5, 0)
 		if(!has_gravity())
 			health_deficiency = health_deficiency*0.2
@@ -37,10 +37,11 @@
 		visible_message("<span class='notice'>[standupwarning]</span>", usernotice, vision_distance = 5)
 		if(do_after(src, totaldelay, target = src, required_mobility_flags = MOBILITY_RESIST))
 			set_resting(FALSE, TRUE)
-			attemptingstandup = FALSE
+
+			combat_flags &= ~COMBAT_FLAG_RESISTING_REST
 			return TRUE
 		else
-			attemptingstandup = FALSE
+			combat_flags &= ~COMBAT_FLAG_RESISTING_REST
 			if(resting)		//we didn't shove ourselves up or something
 				visible_message("<span class='notice'>[src] falls right back down.</span>", "<span class='notice'>You fall right back down.</span>")
 				if(has_gravity())
@@ -9,6 +9,13 @@

 /mob/living/carbon/human/movement_delay()
 	. = ..()
+	if(CHECK_MOBILITY(src, MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE))
+		var/static/datum/config_entry/number/movedelay/sprint_speed_increase/SSI
+		if(!SSI)
+			SSI = CONFIG_GET_ENTRY(number/movedelay/sprint_speed_increase)
+		. -= SSI.config_entry_value
+	if(wrongdirmovedelay)
+		. += 1
 	if (m_intent == MOVE_INTENT_WALK && HAS_TRAIT(src, TRAIT_SPEEDY_STEP))
 		. -= 1.5

@@ -42,10 +49,18 @@
 	return ((shoes && shoes.negates_gravity()) || (dna.species.negates_gravity(src)))

 /mob/living/carbon/human/Move(NewLoc, direct)
+	var/oldpseudoheight = pseudo_z_axis
 	. = ..()
 	for(var/datum/mutation/human/HM in dna.mutations)
 		HM.on_move(src, NewLoc)
-
+	if(. && (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE) && !(movement_type & FLYING) && CHECK_ALL_MOBILITY(src, MOBILITY_MOVE|MOBILITY_STAND) && m_intent == MOVE_INTENT_RUN && has_gravity(loc) && !pulledby)
+		if(!HAS_TRAIT(src, TRAIT_FREESPRINT))
+			doSprintLossTiles(1)
+		if((oldpseudoheight - pseudo_z_axis) >= 8)
+			to_chat(src, "<span class='warning'>You trip off of the elevated surface!</span>")
+			for(var/obj/item/I in held_items)
+				accident(I)
+			DefaultCombatKnockdown(80)
 	if(shoes)
 		if(!lying && !buckled)
 			if(loc == NewLoc)
@@ -13,7 +13,7 @@
 /mob/living/carbon/human/GetVoice()
 	if(istype(wear_mask, /obj/item/clothing/mask/chameleon))
 		var/obj/item/clothing/mask/chameleon/V = wear_mask
-		if(V.vchange && wear_id)
+		if(V.voice_change && wear_id)
 			var/obj/item/card/id/idcard = wear_id.GetID()
 			if(istype(idcard))
 				return idcard.registered_name
@@ -21,6 +21,12 @@
 				return real_name
 		else
 			return real_name
+	if(istype(wear_mask, /obj/item/clothing/mask/infiltrator))
+		var/obj/item/clothing/mask/infiltrator/V = wear_mask
+		if(V.voice_unknown)
+			return ("Unknown")
+		else
+			return real_name
 	if(mind)
 		var/datum/antagonist/changeling/changeling = mind.has_antag_datum(/datum/antagonist/changeling)
 		if(changeling && changeling.mimicing )
@@ -1450,15 +1450,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		target.grabbedby(user)
 		return 1

-
-
-
-
 /datum/species/proc/harm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
 	if(!attacker_style && HAS_TRAIT(user, TRAIT_PACIFISM))
 		to_chat(user, "<span class='warning'>You don't want to harm [target]!</span>")
 		return FALSE
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT) //CITADEL CHANGE - makes it impossible to punch while in stamina softcrit
+	if(IS_STAMCRIT(user)) //CITADEL CHANGE - makes it impossible to punch while in stamina softcrit
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>") //CITADEL CHANGE - ditto
 		return FALSE //CITADEL CHANGE - ditto
 	if(target.check_block())
@@ -1487,11 +1483,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		var/damage = rand(user.dna.species.punchdamagelow, user.dna.species.punchdamagehigh)

 		//CITADEL CHANGES - makes resting and disabled combat mode reduce punch damage, makes being out of combat mode result in you taking more damage
-		if(!target.combatmode && damage < user.dna.species.punchstunthreshold)
+		if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE) && damage < user.dna.species.punchstunthreshold)
 			damage = user.dna.species.punchstunthreshold - 1
 		if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 			damage *= 0.5
-		if(!user.combatmode)
+		if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 			damage *= 0.25
 		//END OF CITADEL CHANGES

@@ -1540,12 +1536,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/aim_for_groin  = user.zone_selected == "groin"
 	var/target_aiming_for_groin = target.zone_selected == "groin"

-	if(target.check_block()) //END EDIT
-		target.visible_message("<span class='warning'>[target] blocks [user]'s disarm attempt!</span>")
-		return 0
-	else if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+	if(IS_STAMCRIT(user))
 		to_chat(user, "<span class='warning'>You're too exhausted!</span>")
 		return FALSE
+	else if(target.check_block())
+		target.visible_message("<span class='warning'>[target] blocks [user]'s disarm attempt!</span>")
+		return FALSE

 	else if(aim_for_mouth && ( target_on_help || target_restrained || target_aiming_for_mouth))
 		playsound(target.loc, 'sound/weapons/slap.ogg', 50, 1, -1)
@@ -1605,11 +1601,11 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 			target.forcesay(GLOB.hit_appends)
 			log_combat(user, target, "pushed over")
 			return*/
-		if(!target.combatmode) // CITADEL CHANGE
+		if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)) // CITADEL CHANGE
 			randn += -10 //CITADEL CHANGE - being out of combat mode makes it easier for you to get disarmed
 		if(!CHECK_MOBILITY(user, MOBILITY_STAND)) //CITADEL CHANGE
 			randn += 100 //CITADEL CHANGE - No kosher disarming if you're resting
-		if(!user.combatmode) //CITADEL CHANGE
+		if(!(target.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE)) //CITADEL CHANGE
 			randn += 25 //CITADEL CHANGE - Makes it harder to disarm outside of combat mode
 		if(user.pulling == target)
 			randn += -20 //If you have the time to get someone in a grab, you should have a greater chance at snatching the thing in their hand. Will be made completely obsolete by the grab rework but i've got a poor track record for releasing big projects on time so w/e i guess
@@ -1686,14 +1682,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 	var/Iforce = I.force //to avoid runtimes on the forcesay checks at the bottom. Some items might delete themselves if you drop them. (stunning yourself, ninja swords)
 	//CIT CHANGES START HERE - combatmode and resting checks
 	var/totitemdamage = I.force
-	if(iscarbon(user))
-		var/mob/living/carbon/tempcarb = user
-		if(!tempcarb.combatmode)
-			totitemdamage *= 0.5
+	if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+		totitemdamage *= 0.5
 	if(!CHECK_MOBILITY(user, MOBILITY_STAND))
 		totitemdamage *= 0.5
 	if(istype(H))
-		if(!H.combatmode)
+		if(!(H.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
 			totitemdamage *= 1.5
 	//CIT CHANGES END HERE
 	var/weakness = H.check_weakness(I, user)
@@ -1803,9 +1797,12 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)

 /datum/species/proc/althelp(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
 	if(user == target && istype(user))
-		if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		if(IS_STAMCRIT(user))
 			to_chat(user, "<span class='warning'>You're too exhausted for that.</span>")
 			return
+		if(!(user.combat_flags & COMBAT_FLAG_COMBAT_ACTIVE))
+			to_chat(user, "<span class='warning'>You need combat mode to be active to that!</span>")
+			return
 		if(user.IsKnockdown() || user.IsParalyzed() || user.IsStun())
 			to_chat(user, "<span class='warning'>You can't seem to force yourself up right now!</span>")
 			return
@@ -1818,7 +1815,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
 		playsound(user, 'sound/weapons/thudswoosh.ogg', 50, 1, -1)

 /datum/species/proc/altdisarm(mob/living/carbon/human/user, mob/living/carbon/human/target, datum/martial_art/attacker_style)
-	if(user.getStaminaLoss() >= STAMINA_SOFTCRIT)
+	if(IS_STAMCRIT(user))
 		to_chat(user, "<span class='warning'>You're too exhausted.</span>")
 		return FALSE
 	if(target.check_block())
@@ -24,7 +24,7 @@
 	id = "spaceskeleton"
 	limbs_id = "skeleton"
 	blacklisted = 1
-	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT,TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)
+	inherent_traits = list(TRAIT_RESISTHEAT,TRAIT_NOBREATH,TRAIT_RESISTCOLD,TRAIT_RESISTHIGHPRESSURE,TRAIT_RESISTLOWPRESSURE,TRAIT_RADIMMUNE,TRAIT_PIERCEIMMUNE,TRAIT_NOHUNGER,TRAIT_EASYDISMEMBER,TRAIT_LIMBATTACHMENT, TRAIT_FAKEDEATH, TRAIT_CALCIUM_HEALER)

 /datum/species/skeleton/space/check_roundstart_eligible()
 	return FALSE
--- a/Show More
+++ b/Show More