Merge branch 'master' into Steals-plushies

_maps/map_files/Deltastation/DeltaStation2_bubber.dmm

@@ -82188,6 +82188,15 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 4
 	},
+/mob/living/simple_animal/pet/cat{
+	desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!";
+	icon = 'modular_zubbers/icons/mob/simple/pets.dmi';
+	icon_dead = "pancake_dead";
+	icon_living = "pancake";
+	icon_state = "pancake";
+	minbodytemp = 0;
+	name = "Pancake"
+	},
 /turf/open/floor/wood/large,
 /area/station/medical/psychology)
 "tUR" = (

_maps/map_files/IceBoxStation/IceBoxStation_bubber.dmm

@@ -58181,6 +58181,14 @@
 "ryu" = (
 /turf/open/floor/iron/dark/textured,
 /area/station/security/execution/transfer)
+"ryv" = (
+/obj/effect/turf_decal/tile/neutral,
+/obj/effect/turf_decal/tile/neutral{
+	dir = 8
+	},
+/obj/machinery/vending/dorms,
+/turf/open/floor/iron,
+/area/station/commons/dorms)
 "ryC" = (
 /obj/structure/cable,
 /obj/structure/fence/door/opened,
@@ -64282,7 +64290,7 @@
 /area/station/medical/chemistry)
 "ttk" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /obj/machinery/duct,
@@ -66795,6 +66803,18 @@
 /obj/structure/sign/warning/docking/directional/south,
 /turf/open/floor/iron,
 /area/station/hallway/secondary/entry)
+"uen" = (
+/mob/living/simple_animal/pet/cat{
+	desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!";
+	icon = 'modular_zubbers/icons/mob/simple/pets.dmi';
+	icon_dead = "pancake_dead";
+	icon_living = "pancake";
+	icon_state = "pancake";
+	minbodytemp = 0;
+	name = "Pancake"
+	},
+/turf/open/floor/carpet/blue,
+/area/station/medical/psychology)
 "ueo" = (
 /obj/machinery/light/warm/directional/south,
 /obj/structure/cable,
@@ -73989,7 +74009,7 @@
 /area/station/security/prison/workout)
 "wlY" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -75978,7 +75998,7 @@
 	desc = "A well-stocked supply point full of robust tools to protect one's virginity whilst incarcerated.";
 	extra_price = 40;
 	name = "\improper Prison Tabletop Society";
-	premium = list(/obj/item/pen/fourcolor = 5, /obj/item/rcl = 2, /obj/item/toy/crayon/spraycan = 2, /obj/item/clothing/shoes/wheelys/rollerskates = 3, /obj/item/melee/skateboard = 1);
+	premium = list(/obj/item/pen/fourcolor=5,/obj/item/rcl=2,/obj/item/toy/crayon/spraycan=2,/obj/item/clothing/shoes/wheelys/rollerskates=3,/obj/item/melee/skateboard=1);
 	product_ads = "Protect your virginity today!;You're already in security's dungeon, now all you need are dragons, and dice!;Either come play some Space Catan, or Chad is going to show you who's the boss of the prison gym again!;Want to be a powergaming fuck AND not get banned? Try TTRPGs today!"
 	},
 /turf/open/floor/iron/dark/textured,
@@ -80536,7 +80556,7 @@
 /area/station/medical/medbay/central)
 "yiL" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -244030,7 +244050,7 @@ jsX
 lLf
 asa
 kCu
-iXK
+ryv
 uja
 ewd
 ehm
@@ -251283,7 +251303,7 @@ iML
 nHX
 hRA
 qAO
-rkL
+uen
 uFz
 kJC
 sZF

_maps/map_files/MetaStation/MetaStation_bubber.dmm

@@ -21043,7 +21043,7 @@
 /area/station/science/research)
 "hCZ" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -35272,7 +35272,7 @@
 /area/station/service/hydroponics/garden)
 "mou" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -36437,6 +36437,18 @@
 /obj/effect/spawner/random/engineering/atmospherics_portable,
 /turf/open/floor/plating,
 /area/station/maintenance/aft/lesser)
+"mGK" = (
+/obj/effect/turf_decal/tile/blue/anticorner/contrasted{
+	dir = 8
+	},
+/obj/structure/table/glass,
+/obj/machinery/fax{
+	fax_name = "Bridge";
+	name = "Bridge Fax Machine";
+	pixel_y = 3
+	},
+/turf/open/floor/iron/dark,
+/area/station/command/bridge)
 "mGX" = (
 /obj/structure/cable,
 /obj/structure/disposalpipe/segment{
@@ -43901,7 +43913,7 @@
 	extra_price = 10;
 	fair_market_price = 10;
 	name = "\improper Warden's Hot Drinks";
-	premium = list(/obj/item/seeds/coffee = 2, /obj/item/seeds/coffee/robusta = 2, /obj/item/seeds/tea = 2)
+	premium = list(/obj/item/seeds/coffee=2,/obj/item/seeds/coffee/robusta=2,/obj/item/seeds/tea=2)
 	},
 /turf/open/floor/iron/dark,
 /area/station/security/prison/rec)
@@ -45807,7 +45819,7 @@
 	desc = "A well-stocked supply point full of robust tools to protect one's virginity whilst incarcerated.";
 	extra_price = 40;
 	name = "\improper Prison Tabletop Society";
-	premium = list(/obj/item/pen/fourcolor = 5, /obj/item/rcl = 2, /obj/item/toy/crayon/spraycan = 2, /obj/item/clothing/shoes/wheelys/rollerskates = 3, /obj/item/melee/skateboard = 1);
+	premium = list(/obj/item/pen/fourcolor=5,/obj/item/rcl=2,/obj/item/toy/crayon/spraycan=2,/obj/item/clothing/shoes/wheelys/rollerskates=3,/obj/item/melee/skateboard=1);
 	product_ads = "Protect your virginity today!;You're already in security's dungeon, now all you need are dragons, and dice!;Either come play some Space Catan, or Chad is going to show you who's the boss of the prison gym again!;Want to be a powergaming fuck AND not get banned? Try TTRPGs today!"
 	},
 /obj/structure/cable,
@@ -58183,7 +58195,7 @@
 /area/station/security/prison/safe)
 "tYo" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -62072,6 +62084,15 @@
 /obj/effect/turf_decal/siding/wood{
 	dir = 8
 	},
+/mob/living/simple_animal/pet/cat{
+	desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!";
+	icon = 'modular_zubbers/icons/mob/simple/pets.dmi';
+	icon_dead = "pancake_dead";
+	icon_living = "pancake";
+	icon_state = "pancake";
+	minbodytemp = 0;
+	name = "Pancake"
+	},
 /turf/open/floor/wood/parquet,
 /area/station/medical/psychology)
 "vnZ" = (
@@ -65875,7 +65896,7 @@
 /area/station/maintenance/starboard/lesser)
 "wFY" = (
 /obj/effect/spawner/random/structure/girder{
-	loot = list(/obj/structure/falsewall = 50, /turf/closed/wall = 50);
+	loot = list(/obj/structure/falsewall=50,/turf/closed/wall=50);
 	name = "falsewall or wall spawner"
 	},
 /turf/open/floor/plating,
@@ -98728,7 +98749,7 @@ qkA
 dUj
 qVc
 wNh
-veO
+mGK
 hXK
 duI
 duI

_maps/map_files/VoidRaptor/VoidRaptor_bubber.dmm

@@ -76317,8 +76317,16 @@
 	dir = 9
 	},
 /obj/structure/bed/dogbed{
-	anchored = 1;
-	name = "Tom's bed"
+	name = "Pancake's bed"
+	},
+/mob/living/simple_animal/pet/cat{
+	desc = "Their name is pancake! They're very social, snuggly, and a bit dumb... But nonetheless, a good cat!";
+	icon = 'modular_zubbers/icons/mob/simple/pets.dmi';
+	icon_dead = "pancake_dead";
+	icon_living = "pancake";
+	icon_state = "pancake";
+	minbodytemp = 0;
+	name = "Pancake"
 	},
 /turf/open/floor/carpet,
 /area/station/medical/psychology)

_maps/map_files/tramstation/maintenance_modules/dormenginelower_1.dmm

@@ -303,12 +303,6 @@
 /obj/modular_map_connector,
 /turf/template_noop,
 /area/template_noop)
-"rK" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/rack,
-/obj/effect/spawner/random/food_or_drink/cups,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "rO" = (
 /obj/machinery/light/small/directional/east,
 /obj/effect/decal/cleanable/dirt,
@@ -402,11 +396,6 @@
 /obj/effect/spawner/random/engineering/tool,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/central/lesser)
-"xp" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/department/crew_quarters/dorms)
 "xW" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/disposalpipe/segment{
@@ -432,12 +421,6 @@
 /obj/effect/spawner/random/trash/janitor_supplies,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/crew_quarters/dorms)
