Merge branch 'master' into QM-as-Head

modular_citadel/code/modules/client/client_defines.dm

@@ -0,0 +1,2 @@
+/client
+	var/cryo_warned = -3000//when was the last time we warned them about not cryoing without an ahelp, set to -5 minutes so that rounstart cryo still warns

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -174,3 +174,15 @@
 	category = slot_in_backpack
 	path = /obj/item/gun/ballistic/automatic/AM4B
 	ckeywhitelist = list("zeronetalpha")
+
+/datum/gear/carrotsatchel
+	name = "Carrot Satchel"
+	category = slot_hands
+	path = /obj/item/storage/backpack/satchel/carrot
+	ckeywhitelist = list("improvedname")
+	
+/datum/gear/gladiator
+    name = "Gladiator Armor"
+    category = slot_wear_suit
+    path = /obj/item/clothing/under/gladiator
+    ckeywhitelist = list("aroche")

modular_citadel/code/modules/client/preferences.dm

@@ -7,6 +7,10 @@
 	var/list/gear_categories
 	var/list/chosen_gear
 	var/gear_tab
+	var/screenshake = 100
+	var/damagescreenshake = 2
+	var/arousable = TRUE
+	var/widescreenpref = TRUE
 
 /datum/preferences/New(client/C)
 	..()