-"yN" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/effect/spawner/random/food_or_drink/booze,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "zt" = (
 /obj/machinery/door/airlock/maintenance_hatch{
 	name = "Maintenance Hatch"
@@ -637,14 +620,6 @@
 /obj/item/stack/cable_coil/five,
 /turf/open/misc/asteroid,
 /area/station/maintenance/central/lesser)
-"Ml" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/machinery/button/door/directional/south{
-	id = "maintprivacyurdumb";
-	name = "Privacy Shutters"
-	},
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "Mq" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/structure/railing,
@@ -752,12 +727,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/central/lesser)
-"RS" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/table,
-/obj/effect/spawner/random/engineering/flashlight,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "Sa" = (
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /obj/effect/decal/cleanable/dirt,
@@ -1904,10 +1873,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-RS
-NT
+AN
+AN
+AN
+AN
 "}
 (30,1,1) = {"
 AN
@@ -1940,10 +1909,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-yN
-NT
+AN
+AN
+AN
+AN
 "}
 (31,1,1) = {"
 AN
@@ -1976,10 +1945,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-rK
-NT
+AN
+AN
+AN
+AN
 "}
 (32,1,1) = {"
 AN
@@ -2012,10 +1981,10 @@ AN
 AN
 AN
 AN
-xp
-Mr
-Ml
-NT
+AN
+AN
+AN
+AN
 "}
 (33,1,1) = {"
 AN
@@ -2048,10 +2017,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-DP
-NT
+AN
+AN
+AN
+AN
 "}
 (34,1,1) = {"
 AN
@@ -2084,10 +2053,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-DP
-NT
+AN
+AN
+AN
+AN
 "}
 (35,1,1) = {"
 AN
@@ -2120,10 +2089,10 @@ AN
 AN
 AN
 AN
-DP
-Mr
-DP
-NT
+AN
+AN
+AN
+AN
 "}
 (36,1,1) = {"
 AN

_maps/map_files/tramstation/maintenance_modules/dormenginelower_2.dmm

@@ -187,13 +187,6 @@
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/catwalk_floor,
 /area/station/maintenance/central/lesser)
-"id" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/sink/directional/south,
-/obj/structure/mirror/directional/north,
-/obj/item/soap/nanotrasen,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "jG" = (
 /obj/effect/turf_decal/sand/plating,
 /obj/effect/mapping_helpers/broken_floor,
@@ -372,11 +365,6 @@
 /obj/structure/holosign/barrier/engineering,
 /turf/open/floor/iron/freezer,
 /area/template_noop)
-"qW" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/department/crew_quarters/dorms)
 "ro" = (
 /obj/item/stack/ore/iron,
 /turf/open/misc/asteroid/airless,
@@ -612,11 +600,6 @@
 /obj/effect/mapping_helpers/airlock/access/all/engineering/maintenance,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/crew_quarters/dorms)
-"Dz" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/effect/spawner/random/engineering/canister,
-/turf/open/floor/iron/smooth,
-/area/station/maintenance/department/crew_quarters/dorms)
 "DP" = (
 /obj/effect/decal/cleanable/dirt,
 /turf/open/floor/iron/smooth,
@@ -2078,10 +2061,10 @@ AN
 AN
 AN
 AN
-MR
-NT
-DP
-NT
+AN
+AN
+AN
+AN
 "}
 (30,1,1) = {"
 AN
@@ -2114,10 +2097,10 @@ AN
 AN
 AN
 AN
-MR
-NT
-id
-NT
+AN
+AN
+AN
+AN
 "}
 (31,1,1) = {"
 AN
@@ -2150,10 +2133,10 @@ AN
 AN
 AN
 AN
-MR
-NT
-NT
-NT
+AN
+AN
+AN
+AN
 "}
 (32,1,1) = {"
 AN
@@ -2186,10 +2169,10 @@ AN
 AN
 AN
 AN
-MR
-qW
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (33,1,1) = {"
 AN
@@ -2222,10 +2205,10 @@ AN
 AN
 AN
 AN
-MR
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (34,1,1) = {"
 AN
@@ -2258,10 +2241,10 @@ AN
 AN
 AN
 AN
-MR
-Go
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (35,1,1) = {"
 AN
@@ -2294,10 +2277,10 @@ AN
 AN
 AN
 AN
-MR
-Dz
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (36,1,1) = {"
 AN

_maps/map_files/tramstation/maintenance_modules/dormenginelower_3.dmm

@@ -164,11 +164,6 @@
 /obj/effect/spawner/random/trash/janitor_supplies,
 /turf/open/floor/iron/smooth,
 /area/station/maintenance/department/crew_quarters/dorms)
-"nf" = (
-/obj/effect/decal/cleanable/dirt,
-/obj/structure/cable,
-/turf/open/floor/catwalk_floor,
-/area/station/maintenance/department/crew_quarters/dorms)
 "ny" = (
 /obj/effect/decal/cleanable/dirt,
 /obj/machinery/atmospherics/pipe/smart/manifold4w/supply/hidden/layer4,
@@ -1807,10 +1802,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (30,1,1) = {"
 AN
@@ -1843,10 +1838,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (31,1,1) = {"
 AN
@@ -1879,10 +1874,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (32,1,1) = {"
 AN
@@ -1915,10 +1910,10 @@ AN
 AN
 AN
 AN
-IN
-nf
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (33,1,1) = {"
 AN
@@ -1951,10 +1946,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (34,1,1) = {"
 AN
@@ -1987,10 +1982,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (35,1,1) = {"
 AN
@@ -2023,10 +2018,10 @@ AN
 AN
 AN
 AN
-IN
-DP
-NT
-gs
+AN
+AN
+AN
+AN
 "}
 (36,1,1) = {"
 AN

code/__DEFINES/~skyrat_defines/gun.dm

@@ -18,3 +18,4 @@
 #define COMPANY_JARNSMIOUR (1<<13)
 #define COMPANY_ABDUCTOR (1<<14)
 #define COMPANY_REMOVED (1<<15)
+#define COMPANY_ROMULUS (1<<16)

code/__DEFINES/~skyrat_defines/jobs.dm

@@ -12,4 +12,4 @@
 
 #define RESTRICTED_QUIRKS_EXCEPTIONS list("Mute" = "Signer")
 
-#define FLAVOR_TEXT_CHAR_REQUIREMENT 0 //BUBBERSTATION EDIT
+#define FLAVOR_TEXT_CHAR_REQUIREMENT 150

code/__DEFINES/~~bubber_defines/jobs.dm

@@ -0,0 +1 @@
+#define RECORDS_TEXT_CHAR_REQUIREMENT 15

code/__DEFINES/~~bubber_defines/status_indicator_defines.dm

@@ -0,0 +1,11 @@
+#define STUNNED "stunned"
+#define WEAKEN "weakened"
+#define PARALYSIS "paralysis"
+#define SLEEPING "sleeping"
+#define CONFUSED "confused"
+#define PLANE_STATUS_INDICATOR -12 //Status Indicators that show over mobs' heads when certain things like stuns affect them.
+#define STATUS_LAYER -2.1
+#define STATUS_INDICATOR_Y_OFFSET 2 // Offset from the edge of the icon sprite, so 32 pixels plus whatever number is here.
+#define STATUS_INDICATOR_ICON_X_SIZE 0 // Don't need to care about the Y size due to the origin being on the bottom side.
+#define STATUS_INDICATOR_ICON_MARGIN 0 // The space between two status indicators. We don't do this with the current icons.
+#define DEFAULT_MOB_SCALE 1

code/datums/quirks/negative_quirks.dm

@@ -911,7 +911,7 @@
 		allergy_chem_names += initial(chem_type.name)
 
 	allergy_string = allergy_chem_names.Join(", ")
-	name = "Extreme [allergy_string] Allergies"
+	//name = "Extreme [allergy_string] Allergies"
 	medical_record_text = "Patient's immune system responds violently to [allergy_string]"
 
 	var/mob/living/carbon/human/human_holder = quirk_holder

code/game/objects/items/devices/scanners/health_analyzer.dm

@@ -189,6 +189,13 @@
 			render_list += "<span class='info ml-1'>Subject Major Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MAJOR_DISABILITY)].</span>\n"
 			if(advanced)
 				render_list += "<span class='info ml-1'>Subject Minor Disabilities: [carbontarget.get_quirk_string(FALSE, CAT_QUIRK_MINOR_DISABILITY)].</span>\n"
+				// Allergies
+			for(var/datum/quirk/quirky as anything in target.quirks)
+				if(istype(quirky, /datum/quirk/item_quirk/allergic))
+					var/datum/quirk/item_quirk/allergic/allergies_quirk = quirky
+					var/allergies = allergies_quirk.allergy_string
+					render_list += "<span class='alert ml-1'><b>Subject is extremely allergic to the following chemicals:</b></span>\n"
+					render_list += "<span class='alert ml-2'><b>[allergies]</b></span>\n"
 
 	if (HAS_TRAIT(target, TRAIT_IRRADIATED))
 		render_list += "<span class='alert ml-1'>Subject is irradiated. Supply toxin healing.</span>\n"

code/game/objects/items/melee/baton.dm

@@ -385,21 +385,18 @@
 
 /obj/item/melee/baton/security
 	name = "stun baton"
-	desc = "A stun baton for incapacitating people with."
-	desc_controls = "Left click to stun, right click to harm."
+	desc = "A stun baton for incapacitating people with. Left click to stun, right click to harm."
+
 	icon_state = "stunbaton"
 	inhand_icon_state = "baton"
 	worn_icon_state = "baton"
 
 	force = 10
-	wound_bonus = 0
 	attack_verb_continuous = list("beats")
 	attack_verb_simple = list("beat")
 
-	armor_type = /datum/armor/baton_security
-
 	throwforce = 7
-	stamina_damage = 35 // SKYRAT EDIT - 4 baton crit now (Original: 45)
+	stamina_damage = 60
 	knockdown_time = 5 SECONDS
 	clumsy_knockdown_time = 15 SECONDS
 	cooldown = 2.5 SECONDS
@@ -416,11 +413,6 @@
 	var/can_remove_cell = TRUE
 	var/convertible = TRUE //if it can be converted with a conversion kit
 
-/datum/armor/baton_security
-	bomb = 50
-	fire = 80
-	acid = 80
-
 /obj/item/melee/baton/security/Initialize(mapload)
 	. = ..()
 	if(preload_cell_type)
@@ -434,14 +426,14 @@
 /obj/item/melee/baton/security/get_cell()
 	return cell
 
-/obj/item/melee/baton/security/suicide_act(mob/living/user)
+/obj/item/melee/baton/security/suicide_act(mob/user)
 	if(cell?.charge && active)
 		user.visible_message(span_suicide("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!"))
+		. = (FIRELOSS)
 		attack(user, user)
-		return FIRELOSS
 	else
 		user.visible_message(span_suicide("[user] is shoving the [name] down their throat! It looks like [user.p_theyre()] trying to commit suicide!"))
-		return OXYLOSS
+		. = (OXYLOSS)
 
 /obj/item/melee/baton/security/Destroy()
 	if(cell)
@@ -577,9 +569,9 @@
  * After a period of time, we then check to see what stun duration we give.
  */
 /obj/item/melee/baton/security/additional_effects_non_cyborg(mob/living/target, mob/living/user)
-	target.set_jitter_if_lower(40 SECONDS)
-	// target.set_confusion_if_lower(10 SECONDS) // SKYRAT EDIT REMOVAL
-	target.set_stutter_if_lower(16 SECONDS)
+	target.set_timed_status_effect(40 SECONDS, /datum/status_effect/jitter, only_if_higher = TRUE)
+	target.set_timed_status_effect(10 SECONDS, /datum/status_effect/confusion, only_if_higher = TRUE)
+	target.set_timed_status_effect(16 SECONDS, /datum/status_effect/speech/stutter, only_if_higher = TRUE)
 
 	SEND_SIGNAL(target, COMSIG_LIVING_MINOR_SHOCK)
 	addtimer(CALLBACK(src, PROC_REF(apply_stun_effect_end), target), 2 SECONDS)
@@ -590,8 +582,7 @@
 	if(!target.IsKnockdown())
 		to_chat(target, span_warning("Your muscles seize, making you collapse[trait_check ? ", but your body quickly recovers..." : "!"]"))
 
-	if(!trait_check)
-		target.Knockdown(knockdown_time)
+	target.Knockdown(knockdown_time * (trait_check ? 0.1 : 1))
 
 /obj/item/melee/baton/security/get_wait_description()
 	return span_danger("The baton is still charging!")

code/game/objects/items/robot/robot_upgrades.dm

@@ -117,9 +117,9 @@
 	if(.)
 		for(var/obj/item/pickaxe/drill/cyborg/D in R.model)
 			R.model.remove_module(D, TRUE)
-		for(var/obj/item/shovel/S in R.model)
+/*		for(var/obj/item/shovel/S in R.model)
 			R.model.remove_module(S, TRUE)
-
+*/
 		var/obj/item/pickaxe/drill/cyborg/diamond/DD = new /obj/item/pickaxe/drill/cyborg/diamond(R.model)
 		R.model.basic_modules += DD
 		R.model.add_module(DD, FALSE, TRUE)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -91,6 +91,7 @@
 	new /obj/item/clothing/under/rank/security/warden/formal(src)
 	new /obj/item/clothing/suit/jacket/warden/blue(src) //SKYRAT ADDITION - FORMAL COAT
 	//new /obj/item/clothing/under/rank/security/warden/skirt(src) SKYRAT EDIT REMOVAL
+	new /obj/item/storage/box/gunset/glock17(src)	//Bubber Addition - Glock17 for Warden
 	new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 	new /obj/item/holosign_creator/security(src)
 	new /obj/item/clothing/mask/gas/sechailer(src)

code/modules/jobs/job_types/captain.dm

@@ -70,7 +70,7 @@
 	gloves = /obj/item/clothing/gloves/captain
 	head = /obj/item/clothing/head/hats/caphat
 	shoes = /obj/item/clothing/shoes/laceup
-
+	r_pocket = /obj/item/flashlight/seclite
 
 	backpack = /obj/item/storage/backpack/captain
 	satchel = /obj/item/storage/backpack/satchel/cap

code/modules/jobs/job_types/detective.dm

@@ -56,6 +56,7 @@
 		/obj/item/detective_scanner = 1,
 		/obj/item/melee/baton = 1,
 		/obj/item/storage/box/evidence = 1,
+		/obj/item/flashlight/seclite = 1,
 		)
 	belt = /obj/item/modular_computer/pda/detective
 	ears = /obj/item/radio/headset/headset_sec/alt

code/modules/jobs/job_types/head_of_security.dm

@@ -51,12 +51,14 @@
 	id_trim = /datum/id_trim/job/head_of_security
 	uniform = /obj/item/clothing/under/rank/security/head_of_security
 	suit = /obj/item/clothing/suit/armor/hos/trenchcoat
-	//suit_store = /obj/item/gun/energy/e_gun //SKYRAT EDIT REMOVAL
+	suit_store = /obj/item/gun/energy/e_gun //KEPLER EDIT RESTORATION
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
-		/obj/item/storage/box/gunset/glock18_hos = 1, //SKYRAT EDIT ADDITION
+		/obj/item/flashlight/seclite = 1,
+		/obj/item/modular_computer/pda/heads/hos = 1,
+		/obj/item/choice_beacon/head_of_security = 1,
 		)
-	belt = /obj/item/modular_computer/pda/heads/hos
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/heads/hos/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
@@ -85,3 +87,53 @@
 	head = null
 	mask = /obj/item/clothing/mask/gas/sechailer
 	internals_slot = ITEM_SLOT_SUITSTORE
+
+//TEST THIS OUT WHEN NEEDED
+
+/obj/item/choice_beacon/head_of_security
+	name = "gun choice beacon"
+	desc = "whatever you choose will determine the outcome of space station 13 and the fate of the company so choose wisely."
+	company_source = "Romulus Shipping Company"
+	company_message = span_bold("Copy that SS13, supply pod enroute!")
+
+
+/obj/item/choice_beacon/head_of_security/generate_display_names()
+	var/static/list/hosgun_list
+	if(!hosgun_list)
+		hosgun_list = list()
+		for(var/obj/item/storage/box/hosgun/box as anything in typesof(/obj/item/storage/box/hosgun))
+			hosgun_list[initial(box.name)] = box
+	return hosgun_list
+
+/obj/item/storage/box/hosgun
+	name = "Classic 3-round burst pistol 9mm"
+
+/obj/item/storage/box/hosgun/PopulateContents()
+	new /obj/item/storage/box/gunset/glock18_hos(src)
+	new /obj/item/ammo_box/c9mm(src)
+	new /obj/item/ammo_box/c9mm(src)
+	new /obj/item/storage/box/hecu_rations(src)
+	new /obj/item/storage/fancy/cigarettes/cigars(src)
+
+/obj/item/storage/box/hosgun/revolver
+	name = "Romulus Officer Heavy Revolver .460"
+
+/obj/item/storage/box/hosgun/revolver/PopulateContents()
+	new /obj/item/storage/box/gunset/hos_revolver(src)
+	new	/obj/item/clothing/neck/cloak/hos/redsec(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/redsec(src)
+	new /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch/redsec(src)
+	new /obj/item/clothing/shoes/jackboots/sec/redsec(src)
+	new /obj/item/storage/box/nri_rations(src)
+	new /obj/item/knife/combat(src)
+
+/obj/item/storage/box/hosgun/glock
+	name = "Solaris Police Dual 9mm Pistol"
+
+/obj/item/storage/box/hosgun/glock/PopulateContents()
+	new /obj/item/storage/box/gunset/glock17(src)
+	new /obj/item/storage/box/gunset/glock17(src)
+	new /obj/item/clothing/under/rank/security/head_of_security/peacekeeper/sol(src)
+	new /obj/item/clothing/neck/tie/red(src)
+	new /obj/item/storage/pill_bottle/probital(src)
+

code/modules/jobs/job_types/security_officer.dm

@@ -209,8 +209,10 @@ GLOBAL_LIST_EMPTY(security_officer_distribution)
 	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/flashlight/seclite = 1,
+		/obj/item/modular_computer/pda/security = 1,
 		)
-	belt = /obj/item/modular_computer/pda/security
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_sec/alt
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black
 	head = /obj/item/clothing/head/security_garrison //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/head/helmet/sec

code/modules/jobs/job_types/warden.dm

@@ -53,8 +53,10 @@
 	suit_store = /obj/item/gun/energy/disabler
 	backpack_contents = list(
 		/obj/item/evidencebag = 1,
+		/obj/item/modular_computer/pda/warden = 1,
+		/obj/item/flashlight/seclite = 1,
 		)
-	belt = /obj/item/modular_computer/pda/warden
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_sec/alt
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	gloves = /obj/item/clothing/gloves/color/black/security //SKYRAT EDIT CHANGE - Original: /obj/item/clothing/gloves/color/black

code/modules/mob/living/carbon/carbon_defense.dm

@@ -492,7 +492,7 @@
 	else if(helper.zone_selected == BODY_ZONE_PRECISE_MOUTH)
 		nosound = TRUE
 		playsound(src, 'modular_skyrat/modules/emotes/sound/emotes/Nose_boop.ogg', 50, 0)
-		if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT) && get_location_accessible(src, BODY_ZONE_PRECISE_MOUTH))
+		if(HAS_TRAIT(src, TRAIT_SENSITIVESNOUT))
 			to_chat(src, span_warning("[helper] boops you on your sensitive nose, sending you to the ground!"))
 			src.Knockdown(20)
 			src.apply_damage(30, STAMINA)

code/modules/mob/living/silicon/robot/robot_model.dm

@@ -657,7 +657,7 @@
 		/obj/item/borg/sight/meson,
 		/obj/item/storage/bag/ore/cyborg,
 		/obj/item/pickaxe/drill/cyborg,
-		/obj/item/shovel,
+		/obj/item/kinetic_crusher,
 		/obj/item/crowbar/cyborg,
 		/obj/item/weldingtool/mini,
 		/obj/item/extinguisher/mini,

code/modules/projectiles/guns/energy/kinetic_accelerator.dm

@@ -132,7 +132,7 @@
 	icon_state = "kineticgun" // SKYRAT EDIT CHANGE
 	holds_charge = TRUE
 	unique_frequency = TRUE
-	max_mod_capacity = 80
+	max_mod_capacity = 100 // Bubber edit, Original: 80
 
 /obj/item/gun/energy/recharge/kinetic_accelerator/minebot
 	trigger_guard = TRIGGER_GUARD_ALLOW_ALL

code/modules/projectiles/guns/energy/stun.dm

@@ -30,9 +30,8 @@
 	desc = "A self-defense weapon that exhausts organic targets, weakening them until they collapse."
 	icon_state = "disabler"
 	inhand_icon_state = null
-	ammo_type = list(/obj/item/ammo_casing/energy/disabler/skyrat) // SKYRAT EDIT: 	ammo_type = list(/obj/item/ammo_casing/energy/disabler)
+	ammo_type = list(/obj/item/ammo_casing/energy/disabler)
 	ammo_x_offset = 2
-	cell_type = /obj/item/stock_parts/cell/super // SKYRAT EDIT ADDITION
 
 /obj/item/gun/energy/disabler/add_seclight_point()
 	AddComponent(/datum/component/seclite_attachable, \

code/modules/research/machinery/_production.dm

@@ -287,35 +287,7 @@
 			say("Not enough reagents to complete prototype[print_quantity > 1? "s" : ""].")
 			return FALSE
 
-	// Charge the lathe tax at least once per ten items.
-	var/total_cost = LATHE_TAX * max(round(print_quantity / 10), 1)
-
-	if(!charges_tax)
-		total_cost = 0
-
-	if(isliving(usr))
-		var/mob/living/user = usr
-		var/obj/item/card/id/card = user.get_idcard(TRUE)
-
-		if(!card && istype(user.pulling, /obj/item/card/id))
-			card = user.pulling
-
-		if(card && card.registered_account)
-			var/datum/bank_account/our_acc = card.registered_account
-			if(our_acc.account_job.departments_bitflags & allowed_department_flags)
-				total_cost = 0 // We are not charging crew for printing their own supplies and equipment.
-
-	if(attempt_charge(src, usr, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE)
-		say("Insufficient funds to complete prototype. Please present a holochip or valid ID card.")
-		return FALSE
-
-	if(iscyborg(usr))
-		var/mob/living/silicon/robot/borg = usr
-
-		if(!borg.cell)
-			return FALSE
-
-		borg.cell.use(SILICON_LATHE_TAX)
+	lathe_tax()
 
 	materials.mat_container.use_materials(efficient_mats, print_quantity)
 	materials.silo_log(src, "built", -print_quantity, "[design.name]", efficient_mats)

config/game_options.txt

@@ -551,6 +551,10 @@ MAXFINE 2000
 ## Whether native FoV is enabled for all people.
 #NATIVE_FOV
 
+## How much does the protolathe cost to use on station? Disabled is off.
+
+##PROTOLATHE_TAX 10
+
 ## Whether circuit sounds are allowed to be played or not.
 #DISALLOW_CIRCUIT_SOUNDS
 

html/changelogs/AutoChangeLog-pr-162.yml

@@ -0,0 +1,5 @@
+author: "ReturnToZender"
+delete-after: True
+changes:
+  - rscadd: "Restored Skyrat flavor text minimum"
+  - rscadd: "Functionality for future records minimums"

html/changelogs/AutoChangeLog-pr-166.yml

@@ -0,0 +1,4 @@
+author: "CydiaButt13"
+delete-after: True
+changes:
+  - rscadd: "Added *mggaow"

html/changelogs/AutoChangeLog-pr-167.yml

@@ -0,0 +1,19 @@
+author: "Ldip999"
+delete-after: True
+changes:
+  - bugfix: "Interlink shuttle now works with tram!"
+  - rscadd: "Cryo added to tram (Both below recreation, and into perma)"
+  - rscadd: "Picnic area at tram"
+  - qol: "Moved vendors to the back of medical storage on tram"
+  - rscadd: "Medical storage on tram now includes bone gel, medical tape, and space cleaners"
+  - rscadd: "Medical triage on tram now has a weapon charger for mediguns"
+  - bugfix: "Tram Morgue backdoor now uses ANY permissions instead of ALL"
+  - rscadd: "Tram Disposals now has a tiny fan so air won't leak"
+  - rscadd: "Tram cargo now has mining equipment vendors"
+  - rscadd: "Central tram dock got a snack machine"
+  - qol: "Biohaz 3 locker moved from medical storage to cold room on tram"
+  - bugfix: "Departmental security now has correct and appropriate access on tram"
+  - qol: "Minor area adjustments on tram"
+  - rscadd: "Tram engineering SM room now has cooler loop"
+  - rscadd: "Tram engineering has a console in front of SM"
+  - rscadd: "Added borg chargers to engineering, medical, service, cargo, and security for tram"

html/changelogs/AutoChangeLog-pr-168.yml

@@ -0,0 +1,6 @@
+author: "CloverIsLucky"
+delete-after: True
+changes:
+  - rscadd: "Crusherborg!"
+  - rscdel: "Removed useless shovel from minerborg's moduleset."
+  - qol: "Minerborg's KA mod capacity increased from 80 to 100"

html/changelogs/AutoChangeLog-pr-169.yml

@@ -0,0 +1,4 @@
+author: "Ldip999"
+delete-after: True
+changes:
+  - rscadd: "Fax machine added to meta bridge"

html/changelogs/AutoChangeLog-pr-171.yml

@@ -0,0 +1,4 @@
+author: "NullDagaf"
+delete-after: True
+changes:
+  - bugfix: "removes otie"

html/changelogs/AutoChangeLog-pr-178.yml

@@ -0,0 +1,4 @@
+author: "Icarus-The-Sun"
+delete-after: True
+changes:
+  - rscadd: "Gives Prisoner's headsets."

html/changelogs/AutoChangeLog-pr-183.yml

@@ -0,0 +1,4 @@
+author: "Ldip999"
+delete-after: True
+changes:
+  - qol: "Health scanner now displays allergies more visibly"

html/changelogs/AutoChangeLog-pr-184.yml

@@ -0,0 +1,6 @@
+author: "nevimer"
+delete-after: True
+changes:
+  - rscadd: "sensitive snout is now visible on examine! bullies take note."
+  - balance: "sensitive snout is now not blocked by masks. masks hurt to wear. makes sense."
+  - spellcheck: "changed the word nose to snout and similar for sensitive snoute"

html/changelogs/AutoChangeLog-pr-189.yml

@@ -0,0 +1,4 @@
+author: "nevimer"
+delete-after: True
+changes:
+  - config: "Lathe tax is now a config option"

html/changelogs/AutoChangeLog-pr-190.yml

@@ -0,0 +1,4 @@
+author: "[nevimer](https://github.com/nevimer), [AtoriBirb](https://github.com/AtoriBirb)"
+delete-after: True
+changes:
+  - rscadd: "Status Indicators! Toggle in preferences!"

html/changelogs/AutoChangeLog-pr-192.yml

@@ -0,0 +1,4 @@
+author: "Ldip999"
+delete-after: True
+changes:
+  - rscadd: "Lustwish added to icebox, inside dorms"

html/changelogs/AutoChangeLog-pr-199.yml

@@ -0,0 +1,4 @@
+author: "projectkepler-ru"
+delete-after: True
+changes:
+  - server: "I fucked up"

html/changelogs/AutoChangeLog-pr-203.yml

@@ -0,0 +1,4 @@
+author: "KathrinBailey"
+delete-after: True
+changes:
+  - rscadd: "Pancake the cat, a new pet for the psychology! Sponsored by SharkWaifu."

html/changelogs/AutoChangeLog-pr-207.yml

@@ -0,0 +1,13 @@
+author: "Scuhf-git"
+delete-after: True
+changes:
+  - rscadd: "Crippled Bull Horns"
+  - rscadd: "Hollow-Points Horns"
+  - rscadd: "Ticket Rack Horns"
+  - rscadd: "Hopeful Horns Horns"
+  - rscadd: "Analytical Antlers Horns"
+  - rscadd: "Spiders Spikes Horns"
+  - rscadd: "Broad Curls Horns"
+  - rscadd: "Painted Points"
+  - rscadd: "Who's Horns?"
+  - rscadd: "High-rise Horns"

modular_skyrat/master_files/code/datums/traits/negative.dm

@@ -65,3 +65,27 @@
 	value = -6
 	mob_trait = TRAIT_NOGUNS
 	icon = "none"
+
+/datum/quirk/sensitivesnout
+	name = "Sensitive Snout"
+	desc = "Your snout has always been sensitive, and it really hurts when someone pokes it!"
+	gain_text = span_notice("Your snout is awfully sensitive.")
+	lose_text = span_notice("Your snout feels numb.")
+	medical_record_text = "Patient's snout seems to have a cluster of nerves in the tip, would advise against direct contact."
+	value = -2
+	mob_trait = TRAIT_SENSITIVESNOUT
+	icon = "fingerprint"
+
+/datum/quirk/sensitivesnout/post_add()
+	quirk_holder.apply_status_effect(/datum/status_effect/sensitivesnout)
+
+/datum/quirk/sensitivesnout/remove()
+	quirk_holder.remove_status_effect(/datum/status_effect/sensitivesnout)
+
+/datum/status_effect/sensitivesnout
+	id = "sensitivesnout"
+	duration = -1
+	alert_type = null
+
+/datum/status_effect/sensitivesnout/get_examine_text()
+	return span_warning("[owner.p_their(TRUE)] snout is rather bappable...")

modular_skyrat/master_files/code/datums/traits/neutral.dm

@@ -191,12 +191,3 @@
 	var/obj/item/organ/internal/tongue/dog/new_tongue = new(get_turf(human_holder))
 	new_tongue.Insert(human_holder)
 
-/datum/quirk/sensitivesnout
-	name = "Sensitive Snout"
-	desc = "Your face has always been sensitive, and it really hurts when someone pokes it!"
-	gain_text = span_notice("Your face is awfully sensitive.")
-	lose_text = span_notice("Your face feels numb.")
-	medical_record_text = "Patient's nose seems to have a cluster of nerves in the tip, would advise against direct contact."
-	value = 0
-	mob_trait = TRAIT_SENSITIVESNOUT
-	icon = "fingerprint"

modular_skyrat/master_files/code/modules/projectiles/guns/gun.dm

@@ -215,6 +215,9 @@
 			. += "<br>It has <b>[span_abductor("✌︎︎♌︎︎♎︎︎◆︎︎♍︎︎⧫︎︎❄︎♏︎♍︎♒︎")]</b> engraved into the photon accelerator."
 		if(COMPANY_REMOVED)
 			. += "<br>It has had <b>[span_grey("all identifying marks scrubbed off")].</b>"
+		if(COMPANY_ROMULUS)
+			. += "<br>It has <b><i>[span_blue("Romulus Technology")]</i></b> etched into the barrel."
+
 
 /obj/item/gun/proc/fire_select()
 	var/mob/living/carbon/human/user = usr

modular_skyrat/master_files/code/modules/research/techweb/protolathe.dm

@@ -0,0 +1,29 @@
+/obj/machinery/rnd/production
+	var/total_cost = 0
+	var/on_station_lathe = TRUE
+	var/free_lathe = FALSE
+
+/obj/machinery/rnd/production/proc/lathe_tax()
+	total_cost ? (free_lathe ? 0 : total_cost) : (CONFIG_GET(number/protolathe_tax))
+
+	if(is_station_level(z) && on_station_lathe && total_cost && !free_lathe)
+		var/mob/living/user = usr
+		var/obj/item/card/id/card = user.get_idcard(TRUE)
+		if(!card && istype(user.pulling, /obj/item/card/id))
+			card = user.pulling
+		if(card)
+			var/datum/bank_account/our_acc = card.registered_account
+			if(our_acc.account_job && SSeconomy.get_dep_account(our_acc.account_job?.paycheck_department) == SSeconomy.get_dep_account(payment_department))
+				total_cost = 0 //We are not charging crew for printing their own supplies and equipment.
+		if(!iscarbon(usr)) // catch all cyborg types
+			total_cost = 0
+	if(attempt_charge(src, usr, total_cost) & COMPONENT_OBJ_CANCEL_CHARGE)
+		return FALSE
+
+/obj/machinery/rnd/production/protolathe/offstation
+	on_station_lathe = FALSE
+
+/datum/config_entry/number/protolathe_tax
+	default = 0
+	min_val = 0
+	max_val = 65535

modular_skyrat/modules/blueshield/code/blueshield.dm

@@ -54,6 +54,8 @@
 	glasses = /obj/item/clothing/glasses/hud/security/sunglasses
 	backpack_contents = list(
 		/obj/item/storage/box/gunset/blueshield = 1,
+		/obj/item/gun/energy/e_gun/revolver = 1,
+		/obj/item/storage/medkit/tactical/blueshield = 1,
 		/obj/item/melee/baton/security/loaded = 1,)
 	implants = list(/obj/item/implant/mindshield)
 	backpack = /obj/item/storage/backpack/blueshield
@@ -62,6 +64,7 @@
 	head = /obj/item/clothing/head/beret/blueshield
 	box = /obj/item/storage/box/survival/security
 	belt = /obj/item/modular_computer/pda/security
+	r_pocket = /obj/item/flashlight/seclite
 
 	id = /obj/item/card/id/advanced/centcom
 	id_trim = /datum/id_trim/job/blueshield

modular_skyrat/modules/blueshield/code/special.dm

@@ -1,7 +1,7 @@
-/obj/item/gun/energy/e_gun/revolver //The virgin gun.
+/obj/item/gun/energy/e_gun/revolver //The gun fit for a kitsune
 	name = "X-R12 energy revolver"
 	desc = "An experimental model advanced energy weapon with the capacity to shoot both electrodes and lasers, used by many private defense contractors from Romulus to New Moscow, its also rather heavy and would certainly hurt to get pistol whipped by."
-	force = 16
+	force = 12
 	ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser/blueshield)
 	ammo_x_offset = 1
 	charge_sections = 4
@@ -18,13 +18,14 @@
 	w_class = WEIGHT_CLASS_NORMAL
 	worn_icon = 'modular_skyrat/modules/aesthetics/guns/icons/guns_back.dmi'
 	worn_icon_state = "bsrevolver"
+	company_flag = COMPANY_ROMULUS
 
 /obj/item/stock_parts/cell/blueshield
 	name = "internal revolver power cell"
 	maxcharge = 1200
-	chargerate = 300
+	chargerate = 105 //Hit your shot and don't complain, it's self recharging.
 
-/obj/item/gun/energy/e_gun/revolver/pdw9 //The chad gun.
+/obj/item/gun/energy/e_gun/revolver/pdw9 //The gun fit for a real man
 	name = "PDW-9 taser pistol"
 	desc = "A military grade energy sidearm, used by many militia forces throughout the local sector. It comes with an internally recharging battery which is slow to recharge."
 	ammo_x_offset = 2
@@ -34,7 +35,7 @@
 
 /obj/item/stock_parts/cell/pdw9
 	name = "internal pistol power cell"
-	maxcharge = 1000
+	maxcharge = 1200
 	chargerate = 300
 	var/obj/item/gun/energy/e_gun/revolver/pdw9/parent
 

modular_skyrat/modules/emote_panel/code/emote_panel.dm

@@ -146,7 +146,8 @@
 		/mob/living/proc/emote_rpurr,
 		/mob/living/proc/emote_purr,
 		/mob/living/proc/emote_moo,
-		/mob/living/proc/emote_honk1
+		/mob/living/proc/emote_honk1,
+		/mob/living/proc/emote_mggaow
 	)
 	all_emotes += skyrat_living_emotes
 
@@ -1018,3 +1019,8 @@
 	set name = "| Mark Turf |"
 	set category = "Emotes+"
 	usr.emote("turf", intentional = TRUE)
+
+/mob/living/proc/emote_mggaow()
+	set name = "> Mggaow"
+	set category = "Emotes+"
+	usr.emote("mggaow", intentional = TRUE)

modular_skyrat/modules/emotes/code/emotes.dm

@@ -519,3 +519,11 @@
 	emote_type = EMOTE_AUDIBLE
 	vary = TRUE
 	sound = 'sound/effects/glassbash.ogg'
+
+/datum/emote/living/mggaow
+	key = "mggaow"
+	key_third_person = "meows loudly"
+	message = "meows loudly!"
+	emote_type = EMOTE_AUDIBLE
+	vary = TRUE
+	sound = 'modular_skyrat/modules/emotes/sound/voice/mggaow.ogg'

modular_skyrat/modules/nanotrasen_rep/code/nanotrasen_consultant.dm

@@ -44,7 +44,7 @@
 	name = "Nanotrasen Consultant"
 	jobtype = /datum/job/nanotrasen_consultant
 
-	belt = /obj/item/modular_computer/pda/nanotrasen_consultant
+	belt = /obj/item/storage/belt/security/peacekeeper
 	glasses = /obj/item/clothing/glasses/sunglasses
 	ears = /obj/item/radio/headset/heads/nanotrasen_consultant
 	gloves = /obj/item/clothing/gloves/combat
@@ -55,6 +55,7 @@
 	backpack_contents = list(
 		/obj/item/melee/baton/telescopic = 1,
 		/obj/item/storage/box/gunset/nanotrasen_consultant = 1,
+		/obj/item/modular_computer/pda/nanotrasen_consultant = 1,
 		)
 
 	skillchips = list(/obj/item/skillchip/disk_verifier)
@@ -124,7 +125,9 @@
 	new /obj/item/ammo_box/magazine/m45a5(src)
 	new /obj/item/ammo_box/magazine/m45a5(src)
 	new /obj/item/ammo_box/magazine/m45a5(src)
-
+	new /obj/item/ammo_box/magazine/m45a5(src)
+	new /obj/item/ammo_box/magazine/m45a5(src)
+	new /obj/item/ammo_box/magazine/m45a5(src)
 
 /obj/structure/closet/secure_closet/nanotrasen_consultant/station
 	name = "\proper nanotrasen consultant's locker"

modular_skyrat/modules/sec_haul/code/security_medic/security_medic.dm

@@ -47,7 +47,7 @@
 	name = "Security Medic"
 	jobtype = /datum/job/security_medic
 
-	belt = /obj/item/modular_computer/pda/security
+	belt = /obj/item/storage/belt/security/full
 	ears = /obj/item/radio/headset/headset_medsec
 	uniform = /obj/item/clothing/under/rank/security/peacekeeper/security_medic
 	gloves = /obj/item/clothing/gloves/latex/nitrile
@@ -58,6 +58,7 @@
 	head = /obj/item/clothing/head/beret/sec/peacekeeper/security_medic
 	backpack_contents = list(
 		/obj/item/storage/box/gunset/firefly = 1,
+		/obj/item/modular_computer/pda/security = 1,
 		)
 	backpack = /obj/item/storage/backpack/security
 	satchel = /obj/item/storage/backpack/satchel/sec

modular_zubbers/code/game/objects/items/holy_weapons.dm

@@ -4,15 +4,14 @@
 	icon = 'modular_zubbers/icons/obj/items_and_weapons.dmi'
 	icon_state = "papal_staff"
 	inhand_icon_state = "papal_staff"
+	belt_icon_state = "baguette"
+	worn_icon_state = "baguette"
 	lefthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_lefthand.dmi'
 	righthand_file = 'modular_zubbers/icons/mob/inhands/weapons/melee_righthand.dmi'
 	w_class = WEIGHT_CLASS_BULKY
 	attack_verb_continuous = list("smacks", "strucks", "cracks", "beats", "purifies")
 	attack_verb_simple = list("smack", "struck", "crack", "beat", "purify")
 
-/obj/item/nullrod/papal_staff/get_belt_overlay()
-	return mutable_appearance('icons/blanks/32x32.dmi', "nothing")
-
 /obj/item/clothing/head/mitre
 	name = "papal mitre"
 	desc = "A traditional headdress, worn by bishops and popes in traditional Christianity"

modular_zubbers/code/game/objects/items/reshirevolver.dm

@@ -0,0 +1,67 @@
+/obj/item/gun/ballistic/revolver/hos_revolver
+	name = "\improper HR-460MS 'Tracker'"
+	desc = "A brutally effectve revolver by Romulus officers prior to destruction of the planet, if the initial damage did not kill, the bleedout would. Uses the brutal .460 Rowland ammo."
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rowland
+	icon = 'modular_zubbers/icons/obj/reshirevolver.dmi'
+	icon_state = "tracker"
+	fire_sound = 'modular_skyrat/modules/sec_haul/sound/hpistol_fire.ogg'
+	company_flag = COMPANY_ROMULUS
+	projectile_damage_multiplier = 1.6 //48 Damages, still a lot but not too much
+//With the damage multipler, it would crit in 4, kill in 6. Does not take into account armours.
+
+/obj/item/ammo_box/magazine/internal/cylinder/rowland
+	name = "\improper rowland revolver cylinder"
+	max_ammo = 6
+	ammo_type = /obj/item/ammo_casing/b460
+	caliber = CALIBER_460
+
+/obj/item/storage/bag/b460reloadpouch
+	name = "reload pouch"
+	desc = "A pouch for holding loose casings for .460 Rowland ammo. incompatible with anything else. Fit on your belt too"
+	icon = 'modular_zubbers/icons/obj/pouches.dmi'
+	icon_state = "reloadpouch"
+	slot_flags = ITEM_SLOT_POCKETS | ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_BULKY
+	resistance_flags = FLAMMABLE
+
+/obj/item/storage/bag/b460reloadpouch/Initialize(mapload)
+	. = ..()
+	atom_storage.max_specific_storage = WEIGHT_CLASS_SMALL
+	atom_storage.max_total_storage = 30
+	atom_storage.max_slots = 30
+	atom_storage.numerical_stacking = TRUE
+	atom_storage.set_holdable(list(
+		/obj/item/ammo_casing/b460,
+		))
+
+/obj/item/storage/bag/b460reloadpouch/PopulateContents()
+	. = ..()
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+	new /obj/item/ammo_casing/b460(src)
+
+/obj/item/storage/box/gunset/hos_revolver/PopulateContents()
+	. = ..()
+	new /obj/item/gun/ballistic/revolver/hos_revolver(src)
+	new /obj/item/storage/bag/b460reloadpouch(src)

modular_zubbers/code/modules/clothing/outfits/prison_headset.dm

@@ -0,0 +1,5 @@
+/datum/outfit/job/prisoner
+	ears = /obj/item/radio/headset
+
+/datum/outfit/plasmaman/prisoner
+	ears = /obj/item/radio/headset

modular_zubbers/code/modules/customization/sprite_accessories/horns.dm

@@ -0,0 +1,47 @@
+/datum/sprite_accessory/horns/bubber //sprites by Scuhf_#6640
+	icon = 'modular_zubbers/icons/customization/horns.dmi'
+
+/datum/sprite_accessory/horns/bubber/crippledbull
+	name = "Crippled Bull"
+	icon_state = "crippledbull"
+
+/datum/sprite_accessory/horns/bubber/hollowpoint
+	name = "Hollow-Points"
+	icon_state = "hollowpoint"
+
+/datum/sprite_accessory/horns/bubber/ticketrack
+	name = "Ticket Rack"
+	icon_state = "ticketrack"
+
+/datum/sprite_accessory/horns/bubber/hopefulhorns
+	name = "Hopeful Horns"
+	icon_state = "hopefulhorns"
+
+/datum/sprite_accessory/horns/bubber/analyticalantlers
+	name = "Analytical Antlers"
+	icon_state = "analyticalantlers"
+
+/datum/sprite_accessory/horns/bubber/spidersspikes
+	name = "Spiders Spikes"
+	icon_state = "spidersspikes"
+
+/datum/sprite_accessory/horns/bubber/broadcurls
+	name = "Broad Curls"
+	icon_state = "broadcurls"
+
+
+/datum/sprite_accessory/horns/bubber/big
+	icon = 'modular_zubbers/icons/customization/horns_big.dmi'
+
+/datum/sprite_accessory/horns/bubber/big/paintedpoints
+	name = "Painted Points"
+	icon_state = "paintedpoints"
+
+/datum/sprite_accessory/horns/bubber/big/whoshorns
+	name = "Who's Horns?"
+	icon_state = "whoshorns"
+
+/datum/sprite_accessory/horns/bubber/big/highrisehorns //end of sprites by Scuhf_#6640
+	name = "High-rise Horns"
+	icon_state = "highrisehorns"
+

modular_zubbers/code/modules/mob/living/living.dm

@@ -0,0 +1,3 @@
+/mob/living/Initialize(mapload)
+	. = ..()
+	AddComponent(/datum/component/status_indicator)

modular_zubbers/code/modules/status_indicators/status_indicator.dm

@@ -0,0 +1,222 @@
+
+GLOBAL_LIST_INIT(potential_indicators, list(
+	STUNNED = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = STUNNED),
+	WEAKEN = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = WEAKEN),
+	PARALYSIS = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = PARALYSIS),
+	SLEEPING = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = SLEEPING),
+	CONFUSED = image(icon = 'modular_zubbers/icons/mob/status_indicators.dmi', icon_state = CONFUSED),
+))
+
+/datum/component/status_indicator
+	var/list/status_indicators = null // Will become a list as needed. Contains our status indicator objects. Note, they are actually added to overlays, this just keeps track of what exists.
+	var/mob/living/attached_mob
+
+/// Returns true if the mob is weakened. Also known as floored.
+/datum/component/status_indicator/proc/is_weakened()
+	if(!indicator_fakeouts() && \
+	attached_mob.IsKnockdown() || \
+	HAS_TRAIT(attached_mob, TRAIT_FLOORED) && \
+	!HAS_TRAIT_FROM(attached_mob, TRAIT_FLOORED, BUCKLED_TRAIT)
+	)
+		return TRUE
+
+/// Returns true if the mob is stunned.
+/datum/component/status_indicator/proc/is_stunned()
+	if(!indicator_fakeouts() && \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_INCAPACITATED, TRAIT_STATUS_EFFECT(STAT_TRAIT)) || \
+	HAS_TRAIT(attached_mob, TRAIT_CRITICAL_CONDITION) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(STAT_TRAIT)) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_IMMOBILIZED, CHOKEHOLD_TRAIT) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_INCAPACITATED, TRAIT_STATUS_EFFECT(STAT_TRAIT)) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(STAT_TRAIT))
+	)
+		return TRUE
+
+/// Returns true if the mob is paralyzed - for can't fight back purposes.
+/datum/component/status_indicator/proc/is_paralyzed()
+	if(!indicator_fakeouts() && \
+	attached_mob.IsParalyzed() || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_FLOORED, CHOKEHOLD_TRAIT) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_IMMOBILIZED, TRAIT_STATUS_EFFECT(STAT_TRAIT)) || \
+	HAS_TRAIT(attached_mob, TRAIT_CRITICAL_CONDITION) || \
+	HAS_TRAIT_FROM(attached_mob, TRAIT_INCAPACITATED, STAMINA))
+		return TRUE
+
+/// Returns true if the mob is unconcious for any reason.
+/datum/component/status_indicator/proc/is_unconcious()
+	if(!indicator_fakeouts() && HAS_TRAIT(attached_mob, TRAIT_KNOCKEDOUT))
+		return TRUE
+
+/// Returns true if the mob has confusion.
+/datum/component/status_indicator/proc/is_confused()
+	if(!indicator_fakeouts() && attached_mob.has_status_effect(/datum/status_effect/confusion))
+		return TRUE
+
+/datum/component/status_indicator/RegisterWithParent()
+	attached_mob = parent
+	// The Basics
+	RegisterSignal(parent, COMSIG_LIVING_DEATH, PROC_REF(cut_indicators_overlays))
+	RegisterSignal(parent, COMSIG_LIVING_LIFE, PROC_REF(status_indicator_evaluate))
+	// When things actually happen
+	RegisterSignal(parent, COMSIG_LIVING_STATUS_STUN, PROC_REF(status_indicator_evaluate))
+	RegisterSignal(parent, COMSIG_LIVING_STATUS_KNOCKDOWN, PROC_REF(status_indicator_evaluate))
+	RegisterSignal(parent, COMSIG_LIVING_STATUS_PARALYZE, PROC_REF(status_indicator_evaluate))
+	RegisterSignal(parent, COMSIG_LIVING_STATUS_IMMOBILIZE, PROC_REF(status_indicator_evaluate))
+	RegisterSignal(parent, COMSIG_LIVING_STATUS_UNCONSCIOUS, PROC_REF(status_indicator_evaluate))
+	RegisterSignal(parent, COMSIG_MOB_LOGIN, PROC_REF(apply_pref_on_login))
+
+/datum/component/status_indicator/proc/apply_pref_on_login()
+	var/atom/movable/screen/plane_master/game_world_upper_fov_hidden/local_status = locate() in attached_mob.client.screen
+	if(local_status)
+		. = attached_mob.client.prefs.read_preference(/datum/preference/toggle/enable_status_indicators)
+		local_status.alpha = (.) ? 255 : 0
+
+/datum/component/status_indicator/UnregisterFromParent()
+	QDEL_NULL(status_indicators)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_DEATH)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_LIFE)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_STUN)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_KNOCKDOWN)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_PARALYZE)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_IMMOBILIZE)
+	UnregisterSignal(attached_mob, COMSIG_LIVING_STATUS_UNCONSCIOUS)
+	attached_mob = null
+/// This proc makes it so that mobs that have status indicators are checked to remove them, especially in fakeout situations.
+/datum/component/status_indicator/proc/check_indicators()
+	if(status_indicators)
+		status_indicator_evaluate()
+
+/// Receives signals to update on carbon health updates. Checks if the mob is dead - if true, removes all the indicators. Then, we determine what status indicators the mob should carry or remove.
+/datum/component/status_indicator/proc/status_indicator_evaluate()
+	SIGNAL_HANDLER
+	if(attached_mob.stat == DEAD)
+		return
+	else
+		weaken_indicator_update()
+		paralyzed_indicator_update()
+		stunned_indicator_update()
+		unconcious_indicator_update()
+		confused_indicator_update()
+		return
+/// Cases in which no status indicators should appear above a mob, such as changeling revive and regen coma.
+/datum/component/status_indicator/proc/indicator_fakeouts()
+	if(HAS_TRAIT(attached_mob, TRAIT_DEATHCOMA))
+		return TRUE
+	return FALSE
+
+/datum/component/status_indicator/proc/weaken_indicator_update()
+	SIGNAL_HANDLER
+	is_weakened() ? add_status_indicator(WEAKEN) : remove_status_indicator(WEAKEN)
+/datum/component/status_indicator/proc/paralyzed_indicator_update()
+	SIGNAL_HANDLER
+	is_paralyzed() ? add_status_indicator(PARALYSIS) : remove_status_indicator(PARALYSIS)
+/datum/component/status_indicator/proc/stunned_indicator_update()
+	SIGNAL_HANDLER
+	is_stunned() ? add_status_indicator(STUNNED) : remove_status_indicator(STUNNED)
+/datum/component/status_indicator/proc/unconcious_indicator_update()
+	SIGNAL_HANDLER
+	is_unconcious() ? add_status_indicator(SLEEPING) : remove_status_indicator(SLEEPING)
+/datum/component/status_indicator/proc/confused_indicator_update()
+	SIGNAL_HANDLER
+	is_confused() ? add_status_indicator(CONFUSED) : remove_status_indicator(CONFUSED)
+
+/// Adds a status indicator to the mob. Takes an image as an argument. If it exists, it won't dupe it.
+/datum/component/status_indicator/proc/add_status_indicator(image/prospective_indicator)
+	if(get_status_indicator(prospective_indicator)) // No duplicates, please.
+		return
+
+	prospective_indicator = GLOB.potential_indicators[prospective_indicator]
+	prospective_indicator.loc = src
+	LAZYADD(status_indicators, prospective_indicator)
+	handle_status_indicators(prospective_indicator)
+
+/// Similar to add_status_indicator() but removes it instead, and nulls the list if it becomes empty as a result.
+/datum/component/status_indicator/proc/remove_status_indicator(image/prospective_indicator)
+	prospective_indicator = get_status_indicator(prospective_indicator)
+
+	attached_mob.cut_overlay(prospective_indicator)
+	LAZYREMOVE(status_indicators, prospective_indicator)
+	handle_status_indicators(prospective_indicator)
+
+/// Finds a status indicator on a mob.
+/datum/component/status_indicator/proc/get_status_indicator(image/prospective_indicator)
+
+	for(var/image/indicator in status_indicators)
+		if(indicator.icon_state == prospective_indicator)
+			return indicator
+	return LAZYACCESS(status_indicators, LAZYFIND(status_indicators, prospective_indicator))
+
+/// Cuts all the indicators on a mob in a loop.
+/datum/component/status_indicator/proc/cut_indicators_overlays()
+	SIGNAL_HANDLER
+	for(var/prospective_indicator in status_indicators)
+		attached_mob.cut_overlay(prospective_indicator)
+
+/// Refreshes the indicators over a mob's head. Should only be called when adding or removing a status indicator with the above procs,
+/// or when the mob changes size visually for some reason.
+/datum/component/status_indicator/proc/handle_status_indicators(image/prospective_indicator)
+	// First, get rid of all the overlays.
+
+	cut_indicators_overlays()
+
+	if(!LAZYLEN(status_indicators))
+		return
+
+	var/mob/living/carbon/my_carbon_mob = attached_mob
+
+	var/icon_scale = get_icon_scale(my_carbon_mob)
+
+	if(my_carbon_mob.stat == DEAD)
+		cut_indicators_overlays()
+		return
+
+	// Now put them back on in the right spot.
+	var/our_sprite_x = 16 * icon_scale
+	var/our_sprite_y = 24 * icon_scale
+
+	var/x_offset = our_sprite_x // Add your own offset here later if you want.
+	var/y_offset = our_sprite_y + STATUS_INDICATOR_Y_OFFSET
+
+	// Calculates how 'long' the row of indicators and the margin between them should be.
+	// The goal is to have the center of that row be horizontally aligned with the sprite's center.
+	var/expected_status_indicator_length = (STATUS_INDICATOR_ICON_X_SIZE * status_indicators.len) + (STATUS_INDICATOR_ICON_MARGIN * max(status_indicators.len - 1, 0))
+	var/current_x_position = (x_offset / 2) - (expected_status_indicator_length / 2)
+
+	// In /mob/living's `update_transform()`, the sprite is horizontally shifted when scaled up, so that the center of the sprite doesn't move to the right.
+	// Because of that, this adjustment needs to happen with the future indicator row as well, or it will look bad.
+	current_x_position -= 16 * (icon_scale - DEFAULT_MOB_SCALE)
+
+	// Now the indicator row can actually be built.
+	for(var/all_indicators in status_indicators)
+		var/image/indicator = all_indicators
+
+		// This is a semi-HUD element, in a similar manner as medHUDs, in that they're 'above' everything else in the world,
+		// but don't pierce obfuscation layers such as blindness or darkness, unlike actual HUD elements like inventory slots.
+		indicator.plane = GAME_PLANE_UPPER_FOV_HIDDEN
+		indicator.layer = STATUS_LAYER
+		indicator.appearance_flags = PIXEL_SCALE|TILE_BOUND|NO_CLIENT_COLOR|RESET_COLOR|RESET_ALPHA|RESET_TRANSFORM|KEEP_APART
+		indicator.pixel_y = y_offset
+		indicator.pixel_x = current_x_position
+		my_carbon_mob.add_overlay(indicator)
+		// Adding the margin space every time saves a conditional check on the last iteration,
+		// and it won't cause any issues since no more icons will be added, and the var is not used for anything else.
+		current_x_position += STATUS_INDICATOR_ICON_X_SIZE + STATUS_INDICATOR_ICON_MARGIN
+
+/datum/component/status_indicator/proc/get_icon_scale(livingmob)
+	if(!iscarbon(livingmob)) // normal mobs are always 1 for scale - hopefully all borgs and simplemobs get this one
+		return DEFAULT_MOB_SCALE
+	var/mob/living/carbon/passed_mob = livingmob // we're possibly a player! We have size prefs!
+	var/mysize = (passed_mob.dna?.current_body_size ? passed_mob.dna.current_body_size : DEFAULT_MOB_SCALE)
+	return mysize
+
+/*
+/atom/movable/screen/plane_master/game_world_upper_fov_hidden/status_indicator
+	name = "Status Indicator Plane"
+	documentation = "Status Indicator Plane"
+	plane = GAME_PLANE_UPPER_FOV_HIDDEN
+	start_hidden = FALSE
+*/
+
+#undef STATUS_INDICATOR_Y_OFFSET
+#undef STATUS_INDICATOR_ICON_X_SIZE
+#undef STATUS_INDICATOR_ICON_MARGIN

modular_zubbers/code/modules/status_indicators/status_indicator_pref.dm

@@ -0,0 +1,26 @@
+/datum/preference/toggle/enable_status_indicators
+	category = PREFERENCE_CATEGORY_GAME_PREFERENCES
+	savefile_key = "enable_status_indicators"
+	savefile_identifier = PREFERENCE_PLAYER
+
+/datum/preference/toggle/enable_status_indicators/create_default_value()
+	return TRUE
+
+
+/datum/preference/toggle/enable_status_indicators/apply_to_client(client/client, value)
+	if(client.mob)
+		var/datum/component/status_indicator/mystatus = client.mob.GetComponent(/datum/component/status_indicator)
+		if(mystatus)
+			mystatus.apply_pref_on_login()
+
+/* 	if(client && client.prefs)
+		. = client?.prefs?.read_preference(/datum/preference/toggle/enable_status_indicators)
+		var/atom/movable/screen/plane_master/status/status_indicators = locate() in client.screen
+		if(isnull(status_indicators))
+			new /atom/movable/screen/plane_master/status in client.screen
+			status_indicators = locate() in client.screen
+		if(length(status_indicators) < 1)
+			pop(status_indicators)
+		(.) ? (status_indicators.alpha = 255) : (status_indicators.alpha = 0)
+
+ */

tgstation.dme

@@ -388,8 +388,10 @@
 #include "code\__DEFINES\~skyrat_defines\_HELPERS\atmos_mapping_helpers.dm"
 #include "code\__DEFINES\~skyrat_defines\_HELPERS\lighting.dm"
 #include "code\__DEFINES\~~bubber_defines\access.dm"
+#include "code\__DEFINES\~~bubber_defines\jobs.dm"
 #include "code\__DEFINES\~~bubber_defines\quirk_whitelist.dm"
 #include "code\__DEFINES\~~bubber_defines\species.dm"
+#include "code\__DEFINES\~~bubber_defines\status_indicator_defines.dm"
 #include "code\__DEFINES\~~bubber_defines\traits.dm"
 #include "code\__HELPERS\_auxtools_api.dm"
 #include "code\__HELPERS\_lists.dm"
@@ -5354,6 +5356,7 @@
 #include "modular_skyrat\master_files\code\modules\research\designs\misc_designs.dm"
 #include "modular_skyrat\master_files\code\modules\research\machinery\departmental_circuit_imprinter.dm"
 #include "modular_skyrat\master_files\code\modules\research\techweb\all_nodes.dm"
+#include "modular_skyrat\master_files\code\modules\research\techweb\protolathe.dm"
 #include "modular_skyrat\master_files\code\modules\shuttle\shuttle.dm"
 #include "modular_skyrat\master_files\code\modules\surgery\surgery.dm"
 #include "modular_skyrat\master_files\code\modules\surgery\organs\tongue.dm"
@@ -6694,16 +6697,22 @@
 #include "modular_zubbers\code\datums\bubber_quirks\hydrophilic.dm"
 #include "modular_zubbers\code\datums\id_trim\jobs.dm"
 #include "modular_zubbers\code\game\area\areas\station.dm"
+#include "modular_zubbers\code\game\objects\effects\decals.dm"
 #include "modular_zubbers\code\game\objects\effects\landmarks.dm"
 #include "modular_zubbers\code\game\objects\effects\items\plushes.dm"
 #include "modular_zubbers\code\game\objects\items\plushes.dm"
+#include "modular_zubbers\code\game\objects\items\holy_weapons.dm"
+#include "modular_zubbers\code\game\objects\items\reshirevolver.dm"
 #include "modular_zubbers\code\game\objects\items\food\misc.dm"
+#include "modular_zubbers\code\modules\_defines.dm"
 #include "modular_zubbers\code\modules\clothing\head\helmet.dm"
 #include "modular_zubbers\code\modules\clothing\outfits\plasmaman.dm"
+#include "modular_zubbers\code\modules\clothing\outfits\prison_headset.dm"
 #include "modular_zubbers\code\modules\clothing\suits\armor.dm"
 #include "modular_zubbers\code\modules\clothing\suits\jacket.dm"
 #include "modular_zubbers\code\modules\customization\sprite_accessories\ears.dm"
 #include "modular_zubbers\code\modules\customization\sprite_accessories\genitals.dm"
+#include "modular_zubbers\code\modules\customization\sprite_accessories\horns.dm"
 #include "modular_zubbers\code\modules\customization\sprite_accessories\tails.dm"
 #include "modular_zubbers\code\modules\customization\sprite_accessories\taurs.dm"
 #include "modular_zubbers\code\modules\dynamic\midround_rulesets.dm"
@@ -6714,6 +6723,7 @@
 #include "modular_zubbers\code\modules\loadouts\loadout_items\loadout_datum_toys.dm"
 #include "modular_zubbers\code\modules\mapping\access_helpers.dm"
 #include "modular_zubbers\code\modules\mob\dead\new_player\sprite_accessories.dm"
+#include "modular_zubbers\code\modules\mob\living\living.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\human.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\felinid.dm"
 #include "modular_zubbers\code\modules\mob\living\carbon\human\species_types\shadekin.dm"
@@ -6721,6 +6731,8 @@
 #include "modular_zubbers\code\modules\mod\mod_theme.dm"
 #include "modular_zubbers\code\modules\mod\mod_types.dm"
 #include "modular_zubbers\code\modules\projectiles\guns\energy\pulse.dm"
+#include "modular_zubbers\code\modules\status_indicators\status_indicator.dm"
+#include "modular_zubbers\code\modules\status_indicators\status_indicator_pref.dm"
 #include "modular_zubbers\code\modules\surgery\bodyparts\species_parts\misc_bodyparts.dm"
 #include "modular_zubbers\code\modules\vending\wardrobe.dm"
 // END_INCLUDE

tgui/packages/tgui/interfaces/PreferencesMenu/preferences/features/game_preferences/skyrat/status_indicators.tsx

@@ -0,0 +1,8 @@
+import { CheckboxInput, FeatureToggle } from '../../base';
+
+export const enable_status_indicators: FeatureToggle = {
+  name: 'Display Status Indicators',
+  category: 'GAMEPLAY',
+  description: 'This toggles whether or not you will see status indicators.',
+  component: CheckboxInput,
+};