Merge branch 'master' into morefamstuff

code/__DEFINES/_tick.dm

@@ -7,4 +7,7 @@
 #define TICK_USAGE_REAL world.tick_usage    //to be used where the result isn't checked
 
 #define TICK_CHECK ( TICK_USAGE > Master.current_ticklimit )
-#define CHECK_TICK if TICK_CHECK stoplag()
+#define CHECK_TICK ( TICK_CHECK ? stoplag() : 0 )
+
+#define TICK_CHECK_HIGH_PRIORITY ( TICK_USAGE > 95 )
+#define CHECK_TICK_HIGH_PRIORITY ( TICK_CHECK_HIGH_PRIORITY? stoplag() : 0 )

code/__DEFINES/flags.dm

@@ -4,6 +4,11 @@
 #define ALL (~0) //For convenience.
 #define NONE 0
 
+//for convenience
+#define ENABLE_BITFIELD(variable, flag) (variable |= (flag))
+#define DISABLE_BITFIELD(variable, flag) (variable &= ~(flag))
+#define CHECK_BITFIELD(variable, flag) (variable & flag)
+
 GLOBAL_LIST_INIT(bitflags, list(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768))
 
 // for /datum/var/datum_flags

code/__DEFINES/lighting.dm

@@ -34,6 +34,7 @@
 #define LIGHT_COLOR_BLUE       "#6496FA" //Cold, diluted blue. rgb(100, 150, 250)
 
 #define LIGHT_COLOR_BLUEGREEN  "#7DE1AF" //Light blueish green. rgb(125, 225, 175)
+#define LIGHT_COLOR_PALEBLUE   "#7DAFE1" //A pale blue-ish color. rgb(125, 175, 225)
 #define LIGHT_COLOR_CYAN       "#7DE1E1" //Diluted cyan. rgb(125, 225, 225)
 #define LIGHT_COLOR_LIGHT_CYAN "#40CEFF" //More-saturated cyan. rgb(64, 206, 255)
 #define LIGHT_COLOR_DARK_BLUE  "#6496FA" //Saturated blue. rgb(51, 117, 248)

code/__DEFINES/maths.dm

@@ -74,7 +74,7 @@
 #define ISINRANGE(val, min, max) (min <= val && val <= max)
 
 // Same as above, exclusive.
-#define ISINRANGE_EX(val, min, max) (min < val && val > max)
+#define ISINRANGE_EX(val, min, max) (min < val && val < max)
 
 #define ISINTEGER(x) (round(x) == x)
 

code/__DEFINES/misc.dm

@@ -98,8 +98,9 @@ Will print: "/mob/living/carbon/human/death" (you can optionally embed it in a s
 //Security levels
 #define SEC_LEVEL_GREEN	0
 #define SEC_LEVEL_BLUE	1
-#define SEC_LEVEL_RED	2
-#define SEC_LEVEL_DELTA	3
+#define SEC_LEVEL_AMBER 2
+#define SEC_LEVEL_RED	3
+#define SEC_LEVEL_DELTA	4
 
 //some arbitrary defines to be used by self-pruning global lists. (see master_controller)
 #define PROCESS_KILL 26	//Used to trigger removal from a processing list

code/__HELPERS/time.dm

@@ -63,96 +63,29 @@ GLOBAL_VAR_INIT(rollovercheck_last_timeofday, 0)
 
 //Takes a value of time in deciseconds.
 //Returns a text value of that number in hours, minutes, or seconds.
-/proc/DisplayTimeText(time_value, truncate = FALSE)
-	var/second = (time_value)*0.1
-	var/second_adjusted = null
-	var/second_rounded = FALSE
-	var/minute = null
-	var/hour = null
-	var/day = null
-
+/proc/DisplayTimeText(time_value, round_seconds_to = 0.1)
+	var/second = FLOOR(time_value * 0.1, round_seconds_to)
 	if(!second)
-		return "0 seconds"
-	if(second >= 60)
-		minute = FLOOR(second/60, 1)
-		second = round(second - (minute*60), 0.1)
-		second_rounded = TRUE
-	if(second)	//check if we still have seconds remaining to format, or if everything went into minute.
-		second_adjusted = round(second)	//used to prevent '1 seconds' being shown
-		if(day || hour || minute)
-			if(second_adjusted == 1 && second >= 1)
-				second = " and 1 second"
-			else if(second > 1)
-				second = " and [second_adjusted] seconds"
-			else	//shows a fraction if seconds is < 1
-				if(second_rounded) //no sense rounding again if it's already done
-					second = " and [second] seconds"
-				else
-					second = " and [round(second, 0.1)] seconds"
-		else
-			if(second_adjusted == 1 && second >= 1)
-				second = "[truncate ? "second" : "1 second"]"
-			else if(second > 1)
-				second = "[second_adjusted] seconds"
-			else
-				if(second_rounded)
-					second = "[second] seconds"
-				else
-					second = "[round(second, 0.1)] seconds"
-	else
-		second = null
-
-	if(!minute)
-		return "[second]"
-	if(minute >= 60)
-		hour = FLOOR(minute/60, 1)
-		minute = (minute - (hour*60))
-	if(minute) //alot simpler from here since you don't have to worry about fractions
-		if(minute != 1)
-			if((day || hour) && second)
-				minute = ", [minute] minutes"
-			else if((day || hour) && !second)
-				minute = " and [minute] minutes"
-			else
-				minute = "[minute] minutes"
-		else
-			if((day || hour) && second)
-				minute = ", 1 minute"
-			else if((day || hour) && !second)
-				minute = " and 1 minute"
-			else
-				minute = "[truncate ? "minute" : "1 minute"]"
-	else
-		minute = null
-
-	if(!hour)
-		return "[minute][second]"
-	if(hour >= 24)
-		day = FLOOR(hour/24, 1)
-		hour = (hour - (day*24))
+		return "right now"
+	if(second < 60)
+		return "[second] second[(second != 1)? "s":""]"
+	var/minute = FLOOR(second / 60, 1)
+	second = FLOOR(MODULUS(second, 60), round_seconds_to)
+	var/secondT
+	if(second)
+		secondT = " and [second] second[(second != 1)? "s":""]"
+	if(minute < 60)
+		return "[minute] minute[(minute != 1)? "s":""][secondT]"
+	var/hour = FLOOR(minute / 60, 1)
+	minute = MODULUS(minute, 60)
+	var/minuteT
+	if(minute)
+		minuteT = " and [minute] minute[(minute != 1)? "s":""]"
+	if(hour < 24)
+		return "[hour] hour[(hour != 1)? "s":""][minuteT][secondT]"
+	var/day = FLOOR(hour / 24, 1)
+	hour = MODULUS(hour, 24)
+	var/hourT
 	if(hour)
-		if(hour != 1)
-			if(day && (minute || second))
-				hour = ", [hour] hours"
-			else if(day && (!minute || !second))
-				hour = " and [hour] hours"
-			else
-				hour = "[hour] hours"
-		else
-			if(day && (minute || second))
-				hour = ", 1 hour"
-			else if(day && (!minute || !second))
-				hour = " and 1 hour"
-			else
-				hour = "[truncate ? "hour" : "1 hour"]"
-	else
-		hour = null
-
-	if(!day)
-		return "[hour][minute][second]"
-	if(day > 1)
-		day = "[day] days"
-	else
-		day = "[truncate ? "day" : "1 day"]"
-
-	return "[day][hour][minute][second]"
+		hourT = " and [hour] hour[(hour != 1)? "s":""]"
+	return "[day] day[(day != 1)? "s":""][hourT][minuteT][secondT]"

code/__HELPERS/unsorted.dm

@@ -1239,6 +1239,20 @@ GLOBAL_REAL_VAR(list/stack_trace_storage)
 	pixel_x = initialpixelx
 	pixel_y = initialpixely
 
+/atom/proc/do_jiggle(targetangle = 45)
+	var/matrix/OM = matrix(transform)
+	var/matrix/M = matrix(transform)
+	M.Turn(pick(-targetangle, targetangle))
+	animate(src, transform = M, time = 10, easing = ELASTIC_EASING)
+	animate(src, transform = OM, time = 10, easing = ELASTIC_EASING)
+
+/atom/proc/do_squish(squishx = 1.2, squishy = 0.6)
+	var/matrix/OM = matrix(transform)
+	var/matrix/M = matrix(transform)
+	M.Scale(squishx, squishy)
+	animate(src, transform = M, time = 10, easing = BOUNCE_EASING)
+	animate(src, transform = OM, time = 10, easing = BOUNCE_EASING)
+
 /proc/weightclass2text(var/w_class)
 	switch(w_class)
 		if(WEIGHT_CLASS_TINY)
@@ -1530,4 +1544,4 @@ GLOBAL_DATUM_INIT(dview_mob, /mob/dview, new)
 	. = list()
 	for(var/i in L)
 		if(condition.Invoke(i))
-			. |= i
+			. |= i

code/controllers/configuration/entries/game_options.dm

@@ -162,16 +162,22 @@
 	config_entry_value = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced."
 
 /datum/config_entry/string/alert_blue_upto
-	config_entry_value = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted."
+	config_entry_value = "The station has received reliable information about potential threats to the station. Security staff may have weapons visible, random searches are permitted."
 
 /datum/config_entry/string/alert_blue_downto
-	config_entry_value = "The immediate threat has passed. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still allowed."
+	config_entry_value = "Significant confirmed threats have been neutralized. Security may no longer have weapons drawn at all times, but may continue to have them visible. Random searches are still permitted."
+
+/datum/config_entry/string/alert_amber_upto
+	config_entry_value = "There are significant confirmed threats to the station. Security staff may have weapons unholstered at all times. Random searches are allowed and advised."
+
+/datum/config_entry/string/alert_amber_downto
+	config_entry_value = "The immediate threat has passed. Security is no longer authorized to use lethal force, but may continue to have weapons drawn. Access requirements have been restored."
 
 /datum/config_entry/string/alert_red_upto
-	config_entry_value = "There is an immediate serious threat to the station. Security may have weapons unholstered at all times. Random searches are allowed and advised."
+	config_entry_value = "There is an immediate serious threat to the station. Security is now authorized to use lethal force. Additionally, access requirements on some machines have been lifted."
 
 /datum/config_entry/string/alert_red_downto
-	config_entry_value = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security may have weapons unholstered at all times, random searches are allowed and advised."
+	config_entry_value = "The station's destruction has been averted. There is still however an immediate serious threat to the station. Security is still authorized to use lethal force."
 
 /datum/config_entry/string/alert_delta
 	config_entry_value = "Destruction of the station is imminent. All crew are instructed to obey all instructions given by heads of staff. Any violations of these orders can be punished by death. This is not a drill."

code/controllers/configuration/entries/general.dm

@@ -7,6 +7,9 @@
 
 /datum/config_entry/string/servername	// server name (the name of the game window)
 
+/datum/config_entry/string/servertagline
+	config_entry_value = "We forgot to set the server's tagline in config.txt"
+
 /datum/config_entry/string/serversqlname	// short form server name used for the DB
 
 /datum/config_entry/string/stationname	// station name (the name of the station in-game)

code/controllers/subsystem/shuttle.dm

@@ -281,7 +281,10 @@ SUBSYSTEM_DEF(shuttle)
 			if(emergency.timeLeft(1) < emergencyCallTime)
 				return
 		if(SEC_LEVEL_BLUE)
-			if(emergency.timeLeft(1) < emergencyCallTime * 0.5)
+			if(emergency.timeLeft(1) < emergencyCallTime * 0.6)
+				return
+		if(SEC_LEVEL_AMBER)
+			if(emergency.timeLeft(1) < emergencyCallTime * 0.4)
 				return
 		else
 			if(emergency.timeLeft(1) < emergencyCallTime * 0.25)

code/controllers/subsystem/traumas.dm

@@ -14,7 +14,7 @@ SUBSYSTEM_DEF(traumas)
 	//phobia types is to pull from randomly for brain traumas, e.g. conspiracies is for special assignment only
 	phobia_types = list("spiders", "space", "security", "clowns", "greytide", "lizards",
 						"skeletons", "snakes", "robots", "doctors", "authority", "the supernatural",
-						"aliens", "strangers", "birds", "falling", "anime", "mimes"
+						"aliens", "strangers", "birds", "falling", "anime", "mimes", "cats"
 						)
 
 	phobia_words = list("spiders"   = strings(PHOBIA_FILE, "spiders"),
@@ -35,7 +35,8 @@ SUBSYSTEM_DEF(traumas)
 						"birds" = strings(PHOBIA_FILE, "birds"),
 						"falling" = strings(PHOBIA_FILE, "falling"),
 						"anime" = strings(PHOBIA_FILE, "anime"),
-						"mimes" = strings(PHOBIA_FILE, "mimes")
+						"mimes" = strings(PHOBIA_FILE, "mimes"),
+						"cats" = strings(PHOBIA_FILE, "cats")
             )
 
 	phobia_mobs = list("spiders"  = typecacheof(list(/mob/living/simple_animal/hostile/poison/giant_spider)),
@@ -54,7 +55,8 @@ SUBSYSTEM_DEF(traumas)
 					   /mob/living/simple_animal/pet/penguin)),
 					   "birds" = typecacheof(list(/mob/living/simple_animal/parrot, /mob/living/simple_animal/chick, /mob/living/simple_animal/chicken,
 					   /mob/living/simple_animal/pet/penguin)),
-					   "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian))
+					   "anime" = typecacheof(list(/mob/living/simple_animal/hostile/guardian)),
+					   "cats"= typecacheof(list(/mob/living/simple_animal/mouse, /mob/living/simple_animal/pet/cat, /mob/living/simple_animal/hostile/cat_butcherer))
 					   )
 
 
@@ -152,7 +154,10 @@ SUBSYSTEM_DEF(traumas)
 						/obj/item/storage/backpack/mime, /obj/item/reagent_containers/food/snacks/grown/banana/mime,
 						/obj/item/grown/bananapeel/mimanapeel, /obj/item/cartridge/virus/mime, /obj/item/clothing/shoes/sneakers/mime,
 						/obj/item/bedsheet/mime, /obj/item/reagent_containers/food/snacks/burger/mime, /obj/item/clothing/head/beret, /obj/item/clothing/mask/gas/sexymime,
-						/obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence))
+						/obj/item/clothing/under/sexymime, /obj/item/toy/figure/mime, /obj/item/toy/crayon/mime, /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/silenced, /obj/mecha/combat/reticence)),
+						
+					"cats" = typecacheof(list(/obj/item/organ/ears/cat, /obj/item/organ/tail/cat, /obj/item/laser_pointer, /obj/item/toy/cattoy, /obj/item/clothing/head/kitty,
+						/obj/item/clothing/head/collectable/kitty, /obj/item/melee/chainofcommand/tailwhip/kitty, /obj/item/stack/sheet/animalhide/cat))
 						)
 
 	phobia_turfs = list("space" = typecacheof(list(/turf/open/space, /turf/open/floor/holofloor/space, /turf/open/floor/fakespace)),
@@ -170,7 +175,8 @@ SUBSYSTEM_DEF(traumas)
 						  "the supernatural" = typecacheof(list(/datum/species/golem/clockwork, /datum/species/golem/runic)),
 						  "aliens" = typecacheof(list(/datum/species/abductor, /datum/species/jelly, /datum/species/pod,
 						  /datum/species/shadow)),
-						  "anime" = typecacheof(list(/datum/species/human/felinid))
+						  "anime" = typecacheof(list(/datum/species/human/felinid)),
+						  "cats" = typecacheof(list(/datum/species/human/felinid))
 						 )				 
 
 	return ..()

code/datums/components/storage/concrete/pockets.dm

@@ -34,6 +34,7 @@
 
 /datum/component/storage/concrete/pockets/shoes/Initialize()
 	. = ..()
+	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	can_hold = typecacheof(list(
 		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen,
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,
@@ -44,6 +45,7 @@
 
 /datum/component/storage/concrete/pockets/shoes/clown/Initialize()
 	. = ..()
+	cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	can_hold = typecacheof(list(
 		/obj/item/kitchen/knife, /obj/item/switchblade, /obj/item/pen,
 		/obj/item/scalpel, /obj/item/reagent_containers/syringe, /obj/item/dnainjector,

code/datums/components/storage/concrete/rped.dm

@@ -5,7 +5,7 @@
 	click_gather = TRUE
 	max_w_class = WEIGHT_CLASS_NORMAL
 	max_combined_w_class = 100
-	max_items = 75
+	max_items = 100
 	display_numerical_stacking = TRUE
 
 /datum/component/storage/concrete/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
@@ -22,7 +22,7 @@
 	click_gather = TRUE
 	max_w_class = WEIGHT_CLASS_BULKY  // can fit vending refills
 	max_combined_w_class = 800
-	max_items = 325
+	max_items = 350
 	display_numerical_stacking = TRUE
 
 /datum/component/storage/concrete/bluespace/rped/can_be_inserted(obj/item/I, stop_messages, mob/M)
@@ -31,3 +31,6 @@
 		if (!stop_messages)
 			to_chat(M, "<span class='warning'>[parent] only accepts machine parts!</span>")
 		return FALSE
+
+/datum/component/storage/concrete/cyborg/rped
+	max_items = 150

code/datums/components/storage/storage.dm

@@ -169,10 +169,12 @@
 	if(locked)
 		to_chat(M, "<span class='warning'>[parent] seems to be locked!</span>")
 		return FALSE
+	var/atom/A = parent
 	var/obj/item/I = O
 	if(collection_mode == COLLECT_ONE)
 		if(can_be_inserted(I, null, M))
 			handle_item_insertion(I, null, M)
+			A.do_squish()
 		return
 	if(!isturf(I.loc))
 		return
@@ -189,6 +191,7 @@
 		stoplag(1)
 	qdel(progress)
 	to_chat(M, "<span class='notice'>You put everything you could [insert_preposition] [parent].</span>")
+	A.do_squish(1.4, 0.4)
 
 /datum/component/storage/proc/handle_mass_item_insertion(list/things, datum/component/storage/src_object, mob/user, datum/progressbar/progress)
 	var/atom/source_real_location = src_object.real_location()
@@ -246,6 +249,7 @@
 	while (do_after(M, 10, TRUE, T, FALSE, CALLBACK(src, .proc/mass_remove_from_storage, T, things, progress)))
 		stoplag(1)
 	qdel(progress)
+	A.do_squish(0.8, 1.2)
 
 /datum/component/storage/proc/mass_remove_from_storage(atom/target, list/things, datum/progressbar/progress, trigger_on_found = TRUE)
 	var/atom/real_location = real_location()
@@ -455,6 +459,7 @@
 			return FALSE
 		if(dump_destination.storage_contents_dump_act(src, M))
 			playsound(A, "rustle", 50, 1, -5)
+			A.do_squish(0.8, 1.2)
 			return TRUE
 	return FALSE
 
@@ -473,6 +478,8 @@
 			return TRUE
 		return FALSE
 	handle_item_insertion(I, FALSE, M)
+	var/atom/A = parent
+	A.do_squish()
 
 /datum/component/storage/proc/return_inv(recursive)
 	var/list/ret = list()
@@ -514,6 +521,7 @@
 			if(A.loc != M)
 				return
 			playsound(A, "rustle", 50, 1, -5)
+			A.do_jiggle()
 			if(istype(over_object, /obj/screen/inventory/hand))
 				var/obj/screen/inventory/hand/H = over_object
 				M.putItemFromInventoryInHandIfPossible(A, H.held_index)
@@ -539,6 +547,8 @@
 			if(!L.incapacitated() && I == L.get_active_held_item())
 				if(!SEND_SIGNAL(I, COMSIG_CONTAINS_STORAGE) && can_be_inserted(I, FALSE))	//If it has storage it should be trying to dump, not insert.
 					handle_item_insertion(I, FALSE, L)
+					var/atom/A = parent
+					A.do_squish()
 
 //This proc return 1 if the item can be picked up and 0 if it can't.
 //Set the stop_messages to stop it from printing messages
@@ -712,6 +722,7 @@
 			to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
 		else
 			show_to(user)
+			A.do_jiggle()
 
 /datum/component/storage/proc/signal_on_pickup(datum/source, mob/user)
 	var/atom/A = parent
@@ -732,16 +743,30 @@
 	return hide_from(target)
 
 /datum/component/storage/proc/on_alt_click(datum/source, mob/user)
-	if(!isliving(user) || user.incapacitated() || !quickdraw || locked || !user.CanReach(parent))
+	if(!isliving(user) || !user.CanReach(parent))
 		return
-	var/obj/item/I = locate() in real_location()
-	if(!I)
+	if(locked)
+		to_chat(user, "<span class='warning'>[parent] seems to be locked!</span>")
 		return
-	remove_from_storage(I, get_turf(user))
-	if(!user.put_in_hands(I))
-		to_chat(user, "<span class='notice'>You fumble for [I] and it falls on the floor.</span>")
+
+	var/atom/A = parent
+	if(!quickdraw)
+		A.add_fingerprint(user)
+		user_show_to_mob(user)
+		playsound(A, "rustle", 50, 1, -5)
+		return
+
+	if(!user.incapacitated())
+		var/obj/item/I = locate() in real_location()
+		if(!I)
+			return
+		A.add_fingerprint(user)
+		remove_from_storage(I, get_turf(user))
+		if(!user.put_in_hands(I))
+			to_chat(user, "<span class='notice'>You fumble for [I] and it falls on the floor.</span>")
+			return
+		user.visible_message("<span class='warning'>[user] draws [I] from [parent]!</span>", "<span class='notice'>You draw [I] from [parent].</span>")
 		return
-	user.visible_message("<span class='warning'>[user] draws [I] from [parent]!</span>", "<span class='notice'>You draw [I] from [parent].</span>")
 
 /datum/component/storage/proc/action_trigger(datum/signal_source, datum/action/source)
 	gather_mode_switch(source.owner)

code/datums/status_effects/buffs.dm

@@ -51,7 +51,7 @@
 
 /obj/screen/alert/status_effect/vanguard
 	name = "Vanguard"
-	desc = "You're absorbing stuns! 25% of all stuns taken will affect you after this effect ends."
+	desc = "You're absorbing stuns! Your stamina is greatly increased, but not infinite. 25% of all stuns taken will affect you after this effect ends."
 	icon_state = "vanguard"
 	alerttooltipstyle = "clockcult"
 
@@ -75,6 +75,7 @@
 	owner.visible_message("<span class='warning'>[owner] begins to faintly glow!</span>", "<span class='brass'>You will absorb all stuns for the next twenty seconds.</span>")
 	owner.SetStun(0, FALSE)
 	owner.SetKnockdown(0)
+	owner.setStaminaLoss(0, FALSE)
 	progbar = new(owner, duration, owner)
 	progbar.bar.color = list("#FAE48C", "#FAE48C", "#FAE48C", rgb(0,0,0))
 	progbar.update(duration - world.time)

code/datums/traits/negative.dm

@@ -269,14 +269,32 @@
 
 /datum/quirk/phobia
 	name = "Phobia"
-	desc = "You've had a traumatic past, that has scared you for life while dealing with your greatest fear."
+	desc = "You've had a traumatic past, one that has scarred you for life, and cripples you when dealing with your greatest fears."
 	value = -2 // It can hardstun you. You can be a job that your phobia targets...
-	gain_text = "<span class='danger'>You feel your fears manifest themselfs.</span>"
-	lose_text = "<span class='notice'>You feel your fears fade away.</span>"
-	medical_record_text = "Patient has an extreme or irrational fear of or aversion to something."
+	gain_text = "<span class='danger'>You begin to tremble as an immeasurable fear grips your mind.</span>"
+	lose_text = "<span class='notice'>Your confidence wipes away the fear that had been plaguing you.</span>"
+	medical_record_text = "Patient has an extreme or irrational fear and aversion to an undefined stimuli."
 	var/datum/brain_trauma/mild/phobia/phobia
-	
+
 /datum/quirk/phobia/add()
 	var/mob/living/carbon/human/H = quirk_holder
 	phobia = new
 	H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY)
+
+/datum/quirk/mute
+	name = "Mute"
+	desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak."
+	value = -2 //HALP MAINTS
+	mob_trait = TRAIT_MUTE
+	gain_text = "<span class='danger'>You find yourself unable to speak!</span>"
+	lose_text = "<span class='notice'>You feel a growing strength in your vocal chords.</span>"
+	medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity."
+
+/datum/quirk/mute/add()
+	var/mob/living/carbon/human/H = quirk_holder
+	H.gain_trauma(TRAIT_MUTE, TRAUMA_RESILIENCE_SURGERY)
+
+/datum/quirk/mute/on_process()
+	if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums))
+		to_chat(quirk_holder, "<span class='boldannounce'>Your antagonistic nature has caused your voice to be heard.</span>")
+		qdel(src)

code/datums/weather/weather_types/ash_storm.dm

@@ -93,6 +93,10 @@
 /datum/weather/ash_storm/weather_act(mob/living/L)
 	if(is_ash_immune(L))
 		return
+	if(is_species(L, /datum/species/lizard/ashwalker))
+		if(L.getStaminaLoss() <= STAMINA_SOFTCRIT)
+			L.adjustStaminaLossBuffered(4)
+		return
 	L.adjustFireLoss(4)
 
 

code/game/area/areas/centcom.dm

@@ -29,6 +29,13 @@
 /area/centcom/holding
 	name = "Holding Facility"
 
+/area/centcom/vip
+	name = "VIP Zone"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+ /area/centcom/winterball
+	name = "winterball Zone"
+	dynamic_lighting = DYNAMIC_LIGHTING_DISABLED
+
 /area/centcom/supplypod
 	name = "Supplypod Facility"
 	icon_state = "supplypod"

code/game/atoms_movable.dm

@@ -622,8 +622,12 @@
 	else if(direction & WEST)
 		pixel_x_diff = -8
 
-	animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, time = 2)
-	animate(src, pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, time = 2)
+	var/matrix/OM = matrix(transform)
+	var/matrix/M = matrix(transform)
+	M.Turn(pixel_x_diff ? pixel_x_diff*2 : pick(-16, 16))
+
+	animate(src, pixel_x = pixel_x + pixel_x_diff, pixel_y = pixel_y + pixel_y_diff, transform = M, time = 2)
+	animate(src, pixel_x = pixel_x - pixel_x_diff, pixel_y = pixel_y - pixel_y_diff, transform = OM, time = 2)
 
 /atom/movable/proc/do_item_attack_animation(atom/A, visual_effect_icon, obj/item/used_item)
 	var/image/I

code/game/gamemodes/clock_cult/clock_cult.dm

@@ -37,6 +37,7 @@ Credit where due:
 4. PJB3005 from /vg/ for the failed continuation PR
 5. Xhuis from /tg/ for coding the first iteration of the mode, and the new, reworked version
 6. ChangelingRain from /tg/ for maintaining the gamemode for months after its release prior to its rework
+7. Clockwork cult code as of now, at least the one being pulled from Citadel Station's master branch, is being, or already is, fixed by Coolgat3 and Avunia.
 
 */
 
@@ -267,7 +268,7 @@ Credit where due:
 //Servant of Ratvar outfit
 /datum/outfit/servant_of_ratvar
 	name = "Servant of Ratvar"
-	uniform = /obj/item/clothing/under/chameleon/ratvar
+	uniform = /obj/item/clothing/under/rank/engineer //no more chameleon suit for them, as requested
 	shoes = /obj/item/clothing/shoes/sneakers/black
 	back = /obj/item/storage/backpack
 	ears = /obj/item/radio/headset

code/game/gamemodes/revolution/revolution.dm

@@ -36,7 +36,7 @@
 ///////////////////////////
 /datum/game_mode/revolution/announce()
 	to_chat(world, "<B>The current game mode is - Revolution!</B>")
-	to_chat(world, "<B>Some crewmembers are attempting to start a revolution!<BR>\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.<BR>\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).</B>")
+	to_chat(world, "<B>Some crewmembers are attempting to start a revolution!<BR>\nRevolutionaries - Kill the Captain, HoP, HoS, CE, RD, QM and CMO. Convert other crewmembers (excluding the heads of staff, and security officers) to your cause by flashing them. Protect your leaders.<BR>\nPersonnel - Protect the heads of staff. Kill the leaders of the revolution, and brainwash the other revolutionaries (by beating them in the head).</B>")
 
 
 ///////////////////////////////////////////////////////////////////////////////

code/game/machinery/Sleeper.dm

@@ -212,6 +212,17 @@
 	icon_state = "sleeper_s"
 	controls_inside = TRUE
 
+/obj/machinery/sleeper/syndie/Initialize()
+	. = ..()
+	component_parts = list()
+	component_parts += new /obj/item/circuitboard/machine/sleeper(null)
+	component_parts += new /obj/item/stock_parts/matter_bin/super(null)
+	component_parts += new /obj/item/stock_parts/manipulator/pico(null)
+	component_parts += new /obj/item/stack/sheet/glass(null)
+	component_parts += new /obj/item/stack/sheet/glass(null)
+	component_parts += new /obj/item/stack/cable_coil(null)
+	RefreshParts()
+
 /obj/machinery/sleeper/syndie/fullupgrade/Initialize()
 	. = ..()
 	component_parts = list()

code/game/machinery/computer/arcade.dm

@@ -6,53 +6,116 @@
 	icon_screen = "invaders"
 	clockwork = TRUE //it'd look weird
 	var/list/prizes = list(
-		/obj/item/storage/box/snappops					= 2,
-		/obj/item/toy/talking/AI								= 2,
-		/obj/item/toy/talking/codex_gigas						= 2,
-		/obj/item/clothing/under/syndicate/tacticool			= 2,
-		/obj/item/toy/sword										= 2,
-		/obj/item/toy/gun										= 2,
-		/obj/item/gun/ballistic/shotgun/toy/crossbow	= 2,
-		/obj/item/storage/box/fakesyndiesuit				= 2,
-		/obj/item/storage/crayons						= 2,
-		/obj/item/toy/spinningtoy								= 2,
-		/obj/item/toy/prize/ripley								= 1,
-		/obj/item/toy/prize/fireripley							= 1,
-		/obj/item/toy/prize/deathripley							= 1,
-		/obj/item/toy/prize/gygax								= 1,
-		/obj/item/toy/prize/durand								= 1,
-		/obj/item/toy/prize/honk								= 1,
-		/obj/item/toy/prize/marauder							= 1,
-		/obj/item/toy/prize/seraph								= 1,
-		/obj/item/toy/prize/mauler								= 1,
-		/obj/item/toy/prize/odysseus							= 1,
-		/obj/item/toy/prize/phazon								= 1,
-		/obj/item/toy/prize/reticence							= 1,
-		/obj/item/toy/cards/deck								= 2,
-		/obj/item/toy/nuke										= 2,
-		/obj/item/toy/minimeteor								= 2,
-		/obj/item/toy/redbutton									= 2,
-		/obj/item/toy/talking/owl								= 2,
-		/obj/item/toy/talking/griffin							= 2,
-		/obj/item/coin/antagtoken						= 2,
-		/obj/item/stack/tile/fakespace/loaded					= 2,
-		/obj/item/stack/tile/fakepit/loaded						= 2,
-		/obj/item/toy/toy_xeno									= 2,
-		/obj/item/storage/box/actionfigure				= 1,
-		/obj/item/restraints/handcuffs/fake              = 2,
-		/obj/item/grenade/chem_grenade/glitter/pink		= 1,
-		/obj/item/grenade/chem_grenade/glitter/blue		= 1,
-		/obj/item/grenade/chem_grenade/glitter/white		= 1,
-		/obj/item/toy/eightball									= 2,
-		/obj/item/toy/windupToolbox								= 2,
-		/obj/item/toy/clockwork_watch							= 2,
-		/obj/item/toy/toy_dagger								= 2,
-		/obj/item/extendohand/acme								= 1,
-		/obj/item/hot_potato/harmless/toy						= 1,
-		/obj/item/card/emagfake									= 1,
-		/obj/item/clothing/shoes/wheelys				= 2,
-		/obj/item/clothing/shoes/kindleKicks				= 2,
-		/obj/item/storage/belt/military/snack					= 2
+		/obj/item/storage/box/snappops							= 8,
+		/obj/item/toy/talking/AI								= 8,
+		/obj/item/toy/talking/codex_gigas						= 8,
+		/obj/item/clothing/under/syndicate/tacticool			= 8,
+		/obj/item/toy/sword										= 8,
+		/obj/item/toy/gun										= 8,
+		/obj/item/gun/ballistic/shotgun/toy/crossbow			= 8,
+		/obj/item/storage/box/fakesyndiesuit					= 8,
+		/obj/item/storage/crayons								= 8,
+		/obj/item/toy/spinningtoy								= 8,
+		/obj/item/toy/prize/ripley								= 4,
+		/obj/item/toy/prize/fireripley							= 4,
+		/obj/item/toy/prize/deathripley							= 4,
+		/obj/item/toy/prize/gygax								= 4,
+		/obj/item/toy/prize/durand								= 4,
+		/obj/item/toy/prize/honk								= 4,
+		/obj/item/toy/prize/marauder							= 4,
+		/obj/item/toy/prize/seraph								= 4,
+		/obj/item/toy/prize/mauler								= 4,
+		/obj/item/toy/prize/odysseus							= 4,
+		/obj/item/toy/prize/phazon								= 4,
+		/obj/item/toy/prize/reticence							= 4,
+		/obj/item/toy/cards/deck								= 8,
+		/obj/item/toy/nuke										= 8,
+		/obj/item/toy/minimeteor								= 8,
+		/obj/item/toy/redbutton									= 8,
+		/obj/item/toy/talking/owl								= 8,
+		/obj/item/toy/talking/griffin							= 8,
+		/obj/item/coin/antagtoken								= 8,
+		/obj/item/stack/tile/fakespace/loaded					= 8,
+		/obj/item/stack/tile/fakepit/loaded						= 8,
+		/obj/item/toy/toy_xeno									= 8,
+		/obj/item/storage/box/actionfigure						= 4,
+		/obj/item/restraints/handcuffs/fake						= 8,
+		/obj/item/grenade/chem_grenade/glitter/pink				= 4,
+		/obj/item/grenade/chem_grenade/glitter/blue				= 4,
+		/obj/item/grenade/chem_grenade/glitter/white			= 4,
+		/obj/item/toy/eightball									= 8,
+		/obj/item/toy/windupToolbox								= 8,
+		/obj/item/toy/clockwork_watch							= 8,
+		/obj/item/toy/toy_dagger								= 8,
+		/obj/item/extendohand/acme								= 4,
+		/obj/item/hot_potato/harmless/toy						= 4,
+		/obj/item/card/emagfake									= 4,
+		/obj/item/clothing/shoes/wheelys						= 8,
+		/obj/item/clothing/shoes/kindleKicks					= 8,
+		/obj/item/storage/belt/military/snack					= 8,
+		/obj/item/toy/plush/lizardplushie						= 1,
+		/obj/item/toy/plush/lizardplushie/durgit				= 1,
+		/obj/item/toy/plush/lizardplushie/rio					= 1,
+		/obj/item/toy/plush/lizardplushie/urinsu				= 1,
+		/obj/item/toy/plush/lizardplushie/arfrehn				= 1,
+		/obj/item/toy/plush/lizardplushie/soars					= 1,
+		/obj/item/toy/plush/lizardplushie/ghostie				= 1,
+		/obj/item/toy/plush/lizardplushie/amber					= 1,
+		/obj/item/toy/plush/lizardplushie/cyan					= 1,
+		/obj/item/toy/plush/lizardplushie/meena					= 1,
+		/obj/item/toy/plush/lizardplushie/stalks				= 1,
+		/obj/item/toy/plush/lizardplushie/kobold				= 1,
+		/obj/item/toy/plush/lizardplushie/gorgi					= 1,
+		/obj/item/toy/plush/lizardplushie/almaz					= 1,
+		/obj/item/toy/plush/snakeplushie/sasha					= 1,
+		/obj/item/toy/plush/snakeplushie/shay					= 1,
+		/obj/item/toy/plush/snakeplushie/vulken					= 1,
+		/obj/item/toy/plush/mothplushie							= 1,
+		/obj/item/toy/plush/mothplushie/bumble					= 1,
+		/obj/item/toy/plush/mothplushie/nameko					= 1,
+		/obj/item/toy/plush/mothplushie/suru					= 1,
+		/obj/item/toy/plush/xeno								= 1,
+		/obj/item/toy/plush/lampplushie							= 1,
+		/obj/item/toy/plush/borgplushie							= 1,
+		/obj/item/toy/plush/borgplushie/medihound				= 1,
+		/obj/item/toy/plush/borgplushie/scrubpuppy				= 1,
+		/obj/item/toy/plush/borgplushie/seeking					= 1,
+		/obj/item/toy/plush/borgplushie/neeb					= 1,
+		/obj/item/toy/plush/bird								= 1,
+		/obj/item/toy/plush/bird/esela							= 1,
+		/obj/item/toy/plush/bird/jahonna						= 1,
+		/obj/item/toy/plush/bird/krick							= 1,
+		/obj/item/toy/plush/bird/birddi							= 1,
+		/obj/item/toy/plush/bird/jewel							= 1,
+		/obj/item/toy/plush/mammal								= 1,
+		/obj/item/toy/plush/mammal/dubious						= 1,
+		/obj/item/toy/plush/mammal/gladwyn						= 1,
+		/obj/item/toy/plush/mammal/gavin						= 1,
+		/obj/item/toy/plush/mammal/blep							= 1,
+		/obj/item/toy/plush/mammal/circe						= 1,
+		/obj/item/toy/plush/mammal/pavel						= 1,
+		/obj/item/toy/plush/mammal/oten							= 1,
+		/obj/item/toy/plush/mammal/ray							= 1,
+		/obj/item/toy/plush/mammal/dawud						= 1,
+		/obj/item/toy/plush/mammal/edgar						= 1,
+		/obj/item/toy/plush/mammal/frank						= 1,
+		/obj/item/toy/plush/mammal/poojawa						= 1,
+		/obj/item/toy/plush/mammal/hazel						= 1,
+		/obj/item/toy/plush/mammal/jermaine						= 1,
+		/obj/item/toy/plush/mammal/gunther						= 1,
+		/obj/item/toy/plush/mammal/fox							= 1,
+		/obj/item/toy/plush/mammal/zed							= 1,
+		/obj/item/toy/plush/mammal/dog							= 1,
+		/obj/item/toy/plush/mammal/dog/frost					= 1,
+		/obj/item/toy/plush/mammal/dog/atticus					= 1,
+		/obj/item/toy/plush/mammal/dog/fletch					= 1,
+		/obj/item/toy/plush/mammal/dog/vincent					= 1,
+		/obj/item/toy/plush/mammal/dog/zigfried					= 1,
+		/obj/item/toy/plush/mammal/dog/nikolai					= 1,
+		/obj/item/toy/plush/catgirl								= 1,
+		/obj/item/toy/plush/catgirl/skylar						= 1,
+		/obj/item/toy/plush/catgirl/mikeel						= 1,
+		/obj/item/toy/plush/catgirl/robin						= 1
 		)
 
 	light_color = LIGHT_COLOR_GREEN

code/game/machinery/computer/communications.dm

@@ -108,8 +108,10 @@
 						tmp_alertlevel = SEC_LEVEL_GREEN
 					if(tmp_alertlevel < SEC_LEVEL_GREEN)
 						tmp_alertlevel = SEC_LEVEL_GREEN
-					if(tmp_alertlevel > SEC_LEVEL_BLUE)
-						tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
+					if(tmp_alertlevel == SEC_LEVEL_BLUE)
+						tmp_alertlevel = SEC_LEVEL_BLUE
+					if(tmp_alertlevel > SEC_LEVEL_AMBER)
+						tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
 					set_security_level(tmp_alertlevel)
 					if(GLOB.security_level != old_level)
 						to_chat(usr, "<span class='notice'>Authorization confirmed. Modifying security level.</span>")
@@ -390,8 +392,10 @@
 				tmp_alertlevel = SEC_LEVEL_GREEN
 			if(tmp_alertlevel < SEC_LEVEL_GREEN)
 				tmp_alertlevel = SEC_LEVEL_GREEN
-			if(tmp_alertlevel > SEC_LEVEL_BLUE)
-				tmp_alertlevel = SEC_LEVEL_BLUE //Cannot engage delta with this
+			if(tmp_alertlevel == SEC_LEVEL_BLUE)
+				tmp_alertlevel = SEC_LEVEL_BLUE
+			if(tmp_alertlevel > SEC_LEVEL_AMBER)
+				tmp_alertlevel = SEC_LEVEL_AMBER //Cannot engage delta with this
 			set_security_level(tmp_alertlevel)
 			if(GLOB.security_level != old_level)
 				//Only notify people if an actual change happened
@@ -548,6 +552,7 @@
 			if(GLOB.security_level == SEC_LEVEL_DELTA)
 				dat += "<font color='red'><b>The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.</b></font>"
 			else
+				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_AMBER]'>Amber</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_BLUE]'>Blue</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=securitylevel;newalertlevel=[SEC_LEVEL_GREEN]'>Green</A>"
 		if(STATE_CONFIRM_LEVEL)
@@ -690,6 +695,7 @@
 			if(GLOB.security_level == SEC_LEVEL_DELTA)
 				dat += "<font color='red'><b>The self-destruct mechanism is active. Find a way to deactivate the mechanism to lower the alert level or evacuate.</b></font>"
 			else
+				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_AMBER]'>Amber</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_BLUE]'>Blue</A><BR>"
 				dat += "<A HREF='?src=[REF(src)];operation=ai-securitylevel;newalertlevel=[SEC_LEVEL_GREEN]'>Green</A>"
 

code/game/machinery/dance_machine.dm

@@ -5,7 +5,7 @@
 	icon_state = "jukebox"
 	verb_say = "states"
 	density = TRUE
-	req_access = list(ACCESS_BAR)
+	req_one_access = list(ACCESS_BAR, ACCESS_KITCHEN, ACCESS_HYDROPONICS, ACCESS_ENGINE, ACCESS_CARGO, ACCESS_THEATRE)
 	var/active = FALSE
 	var/list/rangers = list()
 	var/stop = 0

code/game/machinery/suit_storage_unit.dm

@@ -41,6 +41,7 @@
 /obj/machinery/suit_storage_unit/engine
 	suit_type = /obj/item/clothing/suit/space/hardsuit/engine
 	mask_type = /obj/item/clothing/mask/breath
+	storage_type= /obj/item/clothing/shoes/magboots
 
 /obj/machinery/suit_storage_unit/ce
 	suit_type = /obj/item/clothing/suit/space/hardsuit/engine/elite

code/game/mecha/equipment/weapons/weapons.dm

@@ -275,6 +275,18 @@
 	variance = 25
 	harmful = TRUE
 
+/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/seedscatter
+	name = "\improper Melon Seed \"Scattershot\""
+	desc = "A weapon for combat exosuits. Shoots a spread of pellets, shaped as seed."
+	icon_state = "mecha_scatter"
+	equip_cooldown = 30
+	projectile = /obj/item/projectile/bullet/seed
+	projectiles = 4
+	projectile_energy_cost = 55
+	projectiles_per_shot = 10
+	variance = 20
+	harmful = TRUE
+
 /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/lmg
 	name = "\improper Ultra AC 2"
 	desc = "A weapon for combat exosuits. Shoots a rapid, three shot burst."

code/game/objects/effects/effect_system/effect_system.dm

@@ -56,6 +56,8 @@ would spawn and follow the beaker, even if it is carried or thrown.
 /datum/effect_system/proc/generate_effect()
 	if(holder)
 		location = get_turf(holder)
+	if(location.contents.len > 200)		//Bandaid to prevent server crash exploit
+		return
 	var/obj/effect/E = new effect_type(location)
 	total_effects++
 	var/direction

code/game/objects/effects/glowshroom.dm

@@ -96,7 +96,7 @@
 			for(var/turf/open/floor/earth in view(3,src))
 				if(is_type_in_typecache(earth, blacklisted_glowshroom_turfs))
 					continue
-				if(!ownturf.CanAtmosPass(earth))
+				if(!disease_air_spread_walk(ownturf, earth))
 					continue
 				if(spreadsIntoAdjacent || !locate(/obj/structure/glowshroom) in view(1,earth))
 					possibleLocs += earth

code/game/objects/items.dm

@@ -536,12 +536,16 @@ GLOBAL_VAR_INIT(rpg_loot_items, FALSE)
 	callback = CALLBACK(src, .proc/after_throw, callback) //replace their callback with our own
 	. = ..(target, range, speed, thrower, spin, diagonals_first, callback)
 
-
 /obj/item/proc/after_throw(datum/callback/callback)
 	if (callback) //call the original callback
 		. = callback.Invoke()
 	throw_speed = initial(throw_speed) //explosions change this.
 	item_flags &= ~IN_INVENTORY
+	var/matrix/M = matrix(transform)
+	M.Turn(rand(-170, 170))
+	transform = M
+	pixel_x = rand(-12, 12)
+	pixel_y = rand(-12, 12)
 
 /obj/item/proc/remove_item_from_storage(atom/newLoc) //please use this if you're going to snowflake an item out of a obj/item/storage
 	if(!newLoc)

code/game/objects/items/RCD.dm

@@ -36,6 +36,7 @@ RLD
 	var/no_ammo_message = "<span class='warning'>The \'Low Ammo\' light on the device blinks yellow.</span>"
 	var/has_ammobar = FALSE	//controls whether or not does update_icon apply ammo indicator overlays
 	var/ammo_sections = 10	//amount of divisions in the ammo indicator overlay/number of ammo indicator states
+	var/custom_range = 7
 
 /obj/item/construction/Initialize()
 	. = ..()
@@ -75,6 +76,10 @@ RLD
 		loaded = loadwithsheets(W, plasmarglassmultiplier*sheetmultiplier, user) //8 matter for one plasma rglass sheet
 	else if(istype(W, /obj/item/stack/sheet/rglass))
 		loaded = loadwithsheets(W, rglassmultiplier*sheetmultiplier, user) //6 matter for one rglass sheet
+	else if(istype(W, /obj/item/stack/rods))
+		loaded = loadwithsheets(W, sheetmultiplier * 0.5, user) // 2 matter for 1 rod, as 2 rods are produced from 1 metal
+	else if(istype(W, /obj/item/stack/tile/plasteel))
+		loaded = loadwithsheets(W, sheetmultiplier * 0.25, user) // 1 matter for 1 floortile, as 4 tiles are produced from 1 metal
 	if(loaded)
 		to_chat(user, "<span class='notice'>[src] now holds [matter]/[max_matter] matter-units.</span>")
 	else
@@ -119,7 +124,7 @@ RLD
 	return .
 
 /obj/item/construction/proc/range_check(atom/A, mob/user)
-	if(!(A in view(7, get_turf(user))))
+	if(!(A in range(custom_range, get_turf(user))))
 		to_chat(user, "<span class='warning'>The \'Out of Range\' light on [src] blinks red.</span>")
 		return FALSE
 	else
@@ -445,13 +450,23 @@ RLD
 	matter = 160
 
 /obj/item/construction/rcd/combat
-	name = "industrial RCD"
+	name = "Combat RCD"
+	desc = "A device used to rapidly build and deconstruct. Reload with metal, plasteel, glass or compressed matter cartridges. This RCD has been upgraded to be able to remove Rwalls!"
 	icon_state = "ircd"
 	item_state = "ircd"
 	max_matter = 500
 	matter = 500
 	canRturf = TRUE
 
+/obj/item/construction/rcd/industrial
+	name = "industrial RCD"
+	icon_state = "ircd"
+	item_state = "ircd"
+	max_matter = 500
+	matter = 500
+	delay_mod = 0.6
+	sheetmultiplier	= 8
+
 /obj/item/rcd_ammo
 	name = "compressed matter cartridge"
 	desc = "Highly compressed matter for the RCD."
@@ -464,6 +479,8 @@ RLD
 	var/ammoamt = 40
 
 /obj/item/rcd_ammo/large
+	name = "large compressed matter cartridge"
+	desc = "Highly compressed matter for the RCD. Has four times the matter packed into the same space as a normal cartridge."
 	materials = list(MAT_METAL=48000, MAT_GLASS=32000)
 	ammoamt = 160
 
@@ -509,8 +526,9 @@ RLD
 	icon_state = "rld-5"
 	lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
-	matter = 200
-	max_matter = 200
+	matter = 500
+	max_matter = 500
+	sheetmultiplier = 16
 	var/mode = LIGHT_MODE
 	actions_types = list(/datum/action/item_action/pick_color)
 
@@ -521,7 +539,7 @@ RLD
 
 	var/walldelay = 10
 	var/floordelay = 10
-	var/decondelay = 15
+	var/decondelay = 10
 
 	var/color_choice = null
 

code/game/objects/items/devices/flashlight.dm

@@ -35,6 +35,7 @@
 /obj/item/flashlight/attack_self(mob/user)
 	on = !on
 	update_brightness(user)
+	playsound(user, on ? 'sound/weapons/magin.ogg' : 'sound/weapons/magout.ogg', 40, 1)
 	for(var/X in actions)
 		var/datum/action/A = X
 		A.UpdateButtonIcon()

code/game/objects/items/extinguisher.dm

@@ -42,6 +42,18 @@
 	sprite_name = "miniFE"
 	dog_fashion = null
 
+/obj/item/extinguisher/mini/family
+	name = "pocket fire extinguisher"
+	desc = "A old fashen pocket fire extinguisher that has been modified with a larger water tank, and a small high-power sprayer. It feels cool to the touch and has a small humming to it..."
+	icon_state = "miniFE0"
+	item_state = "miniFE"
+	throwforce = 1
+	w_class = WEIGHT_CLASS_SMALL
+	force = 2
+	max_water = 40
+	power = 7
+	cooling_power = 3
+
 /obj/item/extinguisher/Initialize()
 	. = ..()
 	create_reagents(max_water)

code/game/objects/items/holy_weapons.dm

@@ -11,12 +11,45 @@
 	strip_delay = 80
 	dog_fashion = null
 
+// CITADEL CHANGES: More variants
+/obj/item/clothing/head/helmet/chaplain/bland
+	icon_state = "knight_generic"
+	item_state = "knight_generic"
+
+/obj/item/clothing/head/helmet/chaplain/bland/horned
+	name = "horned crusader helmet"
+	desc = "Helfen, Wehren, Heilen."
+	icon_state = "knight_horned"
+	item_state = "knight_horned"
+
+/obj/item/clothing/head/helmet/chaplain/bland/winged
+	name = "winged crusader helmet"
+	desc = "Helfen, Wehren, Heilen."
+	icon_state = "knight_winged"
+	item_state = "knight_winged"
+// CITADEL CHANGES ENDS HERE
+
 /obj/item/clothing/suit/armor/riot/chaplain
 	name = "crusader armour"
 	desc = "God wills it!"
 	icon_state = "knight_templar"
 	item_state = "knight_templar"
 
+// CITADEL CHANGES: More variants
+/obj/item/clothing/suit/armor/riot/chaplain/teutonic
+	desc = "Help, Defend, Heal!"
+	icon_state = "knight_teutonic"
+	item_state = "knight_teutonic"
+
+/obj/item/clothing/suit/armor/riot/chaplain/teutonic/alt
+	icon_state = "knight_teutonic_alt"
+	item_state = "knight_teutonic_alt"
+
+/obj/item/clothing/suit/armor/riot/chaplain/hospitaller
+	icon_state = "knight_hospitaller"
+	item_state = "knight_hospitaller"
+// CITADEL CHANGES ENDS HERE
+
 /obj/item/holybeacon
 	name = "armaments beacon"
 	desc = "Contains a set of armaments for the chaplain."
@@ -60,6 +93,22 @@
 	new /obj/item/clothing/head/helmet/chaplain(src)
 	new /obj/item/clothing/suit/armor/riot/chaplain(src)
 
+// CITADEL CHANGES: More Variants
+/obj/item/storage/box/holy/teutonic
+	name = "Teutonic Kit"
+
+/obj/item/storage/box/holy/teutonic/PopulateContents() // It just works
+	pick(new /obj/item/clothing/head/helmet/chaplain/bland/horned(src), new /obj/item/clothing/head/helmet/chaplain/bland/winged(src))
+	pick(new /obj/item/clothing/suit/armor/riot/chaplain/teutonic(src), new /obj/item/clothing/suit/armor/riot/chaplain/teutonic/alt(src))
+
+/obj/item/storage/box/holy/hospitaller
+	name = "Hospitaller Kit"
+
+/obj/item/storage/box/holy/hospitaller/PopulateContents()
+	new /obj/item/clothing/head/helmet/chaplain/bland(src)
+	new /obj/item/clothing/suit/armor/riot/chaplain/hospitaller(src)
+// CITADEL CHANGES ENDS HERE
+
 /obj/item/storage/box/holy/student
 	name = "Profane Scholar Kit"
 
@@ -210,7 +259,7 @@
 	if(QDELETED(src) || !choice || M.stat || !in_range(M, src) || M.restrained() || !M.canmove || reskinned)
 		return
 
-	var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new 
+	var/A = display_names[choice] // This needs to be on a separate var as list member access is not allowed for new
 	holy_weapon = new A
 
 	SSreligion.holy_weapon_type = holy_weapon.type

code/game/objects/items/implants/implant_mindshield.dm

@@ -29,8 +29,12 @@
 		if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable)
 			if(!silent)
 				target.visible_message("<span class='warning'>[target] seems to resist the implant!</span>", "<span class='warning'>You feel something interfering with your mental conditioning, but you resist it!</span>")
+			var/obj/item/implanter/I = loc
 			removed(target, 1)
 			qdel(src)
+			if(istype(I))
+				I.imp = null
+				I.update_icon()
 			return FALSE
 
 		var/datum/antagonist/rev/rev = target.mind.has_antag_datum(/datum/antagonist/rev)

code/game/objects/items/kitchen.dm

@@ -176,3 +176,12 @@
 	user.visible_message("<span class='suicide'>[user] begins flattening [user.p_their()] head with \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return BRUTELOSS
 /* Trays  moved to /obj/item/storage/bag */
+
+/obj/item/kitchen/knife/scimitar
+	name = "Scimitar knife"
+	desc = "A knife used to cleanly butcher. Its razor-sharp edge has been honed for butchering, but has been poorly maintained over the years."
+	attack_verb = list("cleaved", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/kitchen/knife/scimiar/Initialize()
+	. = ..()
+	AddComponent(/datum/component/butchering, 90 - force, 100, force - 60) //bonus chance increases depending on force

code/game/objects/items/mop.dm

@@ -15,7 +15,7 @@
 	var/mopping = 0
 	var/mopcount = 0
 	var/mopcap = 5
-	var/mopspeed = 30
+	var/stamusage = 5
 	force_string = "robust... against germs"
 	var/insertable = TRUE
 
@@ -39,6 +39,12 @@
 	if(!proximity)
 		return
 
+	var/mob/living/L = user
+
+	if(istype(L) && L.getStaminaLoss() >= STAMINA_SOFTCRIT)
+		to_chat(user, "<span class='danger'>You're too exhausted for that.</span>")
+		return
+
 	if(reagents.total_volume < 1)
 		to_chat(user, "<span class='warning'>Your mop is dry!</span>")
 		return
@@ -49,11 +55,13 @@
 		return
 
 	if(T)
-		user.visible_message("[user] begins to clean \the [T] with [src].", "<span class='notice'>You begin to clean \the [T] with [src]...</span>")
-
-		if(do_after(user, src.mopspeed, target = T))
-			to_chat(user, "<span class='notice'>You finish mopping.</span>")
-			clean(T)
+		user.visible_message("[user] cleans \the [T] with [src].", "<span class='notice'>You clean \the [T] with [src].</span>")
+		clean(T)
+		user.changeNext_move(CLICK_CD_MELEE)
+		user.do_attack_animation(T, used_item = src)
+		if(istype(L))
+			L.adjustStaminaLossBuffered(stamusage)
+		playsound(T, "slosh", 50, 1)
 
 
 /obj/effect/attackby(obj/item/I, mob/user, params)
@@ -86,7 +94,7 @@
 	force = 6
 	throwforce = 8
 	throw_range = 4
-	mopspeed = 20
+	stamusage = 2
 	var/refill_enabled = TRUE //Self-refill toggle for when a janitor decides to mop with something other than water.
 	var/refill_rate = 1 //Rate per process() tick mop refills itself
 	var/refill_reagent = "water" //Determins what reagent to use for refilling, just in case someone wanted to make a HOLY MOP OF PURGING

code/game/objects/items/paint.dm

@@ -56,22 +56,34 @@
 	icon_state = "paint_neutral"
 
 /obj/item/paint/anycolor/attack_self(mob/user)
-	var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "blue", "green", "yellow", "violet", "black", "white")
+	var/t1 = input(user, "Please select a color:", "Locking Computer", null) in list( "red", "pink", "blue", "cyan", "green", "lime", "yellow", "orange", "violet", "purple", "black", "gray", "white")
 	if ((user.get_active_held_item() != src || user.stat || user.restrained()))
 		return
 	switch(t1)
 		if("red")
 			item_color = "C73232"
+		if("pink")
+			item_color = "FFC0CD"
 		if("blue")
 			item_color = "5998FF"
+		if("cyan")
+			item_color = "00FFFF"
 		if("green")
 			item_color = "2A9C3B"
+		if("lime")
+			item_color = "00FF00"
 		if("yellow")
 			item_color = "CFB52B"
+		if("orange")
+			item_color = "fFA700"
 		if("violet")
 			item_color = "AE4CCD"
+		if("purple")
+			item_color = "800080"
 		if("white")
 			item_color = "FFFFFF"
+		if("gray")
+			item_color = "808080"
 		if("black")
 			item_color = "333333"
 	icon_state = "paint_[t1]"

code/game/objects/items/plushes.dm

@@ -486,13 +486,79 @@
 	attack_verb = list("clawed", "hissed", "tail slapped")
 	squeak_override = list('sound/weapons/slash.ogg' = 1)
 
+/obj/item/toy/plush/lizardplushie/durgit
+	icon_state = "durgit"
+	item_state = "durgit"
+	squeak_override = list('modular_citadel/sound/voice/weh.ogg' = 1) //Durgit's the origin of the sound
+
+/obj/item/toy/plush/lizardplushie/rio
+	icon_state = "rio"
+	item_state = "rio"
+
+/obj/item/toy/plush/lizardplushie/urinsu
+	icon_state = "urinsu"
+	item_state = "urinsu"
+
+/obj/item/toy/plush/lizardplushie/arfrehn
+	icon_state = "arfrehn"
+	item_state = "arfrehn"
+
+/obj/item/toy/plush/lizardplushie/soars
+	icon_state = "soars"
+	item_state = "soars"
+
+/obj/item/toy/plush/lizardplushie/ghostie
+	icon_state = "ghostie"
+	item_state = "ghostie"
+
+/obj/item/toy/plush/lizardplushie/amber
+	icon_state = "amber"
+	item_state = "amber"
+
+/obj/item/toy/plush/lizardplushie/cyan
+	icon_state = "cyan"
+	item_state = "cyan"
+
+/obj/item/toy/plush/lizardplushie/meena
+	icon_state = "meena"
+	item_state = "meena"
+
+/obj/item/toy/plush/lizardplushie/stalks
+	icon_state = "stalks"
+	item_state = "stalks"
+
+/obj/item/toy/plush/lizardplushie/kobold
+	icon_state = "kobold"
+	item_state = "kobold"
+
+/obj/item/toy/plush/lizardplushie/gorgi
+	icon_state = "gorgi"
+	item_state = "gorgi"
+
+/obj/item/toy/plush/lizardplushie/almaz
+	icon_state = "almaz"
+	item_state = "almaz"
+	squeak_override = list('modular_citadel/sound/voice/raptor_purr.ogg' = 1)
+
 /obj/item/toy/plush/snakeplushie
 	name = "snake plushie"
 	desc = "An adorable stuffed toy that resembles a snake. Not to be mistaken for the real thing."
 	icon_state = "plushie_snake"
 	item_state = "plushie_snake"
 	attack_verb = list("bitten", "hissed", "tail slapped")
-	squeak_override = list('sound/weapons/bite.ogg' = 1)
+	squeak_override = list('sound/voice/lowHiss2.ogg' = 1)
+
+/obj/item/toy/plush/snakeplushie/sasha
+	icon_state = "sasha"
+	item_state = "sasha"
+
+/obj/item/toy/plush/snakeplushie/shay
+	icon_state = "shay"
+	item_state = "shay"
+
+/obj/item/toy/plush/snakeplushie/vulken
+	icon_state = "vulken"
+	item_state = "vulken"
 
 /obj/item/toy/plush/nukeplushie
 	name = "operative plushie"
@@ -517,6 +583,229 @@
 	icon_state = "plushie_awake"
 	item_state = "plushie_awake"
 
+/obj/item/toy/plush/mothplushie
+	name = "insect plushie"
+	desc = "An adorable stuffed toy that resembles some kind of insect"
+	icon_state = "cydia"
+	item_state = "cydia"
+	squeak_override = list('modular_citadel/sound/voice/mothsqueak.ogg' = 1)
+
+/obj/item/toy/plush/mothplushie/bumble
+	icon_state = "bumble"
+	item_state = "bumble"
+
+/obj/item/toy/plush/mothplushie/nameko
+	icon_state = "nameko"
+	item_state = "nameko"
+
+/obj/item/toy/plush/mothplushie/suru
+	icon_state = "suru"
+	item_state = "suru"
+
+/obj/item/toy/plush/xeno
+	name = "xenohybrid plushie"
+	desc = "An adorable stuffed toy that resmembles a xenomorphic crewmember."
+	icon_state = "seras"
+	item_state = "seras"
+	squeak_override = list('sound/voice/hiss2.ogg' = 1)
+
+/obj/item/toy/plush/lampplushie
+	name = "lamp plushie"
+	desc = "A toy lamp plushie, doesn't actually make light, but it still toggles on and off. Click clack!"
+	icon_state = "plushie_lamp"
+	item_state = "plushie_lamp"
+	attack_verb = list("lit", "flickered", "flashed")
+	squeak_override = list('sound/weapons/magout.ogg' = 1)
+
+/obj/item/toy/plush/borgplushie
+	name = "robot plushie"
+	desc = "An adorable stuffed toy of a robot."
+	icon_state = "securityk9"
+	item_state = "securityk9"
+	attack_verb = list("beeped", "booped", "pinged")
+	squeak_override = list('sound/machines/beep.ogg' = 1)
+
+/obj/item/toy/plush/borgplushie/medihound
+	icon_state = "medihound"
+	item_state = "medihound"
+
+/obj/item/toy/plush/borgplushie/scrubpuppy
+	icon_state = "scrubpuppy"
+	item_state = "scrubpuppy"
+
+/obj/item/toy/plush/borgplushie/seeking
+	icon_state = "seeking"
+	item_state = "seeking"
+
+/obj/item/toy/plush/borgplushie/neeb
+	icon_state = "neeb"
+	item_state = "neeb"
+
+/obj/item/toy/plush/bird
+	name = "bird plushie"
+	desc = "An adorable stuffed plushie that resembles an avian."
+	icon_state = "sylas"
+	item_state = "sylas"
+	attack_verb = list("peeped", "beeped", "poofed")
+	squeak_override = list('modular_citadel/sound/voice/peep.ogg' = 1)
+
+/obj/item/toy/plush/bird/esela
+	icon_state = "esela"
+	item_state = "esela"
+
+/obj/item/toy/plush/bird/jahonna
+	icon_state = "jahonna"
+	item_state = "jahonna"
+
+/obj/item/toy/plush/bird/krick
+	icon_state = "krick"
+	item_state = "krick"
+
+/obj/item/toy/plush/bird/birddi
+	icon_state = "birddi"
+	item_state = "birddi"
+
+/obj/item/toy/plush/bird/jewel
+	icon_state = "jewel"
+	item_state = "jewel"
+
+/obj/item/toy/plush/mammal
+	name = "mammal plushie"
+	desc = "An adorable stuffed toy resembling some sort of mammallian crew member."
+	icon_state = "faux"
+	item_state = "faux"
+
+/obj/item/toy/plush/mammal/dubious
+	icon_state = "dubious"
+	item_state = "dubious"
+
+/obj/item/toy/plush/mammal/gladwyn
+	icon_state = "gladwyn"
+	item_state = "gladwyn"
+
+/obj/item/toy/plush/mammal/gavin
+	icon_state = "gavin"
+	item_state = "gavin"
+
+/obj/item/toy/plush/mammal/blep
+	icon_state = "blep"
+	item_state = "blep"
+
+/obj/item/toy/plush/mammal/circe
+	icon_state = "circe"
+	item_state = "circe"
+
+/obj/item/toy/plush/mammal/pavel
+	icon_state = "pavel"
+	item_state = "pavel"
+
+/obj/item/toy/plush/mammal/oten
+	icon_state = "oten"
+	item_state = "oten"
+
+/obj/item/toy/plush/mammal/ray
+	icon_state = "ray"
+	item_state = "ray"
+
+/obj/item/toy/plush/mammal/dawud
+	icon_state = "dawud"
+	item_state = "dawud"
+
+/obj/item/toy/plush/mammal/edgar
+	icon_state = "edgar"
+	item_state = "edgar"
+
+/obj/item/toy/plush/mammal/frank
+	icon_state = "frank"
+	item_state = "frank"
+
+/obj/item/toy/plush/mammal/poojawa
+	icon_state = "poojawa"
+	item_state = "poojawa"
+
+/obj/item/toy/plush/mammal/hazel
+	icon_state = "hazel"
+	item_state = "hazel"
+
+/obj/item/toy/plush/mammal/joker
+	icon_state = "joker"
+	item_state = "joker"
+
+/obj/item/toy/plush/mammal/jermaine
+	icon_state = "jermaine"
+	item_state = "jermaine"
+
+/obj/item/toy/plush/mammal/gunther
+	icon_state = "gunther"
+	item_state = "gunther"
+
+/obj/item/toy/plush/mammal/fox
+	icon_state = "fox"
+	item_state = "fox"
+
+/obj/item/toy/plush/mammal/zed
+	icon_state = "zed"
+	item_state = "zed"
+
+/obj/item/toy/plush/mammal/dog
+	desc = "An adorable stuffed toy that resembles a canine."
+	icon_state = "katlin"
+	item_state = "katlin"
+	attack_verb = list("barked", "boofed", "borked")
+	squeak_override = list(
+	'modular_citadel/sound/voice/bark1.ogg' = 1,
+	'modular_citadel/sound/voice/bark2.ogg' = 1
+	)
+
+/obj/item/toy/plush/mammal/dog/frost
+	icon_state = "frost"
+	item_state = "frost"
+
+/obj/item/toy/plush/mammal/dog/atticus
+	icon_state = "atticus"
+	item_state = "atticus"
+
+/obj/item/toy/plush/mammal/dog/fletch
+	icon_state = "fletch"
+	item_state = "fletch"
+
+/obj/item/toy/plush/mammal/dog/vincent
+	icon_state = "vincent"
+	item_state = "vincent"
+
+/obj/item/toy/plush/mammal/dog/zigfried
+	desc = "An adorable stuffed toy of a very good boy."
+	icon_state = "zigfried"
+	item_state = "zigfried"
+
+/obj/item/toy/plush/mammal/dog/nikolai
+	icon_state = "nikolai"
+	item_state = "nikolai"
+
+/obj/item/toy/plush/catgirl
+	name = "feline plushie"
+	desc = "An adorable stuffed toy that resembles a felinid."
+	icon_state = "bailey"
+	item_state = "bailey"
+	attack_verb = list("headbutt", "scritched", "bit")
+	squeak_override = list('modular_citadel/sound/voice/nya.ogg' = 1)
+
+/obj/item/toy/plush/catgirl/mikeel
+	desc = "An adorable stuffed toy of some tauric cat person."
+	icon_state = "mikeel"
+	item_state = "mikeel"
+
+/obj/item/toy/plush/catgirl/skylar
+	desc = "An adorable stuffed toy that resembles a degenerate."
+	icon_state = "skylar"
+	item_state = "skylar"
+	attack_verb = list("powergamed", "merged", "tabled")
+	squeak_override = list('sound/effects/meow1.ogg' = 1)
+
+/obj/item/toy/plush/catgirl/robin
+	icon_state = "robin"
+	item_state = "robin"
+
 /obj/item/toy/plush/awakenedplushie/ComponentInitialize()
 	. = ..()
 	AddComponent(/datum/component/edit_complainer)

code/game/objects/items/stacks/sheets/glass.dm

@@ -266,6 +266,9 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
 		if("large")
 			pixel_x = rand(-5, 5)
 			pixel_y = rand(-5, 5)
+	var/matrix/M = matrix(transform)
+	M.Turn(rand(-170, 170))
+	transform = M
 
 /obj/item/shard/afterattack(atom/A as mob|obj, mob/user, proximity)
 	. = ..()

code/game/objects/items/stacks/sheets/sheet_types.dm

@@ -190,8 +190,10 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
 	new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
 	new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe("plywood chair", /obj/structure/chair/comfy/plywood, 4, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
+	new/datum/stack_recipe("rustic wooden door", /obj/structure/mineral_door/woodrustic, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
 	new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \

code/game/objects/items/storage/backpack.dm

@@ -441,6 +441,23 @@
 	new /obj/item/clothing/mask/muzzle(src)
 	new /obj/item/mmi/syndie(src)
 
+/obj/item/storage/backpack/duffelbag/syndie/surgery_adv
+	name = "advanced surgery duffel bag"
+	desc = "A large duffel bag for holding surgical tools. Bears the logo of an advanced med-tech firm."
+
+/obj/item/storage/backpack/duffelbag/syndie/surgery_adv/PopulateContents()
+	new /obj/item/hemostat/adv(src)
+	new /obj/item/circular_saw/adv(src)
+	new /obj/item/scalpel/adv(src)
+	new /obj/item/retractor/adv(src)
+	new /obj/item/cautery/adv(src)
+	new /obj/item/surgicaldrill/adv(src)
+	new /obj/item/surgical_drapes(src)
+	new /obj/item/storage/firstaid/tactical(src)
+	new /obj/item/clothing/suit/straight_jacket(src)
+	new /obj/item/clothing/mask/muzzle(src)
+	new /obj/item/mmi/syndie(src)
+
 /obj/item/storage/backpack/duffelbag/syndie/ammo
 	name = "ammunition duffel bag"
 	desc = "A large duffel bag for holding extra weapons ammunition and supplies."

code/game/objects/items/storage/belt.dm

@@ -168,6 +168,20 @@
 		/obj/item/pinpointer/crew
 		))
 
+
+/obj/item/storage/belt/medical/surgery_belt_adv
+	name = "surgical supply belt"
+	desc = "A specialized belt designed for holding surgical equipment. It seems to have specific pockets for each and every surgical tool you can think of."
+
+/obj/item/storage/belt/medical/surgery_belt_adv/PopulateContents()
+	new /obj/item/hemostat/adv(src)
+	new /obj/item/circular_saw/adv(src)
+	new /obj/item/scalpel/adv(src)
+	new /obj/item/retractor/adv(src)
+	new /obj/item/cautery/adv(src)
+	new /obj/item/surgicaldrill/adv(src)
+	new /obj/item/surgical_drapes(src)
+
 /obj/item/storage/belt/security
 	name = "security belt"
 	desc = "Can hold security gear like handcuffs and flashes."

code/game/objects/items/storage/firstaid.dm

@@ -99,6 +99,26 @@
 		new /obj/item/storage/pill_bottle/charcoal(src)
 	new /obj/item/healthanalyzer(src)
 
+/obj/item/storage/firstaid/radbgone
+	name = "radiation treatment kit"
+	desc = "Used to treat minor toxic blood content and major radiation poisoning."
+	icon_state = "antitoxin"
+	item_state = "firstaid-toxin"
+
+/obj/item/storage/firstaid/radbgone/suicide_act(mob/living/carbon/user)
+	user.visible_message("<span class='suicide'>[user] begins licking the lead paint off \the [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	return TOXLOSS
+
+/obj/item/storage/firstaid/radbgone/PopulateContents()
+	if(empty)
+		return
+	new /obj/item/reagent_containers/syringe/charcoal(src)
+	new /obj/item/storage/pill_bottle/charcoal(src)
+	new /obj/item/reagent_containers/pill/mutadone(src)
+	new /obj/item/reagent_containers/pill/antirad(src)
+	new /obj/item/reagent_containers/food/drinks/bottle/vodka(src)
+	new /obj/item/healthanalyzer(src)
+
 /obj/item/storage/firstaid/o2
 	name = "oxygen deprivation treatment kit"
 	desc = "A box full of oxygen goodies."
@@ -191,6 +211,14 @@
 	for(var/i in 1 to 7)
 		new /obj/item/reagent_containers/pill/charcoal(src)
 
+/obj/item/storage/pill_bottle/antirad
+	name = "bottle of charcoal pills"
+	desc = "Contains pills used to counter radiation poisoning."
+
+/obj/item/storage/pill_bottle/anitrad/PopulateContents()
+	for(var/i in 1 to 5)
+		new /obj/item/reagent_containers/pill/antirad(src)
+
 /obj/item/storage/pill_bottle/epinephrine
 	name = "bottle of epinephrine pills"
 	desc = "Contains pills used to stabilize patients."

code/game/objects/items/storage/toolbox.dm

@@ -84,13 +84,6 @@
 	//Citadel change buffed to base levels
 	total_mass = 2
 
-/obj/item/storage/toolbox/mechanical/old/heirloom/afterattack(atom/A, mob/user, proximity) //Citadel Adds massive buff to machinery destruction
-	. = ..()
-	if(proximity)
-		if(isobj(A))
-			var/obj/O = A
-			O.take_damage(20)
-
 /obj/item/storage/toolbox/mechanical/old/heirloom/PopulateContents()
 	return
 

code/game/objects/items/storage/wallets.dm

@@ -13,6 +13,7 @@
 	. = ..()
 	GET_COMPONENT(STR, /datum/component/storage)
 	STR.max_items = 4
+	STR.cant_hold = typecacheof(list(/obj/item/screwdriver/power))
 	STR.can_hold = typecacheof(list(
 		/obj/item/stack/spacecash,
 		/obj/item/card,

code/game/objects/items/toys.dm

@@ -1039,6 +1039,7 @@
 	icon = 'icons/obj/toy.dmi'
 	icon_state = "snowball"
 	throwforce = 12 //pelt your enemies to death with lumps of snow
+	damtype = STAMINA
 
 /obj/item/toy/snowball/afterattack(atom/target as mob|obj|turf|area, mob/user)
 	. = ..()

code/game/objects/structures/beds_chairs/chair.dm

@@ -192,6 +192,17 @@
 /obj/structure/chair/comfy/lime
 	color = rgb(255,251,0)
 
+/obj/structure/chair/comfy/plywood
+	name = "plywood chair"
+	desc = "A relaxing plywood chair."
+	icon_state = "plywood_chair"
+	anchored = FALSE
+	buildstacktype = /obj/item/stack/sheet/mineral/wood
+	buildstackamount = 4
+
+/obj/structure/chair/comfy/plywood/GetArmrest()
+	return mutable_appearance('icons/obj/chairs.dmi', "plywood_chair_armrest")
+
 /obj/structure/chair/comfy/shuttle
 	name = "shuttle seat"
 	desc = "A comfortable, secure seat. It has a more sturdy looking buckling system, for smoother flights."

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

@@ -74,6 +74,7 @@
 	new /obj/item/door_remote/chief_medical_officer(src)
 	new /obj/item/clothing/neck/petcollar(src)
 	new /obj/item/pet_carrier(src)
+	new /obj/item/storage/belt/medical/surgery_belt_adv(src)
 	new /obj/item/wallframe/defib_mount(src)
 	new /obj/item/circuitboard/machine/techfab/department/medical(src)
 	new /obj/item/storage/photo_album/CMO(src)
@@ -99,4 +100,4 @@
 	new /obj/item/storage/box/pillbottles(src)
 	new /obj/item/storage/box/pillbottles(src)
 	new /obj/item/storage/box/medsprays(src)
-	new /obj/item/storage/box/medsprays(src)
+	new /obj/item/storage/box/medsprays(src)

code/game/objects/structures/crates_lockers/closets/utility_closets.dm

@@ -63,7 +63,8 @@
 
 /obj/structure/closet/firecloset/PopulateContents()
 	..()
-
+	if (prob(50))
+		new /obj/item/reagent_containers/hypospray/medipen/firelocker(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/tank/internals/oxygen/red(src)
@@ -71,6 +72,9 @@
 	new /obj/item/clothing/head/hardhat/red(src)
 
 /obj/structure/closet/firecloset/full/PopulateContents()
+	..()
+	if (prob(50))
+		new /obj/item/reagent_containers/hypospray/medipen/firelocker(src)
 	new /obj/item/clothing/suit/fire/firefighter(src)
 	new /obj/item/clothing/mask/gas(src)
 	new /obj/item/flashlight(src)
@@ -132,6 +136,8 @@
 
 /obj/structure/closet/radiation/PopulateContents()
 	..()
+	if(prob(50))
+		new /obj/item/storage/firstaid/radbgone(src)
 	new /obj/item/geiger_counter(src)
 	new /obj/item/clothing/suit/radiation(src)
 	new /obj/item/clothing/head/radiation(src)
@@ -146,18 +152,38 @@
 
 /obj/structure/closet/bombcloset/PopulateContents()
 	..()
+	if(prob(70))
+		new /obj/item/screwdriver(src)
+	if(prob(50))
+		new /obj/item/multitool(src)
+	if(prob(70))
+		new /obj/item/wirecutters(src)
 	new /obj/item/clothing/suit/bomb_suit(src)
 	new /obj/item/clothing/under/color/black(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)
 	new /obj/item/clothing/head/bomb_hood(src)
 
 /obj/structure/closet/bombcloset/security/PopulateContents()
+	..()
+	if(prob(90))
+		new /obj/item/screwdriver(src)
+	if(prob(70))
+		new /obj/item/multitool(src)
+	if(prob(90))
+		new /obj/item/wirecutters(src)
 	new /obj/item/clothing/suit/bomb_suit/security(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/head/bomb_hood/security(src)
 
 /obj/structure/closet/bombcloset/white/PopulateContents()
+	..()
+	if(prob(50))
+		new /obj/item/screwdriver(src)
+	if(prob(20))
+		new /obj/item/multitool(src)
+	if(prob(50))
+		new /obj/item/wirecutters(src)
 	new /obj/item/clothing/suit/bomb_suit/white(src)
 	new /obj/item/clothing/under/color/black(src)
 	new /obj/item/clothing/shoes/sneakers/black(src)

code/game/objects/structures/fluff.dm

@@ -70,6 +70,13 @@
 	desc = "A towering basalt sculpture of a drake. Cracks run down its surface and parts of it have fallen off."
 	icon_state = "drake_statue_falling"
 
+/obj/structure/fluff/lightpost
+	name = "lightpost"
+	desc = "A homely lightpost adorned with festive decor."
+	icon = 'icons/obj/2x2.dmi'
+	icon_state = "lightpost"
+	deconstructible = FALSE
+	layer = EDGED_TURF_LAYER
 
 /obj/structure/fluff/bus
 	name = "bus"
@@ -167,3 +174,11 @@
 	desc = "A crudely-made sign with the words 'fok of' written in some sort of red paint."
 	icon = 'icons/obj/fluff.dmi'
 	icon_state = "fokof"
+
+/obj/structure/fluff/snowlegion
+	name = "snowlegion"
+	desc = "Looks like that weird kid with the tiger plushie has been round here again."
+	icon = 'icons/obj/fluff.dmi'
+	icon_state = "snowlegion"
+	anchored = TRUE
+	deconstructible = FALSE

code/game/objects/structures/mineral_doors.dm

@@ -223,6 +223,16 @@
 	max_integrity = 200
 	rad_insulation = RAD_VERY_LIGHT_INSULATION
 
+/obj/structure/mineral_door/woodrustic
+	name = "rustic wood door"
+	icon_state = "woodrustic"
+	openSound = 'sound/effects/doorcreaky.ogg'
+	closeSound = 'sound/effects/doorcreaky.ogg'
+	sheetType = /obj/item/stack/sheet/mineral/wood
+	sheetAmount = 10
+	max_integrity = 200
+	rad_insulation = RAD_VERY_LIGHT_INSULATION
+
 /obj/structure/mineral_door/paperframe
 	name = "paper frame door"
 	icon_state = "paperframe"

code/game/objects/structures/mirror.dm

@@ -99,7 +99,7 @@
 	name = "magic mirror"
 	desc = "Turn and face the strange... face."
 	icon_state = "magic_mirror"
-	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush")
+	var/list/races_blacklist = list("skeleton", "agent", "angel", "military_synth", "memezombies", "clockwork golem servant", "android", "synth", "mush", "zombie", "memezombie")
 	var/list/choosable_races = list()
 
 /obj/structure/mirror/magic/New()

code/game/objects/structures/signs/signs_maps.dm

@@ -45,3 +45,12 @@
 	name = "command department"
 	desc = "A direction sign, pointing out which way the Command department is."
 	icon_state = "direction_bridge"
+
+/obj/structure/sign/directions/bar
+	name = "bar"
+	desc = "A direction sign, pointing out which way the Bar is."
+	icon_state = "direction_bar"
+ /obj/structure/sign/directions/cafe
+	name = "cafe"
+	desc = "A direction sign, pointing out which way the Cafe is."
+	icon_state = "direction_cafe"

code/game/sound.dm

@@ -200,5 +200,11 @@
 								'sound/vore/prey/death_04.ogg','sound/vore/prey/death_05.ogg','sound/vore/prey/death_06.ogg',
 								'sound/vore/prey/death_07.ogg','sound/vore/prey/death_08.ogg','sound/vore/prey/death_09.ogg',
 								'sound/vore/prey/death_10.ogg')
+			if("clang")
+				soundin = pick('sound/effects/clang1.ogg', 'sound/effects/clang2.ogg')
+			if("clangsmall")
+				soundin = pick('sound/effects/clangsmall1.ogg', 'sound/effects/clangsmall2.ogg')
+			if("slosh")
+				soundin = pick('sound/effects/slosh1.ogg', 'sound/effects/slosh2.ogg')
 			//END OF CIT CHANGES
 	return soundin

code/game/turfs/closed.dm

@@ -49,6 +49,14 @@
 	baseturfs = /turf/closed/indestructible/sandstone
 	smooth = SMOOTH_TRUE
 
+/turf/closed/indestructible/wood
+	name = "wooden wall"
+	desc = "A wall with wooden plating. Stiff."
+	icon = 'icons/turf/walls/wood_wall.dmi'
+	icon_state = "wood"
+	baseturfs = /turf/closed/indestructible/wood
+	smooth = SMOOTH_TRUE
+
 /turf/closed/indestructible/oldshuttle/corner
 	icon_state = "corner"
 
@@ -76,6 +84,7 @@
 	icon = 'icons/turf/walls/riveted.dmi'
 	icon_state = "riveted"
 	smooth = SMOOTH_TRUE
+	explosion_block = INFINITY
 
 /turf/closed/indestructible/riveted/uranium
 	icon = 'icons/turf/walls/uranium_wall.dmi'

code/game/turfs/open.dm

@@ -49,6 +49,20 @@
 	if(istype(AM))
 		playsound(src,sound,50,1)
 
+/turf/open/indestructible/cobble/side
+	icon_state = "cobble_side"
+
+/turf/open/indestructible/cobble/corner
+	icon_state = "cobble_corner"
+
+/turf/open/indestructible/cobble
+	name = "cobblestone path"
+	desc = "A simple but beautiful path made of various sized stones."
+	icon = 'icons/turf/floors.dmi'
+	icon_state = "cobble"
+	baseturfs = /turf/open/indestructible/cobble
+	tiled_dirt = FALSE
+
 /turf/open/indestructible/necropolis
 	name = "necropolis floor"
 	desc = "It's regarding you suspiciously."

code/game/turfs/simulated/river.dm

@@ -4,11 +4,14 @@
 #define RANDOM_LOWER_X 50
 #define RANDOM_LOWER_Y 50
 
+#define RIVERGEN_SAFETY_LOCK 1000000
+
 /proc/spawn_rivers(target_z, nodes = 4, turf_type = /turf/open/lava/smooth/lava_land_surface, whitelist_area = /area/lavaland/surface/outdoors/unexplored, min_x = RANDOM_LOWER_X, min_y = RANDOM_LOWER_Y, max_x = RANDOM_UPPER_X, max_y = RANDOM_UPPER_Y)
 	var/list/river_nodes = list()
 	var/num_spawned = 0
 	var/list/possible_locs = block(locate(min_x, min_y, target_z), locate(max_x, max_y, target_z))
-	while(num_spawned < nodes && possible_locs.len)
+	var/safety = 0
+	while(num_spawned < nodes && possible_locs.len && (safety++ < RIVERGEN_SAFETY_LOCK))
 		var/turf/T = pick(possible_locs)
 		var/area/A = get_area(T)
 		if(!istype(A, whitelist_area) || (T.flags_1 & NO_LAVA_GEN_1))
@@ -16,7 +19,8 @@
 		else
 			river_nodes += new /obj/effect/landmark/river_waypoint(T)
 			num_spawned++
-
+	
+	safety = 0
 	//make some randomly pathing rivers
 	for(var/A in river_nodes)
 		var/obj/effect/landmark/river_waypoint/W = A
@@ -30,7 +34,7 @@
 			break
 		var/detouring = 0
 		var/cur_dir = get_dir(cur_turf, target_turf)
-		while(cur_turf != target_turf)
+		while(cur_turf != target_turf && (safety++ < RIVERGEN_SAFETY_LOCK))
 
 			if(detouring) //randomly snake around a bit
 				if(prob(20))

code/game/world.dm

@@ -263,7 +263,7 @@ GLOBAL_VAR(restart_counter)
 	s += "Citadel"  //Replace this with something else. Or ever better, delete it and uncomment the game version. CIT CHANGE - modifies the hub entry link
 	s += "</a>"
 	s += ")\]" //CIT CHANGE - encloses the server title in brackets to make the hub entry fancier
-	s += "<br><small><i>That furry /TG/code server your mother warned you about.</i></small><br>" //CIT CHANGE - adds a tagline!
+	s += "<br>[CONFIG_GET(string/servertagline)]<br>" //CIT CHANGE - adds a tagline!
 
 	var/n = 0
 	for (var/mob/M in GLOB.player_list)

code/modules/admin/chat_commands.dm

@@ -102,6 +102,15 @@ GLOBAL_LIST(round_end_notifiees)
 		return "Query produced no output"
 	var/list/text_res = results.Copy(1, 3)
 	var/list/refs = results.len > 3 ? results.Copy(4) : null
+	if(refs)
+		var/list/L = list()
+		for(var/ref in refs)
+			var/atom/A = locate(ref)
+			if(A)
+				L += "[A]"
+			else
+				L += "[ref]"
+		refs = L
 	. = "[text_res.Join("\n")][refs ? "\nRefs: [refs.Join(" ")]" : ""]"
 
 /datum/tgs_chat_command/reload_admins

code/modules/admin/verbs/SDQL2/SDQL_2_parser.dm

@@ -7,36 +7,34 @@
 //
 //	query				:	select_query | delete_query | update_query | call_query | explain
 //	explain				:	'EXPLAIN' query
+//	select_query		:	'SELECT' object_selectors
+//	delete_query		:	'DELETE' object_selectors
+//	update_query		:	'UPDATE' object_selectors 'SET' assignments
+//	call_query			:	'CALL' variable 'ON' object_selectors // Note here: 'variable' does function calls. This simplifies parsing.
 //
-//	select_query		:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-//	delete_query		:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
-//	update_query		:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
-//	call_query			:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+//	select_item			:	'*' | object_type
 //
-//	select_list			:	select_item [',' select_list]
-//	select_item			:	'*' | select_function | object_type
-//	select_function		:	count_function
-//	count_function		:	'COUNT' '(' '*' ')' | 'COUNT' '(' object_types ')'
+//  object_selectors    :   select_item [('FROM' | 'IN') from_item] [modifier_list]
+//  modifier_list       :   ('WHERE' bool_expression | 'MAP' expression) [modifier_list]
 //
-//	from_list			:	from_item [',' from_list]
-//	from_item			:	'world' | object_type
+//	from_item			:	'world' | expression
 //
-//	call_function		:	<function name> ['(' [arguments] ')']
+//	call_function		:	<function name> '(' [arguments] ')'
 //	arguments			:	expression [',' arguments]
 //
-//	object_type			:	<type path> | string
+//	object_type			:	<type path>
 //
-//	assignments			:	assignment, [',' assignments]
+//	assignments			:	assignment [',' assignments]
 //	assignment			:	<variable name> '=' expression
-//	variable			:	<variable name> | <variable name> '.' variable
+//	variable			:	<variable name> | <variable name> '.' variable | '[' <hex number> ']' | '[' <hex number> ']' '.' variable
 //
 //	bool_expression		:	expression comparitor expression  [bool_operator bool_expression]
 //	expression			:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
 //	unary_expression	:	unary_operator ( unary_expression | value | '(' expression ')' )
 //	comparitor			:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-//	value				:	variable | string | number | 'null'
+//	value				:	variable | string | number | 'null' | object_type
 //	unary_operator		:	'!' | '-' | '~'
-//	binary_operator		:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+//	binary_operator		:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
 //	bool_operator		:	'AND' | '&&' | 'OR' | '||'
 //
 //	string				:	''' <some text> ''' | '"' <some text > '"'
@@ -51,10 +49,9 @@
 	var/list/query
 	var/list/tree
 
-	var/list/select_functions = list("count")
 	var/list/boolean_operators = list("and", "or", "&&", "||")
 	var/list/unary_operators = list("!", "-", "~")
-	var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^")
+	var/list/binary_operators = list("+", "-", "/", "*", "&", "|", "^", "%")
 	var/list/comparitors = list("=", "==", "!=", "<>", "<", "<=", ">", ">=")
 
 /datum/SDQL_parser/New(query_list)
@@ -62,12 +59,12 @@
 
 /datum/SDQL_parser/proc/parse_error(error_message)
 	error = 1
-	to_chat(usr, "<span class='danger'>SQDL2 Parsing Error: [error_message]</span>")
+	to_chat(usr, "<span class='warning'>SQDL2 Parsing Error: [error_message]</span>")
 	return query.len + 1
 
 /datum/SDQL_parser/proc/parse()
 	tree = list()
-	query(1, tree)
+	query_options(1, tree)
 
 	if(error)
 		return list()
@@ -91,354 +88,547 @@
 /datum/SDQL_parser/proc/tokenl(i)
 	return lowertext(token(i))
 
+/datum/SDQL_parser/proc/query_options(i, list/node)
+	var/list/options = list()
+	if(tokenl(i) == "using")
+		i = option_assignments(i + 1, node, options)
+	query(i, node)
+	if(length(options))
+		node["options"] = options
+
+//option_assignment:	query_option '=' define
+/datum/SDQL_parser/proc/option_assignment(i, list/node, list/assignment_list = list())
+	var/type = tokenl(i)
+	if(!(type in SDQL2_VALID_OPTION_TYPES))
+		parse_error("Invalid option type: [type]")
+	if(!(token(i + 1) == "="))
+		parse_error("Invalid option assignment symbol: [token(i + 1)]")
+	var/val = tokenl(i + 2)
+	if(!(val in SDQL2_VALID_OPTION_VALUES))
+		parse_error("Invalid optoin value: [val]")
+	assignment_list[type] = val
+	return (i + 3)
+
+//option_assignments: option_assignment, [',' option_assignments]
+/datum/SDQL_parser/proc/option_assignments(i, list/node, list/store)
+	i = option_assignment(i, node, store)
+
+	if(token(i) == ",")
+		i = option_assignments(i + 1, node, store)
+
+	return i
 
 //query:	select_query | delete_query | update_query
 /datum/SDQL_parser/proc/query(i, list/node)
 	query_type = tokenl(i)
+
 	switch(query_type)
 		if("select")
 			select_query(i, node)
+
 		if("delete")
 			delete_query(i, node)
+
 		if("update")
 			update_query(i, node)
+
 		if("call")
 			call_query(i, node)
+
 		if("explain")
 			node += "explain"
 			node["explain"] = list()
 			query(i + 1, node["explain"])
 
 
-//	select_query:	'SELECT' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+//	select_query:	'SELECT' object_selectors
 /datum/SDQL_parser/proc/select_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "select"
+	i = object_selectors(i + 1, select)
+
 	node["select"] = select
-	selectors(i, node)
 	return i
 
-//delete_query:	'DELETE' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]
+
+//delete_query:	'DELETE' object_selectors
 /datum/SDQL_parser/proc/delete_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "delete"
+	i = object_selectors(i + 1, select)
+
 	node["delete"] = select
-	selectors(i, node)
+
 	return i
 
-//update_query:	'UPDATE' select_list [('FROM' | 'IN') from_list] 'SET' assignments ['WHERE' bool_expression]
+
+//update_query:	'UPDATE' object_selectors 'SET' assignments
 /datum/SDQL_parser/proc/update_query(i, list/node)
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "update"
+	i = object_selectors(i + 1, select)
+
 	node["update"] = select
+
 	if(tokenl(i) != "set")
 		i = parse_error("UPDATE has misplaced SET")
+
 	var/list/set_assignments = list()
 	i = assignments(i + 1, set_assignments)
-	node += "set"
+
 	node["set"] = set_assignments
-	selectors(i, node)
+
 	return i
 
-//call_query:	'CALL' call_function ['ON' select_list [('FROM' | 'IN') from_list] ['WHERE' bool_expression]]
+
+//call_query:	'CALL' call_function ['ON' object_selectors]
 /datum/SDQL_parser/proc/call_query(i, list/node)
 	var/list/func = list()
 	i = variable(i + 1, func) // Yes technically does anything variable() matches but I don't care, if admins fuck up this badly then they shouldn't be allowed near SDQL.
-	node += "call"
+
 	node["call"] = func
+
 	if(tokenl(i) != "on")
-		return i
+		return parse_error("You need to specify what to call ON.")
+
 	var/list/select = list()
-	i = select_list(i + 1, select)
-	node += "on"
+	i = object_selectors(i + 1, select)
+
 	node["on"] = select
-	selectors(i, node)
+
 	return i
 
-//select_list:	select_item [',' select_list]
+// object_selectors: select_item [('FROM' | 'IN') from_item] [modifier_list]
+/datum/SDQL_parser/proc/object_selectors(i, list/node)
+	i = select_item(i, node)
+
+	if (tokenl(i) == "from" || tokenl(i) == "in")
+		i++
+		var/list/from = list()
+		i = from_item(i, from)
+		node[++node.len] = from
+
+	else
+		node[++node.len] = list("world")
+
+	i = modifier_list(i, node)
+	return i
+
+// modifier_list: ('WHERE' bool_expression | 'MAP' expression) [modifier_list]
+/datum/SDQL_parser/proc/modifier_list(i, list/node)
+	while (TRUE)
+		if (tokenl(i) == "where")
+			i++
+			node += "where"
+			var/list/expr = list()
+			i = bool_expression(i, expr)
+			node[++node.len] = expr
+
+		else if (tokenl(i) == "map")
+			i++
+			node += "map"
+			var/list/expr = list()
+			i = expression(i, expr)
+			node[++node.len] = expr
+
+		else
+			return i
+
+//select_list:select_item [',' select_list]
 /datum/SDQL_parser/proc/select_list(i, list/node)
 	i = select_item(i, node)
+
 	if(token(i) == ",")
 		i = select_list(i + 1, node)
+
 	return i
 
 //assignments:	assignment, [',' assignments]
 /datum/SDQL_parser/proc/assignments(i, list/node)
 	i = assignment(i, node)
+
 	if(token(i) == ",")
 		i = assignments(i + 1, node)
+
 	return i
 
+
 //select_item:	'*' | select_function | object_type
 /datum/SDQL_parser/proc/select_item(i, list/node)
-	if(token(i) == "*")
+	if (token(i) == "*")
 		node += "*"
 		i++
-	else if(tokenl(i) in select_functions)
-		i = select_function(i, node)
-	else
+
+	else if (copytext(token(i), 1, 2) == "/")
 		i = object_type(i, node)
+
+	else
+		i = parse_error("Expected '*' or type path for select item")
+
 	return i
 
 // Standardized method for handling the IN/FROM and WHERE options.
 /datum/SDQL_parser/proc/selectors(i, list/node)
 	while (token(i))
 		var/tok = tokenl(i)
-		if(tok in list("from", "in"))
+		if (tok in list("from", "in"))
 			var/list/from = list()
 			i = from_item(i + 1, from)
+
 			node["from"] = from
 			continue
-		if(tok == "where")
+
+		if (tok == "where")
 			var/list/where = list()
 			i = bool_expression(i + 1, where)
+
 			node["where"] = where
 			continue
+
 		parse_error("Expected either FROM, IN or WHERE token, found [token(i)] instead.")
 		return i + 1
-	if(!node.Find("from"))
+
+	if (!node.Find("from"))
 		node["from"] = list("world")
+
 	return i
 
-//from_item:	'world' | object_type
+//from_item:	'world' | expression
 /datum/SDQL_parser/proc/from_item(i, list/node)
 	if(token(i) == "world")
 		node += "world"
 		i++
+
 	else
 		i = expression(i, node)
+
 	return i
 
+
 //bool_expression:	expression [bool_operator bool_expression]
 /datum/SDQL_parser/proc/bool_expression(i, list/node)
+
 	var/list/bool = list()
 	i = expression(i, bool)
+
 	node[++node.len] = bool
+
 	if(tokenl(i) in boolean_operators)
 		i = bool_operator(i, node)
 		i = bool_expression(i, node)
+
 	return i
 
+
 //assignment:	<variable name> '=' expression
 /datum/SDQL_parser/proc/assignment(var/i, var/list/node, var/list/assignment_list = list())
 	assignment_list += token(i)
+
 	if(token(i + 1) == ".")
 		i = assignment(i + 2, node, assignment_list)
+
 	else if(token(i + 1) == "=")
 		var/exp_list = list()
 		node[assignment_list] = exp_list
+
 		i = expression(i + 2, exp_list)
+
 	else
 		parse_error("Assignment expected, but no = found")
+
 	return i
 
-//variable:	<variable name> | <variable name> '.' variable
+
+//variable:	<variable name> | <variable name> '.' variable | '[' <hex number> ']' | '[' <hex number> ']' '.' variable
 /datum/SDQL_parser/proc/variable(i, list/node)
 	var/list/L = list(token(i))
 	node[++node.len] = L
+
 	if(token(i) == "{")
-		L += token(i+1)
+		L += token(i + 1)
 		i += 2
+
 		if(token(i) != "}")
 			parse_error("Missing } at end of pointer.")
+
 	if(token(i + 1) == ".")
 		L += "."
 		i = variable(i + 2, L)
-	else if(token(i + 1) == "(") // OH BOY PROC
+
+	else if (token(i + 1) == "(") // OH BOY PROC
 		var/list/arguments = list()
 		i = call_function(i, null, arguments)
 		L += ":"
 		L[++L.len] = arguments
-	else if(token(i + 1) == "\[")
+
+	else if (token(i + 1) == "\[")
 		var/list/expression = list()
 		i = expression(i + 2, expression)
 		if (token(i) != "]")
 			parse_error("Missing ] at the end of list access.")
+
 		L += "\["
 		L[++L.len] = expression
 		i++
+
 	else
 		i++
+
 	return i
 
+
+//object_type:	<type path>
+/datum/SDQL_parser/proc/object_type(i, list/node)
+
+	if (copytext(token(i), 1, 2) != "/")
+		return parse_error("Expected type, but it didn't begin with /")
+
+	var/path = text2path(token(i))
+	if (path == null)
+		return parse_error("Nonexistant type path: [token(i)]")
+
+	node += path
+
+	return i + 1
+
+
+//comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
+/datum/SDQL_parser/proc/comparitor(i, list/node)
+
+	if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
+		node += token(i)
+
+	else
+		parse_error("Unknown comparitor [token(i)]")
+
+	return i + 1
+
+
+//bool_operator:	'AND' | '&&' | 'OR' | '||'
+/datum/SDQL_parser/proc/bool_operator(i, list/node)
+
+	if(tokenl(i) in list("and", "or", "&&", "||"))
+		node += token(i)
+
+	else
+		parse_error("Unknown comparitor [token(i)]")
+
+	return i + 1
+
+
+//string:	''' <some text> ''' | '"' <some text > '"'
+/datum/SDQL_parser/proc/string(i, list/node)
+
+	if(copytext(token(i), 1, 2) in list("'", "\""))
+		node += token(i)
+
+	else
+		parse_error("Expected string but found '[token(i)]'")
+
+	return i + 1
+
 //array:	'[' expression, expression, ... ']'
-/datum/SDQL_parser/proc/array(i, list/node)
+/datum/SDQL_parser/proc/array(var/i, var/list/node)
+	// Arrays get turned into this: list("[", list(exp_1a = exp_1b, ...), ...), "[" is to mark the next node as an array.
 	if(copytext(token(i), 1, 2) != "\[")
 		parse_error("Expected an array but found '[token(i)]'")
 		return i + 1
-	node += token(i)
+
+	node += token(i) // Add the "["
+
 	var/list/expression_list = list()
+
 	i++
 	if(token(i) != "]")
 		var/list/temp_expression_list = list()
 		var/tok
 		do
 			tok = token(i)
-			if(tok == "," || tok == ":")
-				if(temp_expression_list == null)
+			if (tok == "," || tok == ":")
+				if (temp_expression_list == null)
 					parse_error("Found ',' or ':' without expression in an array.")
 					return i + 1
+
 				expression_list[++expression_list.len] = temp_expression_list
 				temp_expression_list = null
-				if(tok == ":")
+				if (tok == ":")
 					temp_expression_list = list()
 					i = expression(i + 1, temp_expression_list)
 					expression_list[expression_list[expression_list.len]] = temp_expression_list
 					temp_expression_list = null
 					tok = token(i)
-					if(tok != ",")
-						if(tok == "]")
+					if (tok != ",")
+						if (tok == "]")
 							break
+
 						parse_error("Expected ',' or ']' after array assoc value, but found '[token(i)]'")
 						return i
+
+
 				i++
 				continue
+
 			temp_expression_list = list()
 			i = expression(i, temp_expression_list)
+
+			// Ok, what the fuck BYOND?
+			// Not having these lines here causes the parser to die
+			// on an error saying that list/token() doesn't exist as a proc.
+			// These lines prevent that.
+			// I assume the compiler/VM is shitting itself and swapping out some variables internally?
+			// While throwing in debug logging it disappeared
+			// And these 3 lines prevent it from happening while being quiet.
+			// So.. it works.
+			// Don't touch it.
+			var/whatthefuck = i
+			whatthefuck = src.type
+			whatthefuck = whatthefuck
+
 		while(token(i) && token(i) != "]")
-		if(temp_expression_list)
+
+		if (temp_expression_list)
 			expression_list[++expression_list.len] = temp_expression_list
+
 	node[++node.len] = expression_list
-	return i + 1
 
-//object_type:	<type path> | string
-/datum/SDQL_parser/proc/object_type(i, list/node)
-	if(copytext(token(i), 1, 2) == "/")
-		node += token(i)
-	else
-		i = string(i, node)
-	return i + 1
-
-//comparitor:	'=' | '==' | '!=' | '<>' | '<' | '<=' | '>' | '>='
-/datum/SDQL_parser/proc/comparitor(i, list/node)
-	if(token(i) in list("=", "==", "!=", "<>", "<", "<=", ">", ">="))
-		node += token(i)
-	else
-		parse_error("Unknown comparitor [token(i)]")
-	return i + 1
-
-//bool_operator:	'AND' | '&&' | 'OR' | '||'
-/datum/SDQL_parser/proc/bool_operator(i, list/node)
-	if(tokenl(i) in list("and", "or", "&&", "||"))
-		node += token(i)
-	else
-		parse_error("Unknown comparitor [token(i)]")
-	return i + 1
-
-//string:	''' <some text> ''' | '"' <some text > '"'
-/datum/SDQL_parser/proc/string(i, list/node)
-	if(copytext(token(i), 1, 2) in list("'", "\""))
-		node += token(i)
-	else
-		parse_error("Expected string but found '[token(i)]'")
 	return i + 1
 
 //call_function:	<function name> ['(' [arguments] ')']
 /datum/SDQL_parser/proc/call_function(i, list/node, list/arguments)
 	if(length(tokenl(i)))
 		var/procname = ""
-		if(token(i) == "global" && token(i+1) == ".")
+		if(tokenl(i) == "global" && token(i + 1) == ".") // Global proc.
 			i += 2
 			procname = "global."
 		node += procname + token(i++)
 		if(token(i) != "(")
 			parse_error("Expected ( but found '[token(i)]'")
+
 		else if(token(i + 1) != ")")
-			var/list/expression_list_temp = list()
+			var/list/temp_expression_list = list()
 			do
-				i = expression(i + 1, expression_list_temp)
+				i = expression(i + 1, temp_expression_list)
 				if(token(i) == ",")
-					arguments[++arguments.len] = expression_list_temp
-					expression_list_temp = list()
+					arguments[++arguments.len] = temp_expression_list
+					temp_expression_list = list()
 					continue
+
 			while(token(i) && token(i) != ")")
-			arguments[++arguments.len] = expression_list_temp
+
+			arguments[++arguments.len] = temp_expression_list // The code this is copy pasted from won't be executed when it's the last param, this fixes that.
 		else
 			i++
 	else
 		parse_error("Expected a function but found nothing")
 	return i + 1
 
-//select_function:	count_function
-/datum/SDQL_parser/proc/select_function(i, list/node)
-	parse_error("Sorry, function calls aren't available yet")
-	return i
 
 //expression:	( unary_expression | '(' expression ')' | value ) [binary_operator expression]
 /datum/SDQL_parser/proc/expression(i, list/node)
+
 	if(token(i) in unary_operators)
 		i = unary_expression(i, node)
+
 	else if(token(i) == "(")
 		var/list/expr = list()
+
 		i = expression(i + 1, expr)
+
 		if(token(i) != ")")
 			parse_error("Missing ) at end of expression.")
+
 		else
 			i++
+
 		node[++node.len] = expr
+
 	else
 		i = value(i, node)
+
 	if(token(i) in binary_operators)
 		i = binary_operator(i, node)
 		i = expression(i, node)
+
 	else if(token(i) in comparitors)
 		i = binary_operator(i, node)
+
 		var/list/rhs = list()
 		i = expression(i, rhs)
+
 		node[++node.len] = rhs
+
+
 	return i
 
+
 //unary_expression:	unary_operator ( unary_expression | value | '(' expression ')' )
 /datum/SDQL_parser/proc/unary_expression(i, list/node)
+
 	if(token(i) in unary_operators)
 		var/list/unary_exp = list()
+
 		unary_exp += token(i)
 		i++
+
 		if(token(i) in unary_operators)
 			i = unary_expression(i, unary_exp)
+
 		else if(token(i) == "(")
 			var/list/expr = list()
+
 			i = expression(i + 1, expr)
+
 			if(token(i) != ")")
 				parse_error("Missing ) at end of expression.")
+
 			else
 				i++
+
 			unary_exp[++unary_exp.len] = expr
+
 		else
 			i = value(i, unary_exp)
+
 		node[++node.len] = unary_exp
+
+
 	else
 		parse_error("Expected unary operator but found '[token(i)]'")
+
 	return i
 
-//binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^'
+
+//binary_operator:	comparitor | '+' | '-' | '/' | '*' | '&' | '|' | '^' | '%'
 /datum/SDQL_parser/proc/binary_operator(i, list/node)
+
 	if(token(i) in (binary_operators + comparitors))
 		node += token(i)
+
 	else
 		parse_error("Unknown binary operator [token(i)]")
+
 	return i + 1
 
-//value:	variable | string | number | 'null'
+
+//value:	variable | string | number | 'null' | object_type
 /datum/SDQL_parser/proc/value(i, list/node)
 	if(token(i) == "null")
 		node += "null"
 		i++
-	else if(lowertext(copytext(token(i),1,3)) == "0x" && isnum(hex2num(copytext(token(i),3))))
-		node += hex2num(copytext(token(i),3))
+
+	else if(lowertext(copytext(token(i), 1, 3)) == "0x" && isnum(hex2num(copytext(token(i), 3))))
+		node += hex2num(copytext(token(i), 3))
 		i++
+
 	else if(isnum(text2num(token(i))))
 		node += text2num(token(i))
 		i++
+
 	else if(copytext(token(i), 1, 2) in list("'", "\""))
 		i = string(i, node)
+
 	else if(copytext(token(i), 1, 2) == "\[") // Start a list.
 		i = array(i, node)
+	else if(copytext(token(i), 1, 2) == "/")
+		i = object_type(i, node)
 	else
 		i = variable(i, node)
-	return i
 
-/*EXPLAIN SELECT * WHERE 42 = 6 * 9 OR val = - 5 == 7*/
+	return i

code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm

@@ -48,6 +48,12 @@
 /proc/_image(icon, loc, icon_state, layer, dir)
 	return image(icon, loc, icon_state, layer, dir)
 
+/proc/_istype(object, type)
+	return istype(object, type)
+
+/proc/_ispath(path, type)
+	return ispath(path, type)
+
 /proc/_length(E)
 	return length(E)
 
@@ -208,4 +214,3 @@
 /proc/_step_away(ref, trg, max)
 	step_away(ref, trg, max)
 
-

code/modules/admin/verbs/playsound.dm

@@ -4,10 +4,12 @@
 	if(!check_rights(R_SOUNDS))
 		return
 
-	var/freq = 1
 	var/vol = input(usr, "What volume would you like the sound to play at?",, 100) as null|num
 	if(!vol)
 		return
+	var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+	if(!freq)
+		freq = 1
 	vol = CLAMP(vol, 1, 100)
 
 	var/sound/admin_sound = new()
@@ -96,13 +98,17 @@
 					if (data["webpage_url"])
 						webpage_url = "<a href=\"[data["webpage_url"]]\">[title]</a>"
 
+					var/freq = input(usr, "What frequency would you like the sound to play at?",, 1) as null|num
+					if(!freq)
+						freq = 1
+					pitch = freq
+
 					var/res = alert(usr, "Show the title of and link to this song to the players?\n[title]",, "No", "Yes", "Cancel")
 					switch(res)
 						if("Yes")
 							to_chat(world, "<span class='boldannounce'>An admin played: [webpage_url]</span>")
 						if("Cancel")
 							return
-
 					SSblackbox.record_feedback("nested tally", "played_url", 1, list("[ckey]", "[web_sound_input]"))
 					log_admin("[key_name(src)] played web sound: [web_sound_input]")
 					message_admins("[key_name(src)] played web sound: [web_sound_input]")

code/modules/admin/verbs/randomverbs.dm

@@ -845,7 +845,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
 	if(!check_rights(R_ADMIN))
 		return
 
-	var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","red","delta")
+	var/level = input("Select security level to change to","Set Security Level") as null|anything in list("green","blue","amber","red","delta")
 	if(level)
 		set_security_level(level)
 

code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm

@@ -194,7 +194,8 @@
 		else
 			L.visible_message("<span class='warning'>[L]'s eyes blaze with brilliant light!</span>", \
 			"<span class='userdanger'>Your vision suddenly screams with white-hot light!</span>")
-			L.Knockdown(15)
+			L.Knockdown(160)
+			L.adjustStaminaLoss(140) // now kindle works pretty much like bloodcult stun knockdown and stamcrit wise
 			L.apply_status_effect(STATUS_EFFECT_KINDLE)
 			L.flash_act(1, 1)
 			if(iscultist(L))

code/modules/antagonists/clockcult/clock_scriptures/scripture_drivers.dm

@@ -71,7 +71,7 @@
 	desc = "Charges your slab with divine energy, allowing you to overwhelm a target with Ratvar's light."
 	invocations = list("Divinity, show them your light!")
 	whispered = TRUE
-	channel_time = 30
+	channel_time = 20 // I think making kindle channel a third of the time less is a good make up for the fact that it silences people for such a little amount of time.
 	power_cost = 125
 	usage_tip = "The light can be used from up to two tiles away. Damage taken will GREATLY REDUCE the stun's duration."
 	tier = SCRIPTURE_DRIVER
@@ -112,21 +112,21 @@
 	quickbind_desc = "Applies handcuffs to a struck target."
 
 
-//Vanguard: Provides twenty seconds of stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
+//Vanguard: Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, 25% of all stuns absorbed are applied to the invoker.
 /datum/clockwork_scripture/vanguard
 	descname = "Self Stun Immunity"
 	name = "Vanguard"
-	desc = "Provides twenty seconds of stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
+	desc = "Provides twenty seconds of greatly increased stamina and stun immunity. At the end of the twenty seconds, the invoker is knocked down for the equivalent of 25% of all stuns they absorbed. \
 	Excessive absorption will cause unconsciousness."
 	invocations = list("Shield me...", "...from darkness!")
 	channel_time = 30
-	power_cost = 25
+	power_cost = 75
 	usage_tip = "You cannot reactivate Vanguard while still shielded by it."
 	tier = SCRIPTURE_DRIVER
 	primary_component = VANGUARD_COGWHEEL
 	sort_priority = 6
 	quickbind = TRUE
-	quickbind_desc = "Allows you to temporarily absorb stuns. All stuns absorbed will affect you when disabled."
+	quickbind_desc = "Allows you to temporarily have quickly regenerating stamina and absorb stuns. All stuns absorbed will affect you when disabled."
 
 /datum/clockwork_scripture/vanguard/check_special_requirements()
 	if(!GLOB.ratvar_awakens && islist(invoker.stun_absorption) && invoker.stun_absorption["vanguard"] && invoker.stun_absorption["vanguard"]["end_time"] > world.time)

code/modules/antagonists/cult/cult_items.dm

@@ -508,7 +508,9 @@
 			if(SEC_LEVEL_GREEN)
 				set_coefficient = 2
 			if(SEC_LEVEL_BLUE)
-				set_coefficient = 1
+				set_coefficient = 1.2
+			if(SEC_LEVEL_AMBER)
+				set_coefficient = 0.8
 			else
 				set_coefficient = 0.5
 		var/surplus = timer - (SSshuttle.emergencyCallTime * set_coefficient)

code/modules/antagonists/nukeop/equipment/nuclearbomb.dm

@@ -588,12 +588,18 @@ This is here to make the tiles around the station mininuke change when it's arme
 			var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 			if(istype(loneop))
 				loneop.weight += 1
+				if(loneop.weight % 5 == 0)
+					message_admins("[src] is stationary in [ADMIN_VERBOSEJMP(newturf)]. The weight of Lone Operative is now [loneop.weight].")
+				log_game("[src] is stationary for too long in [loc_name(newturf)], and has increased the weight of the Lone Operative event to [loneop.weight].")
 	else
 		lastlocation = newturf
 		last_disk_move = world.time
 		var/datum/round_event_control/operative/loneop = locate(/datum/round_event_control/operative) in SSevents.control
 		if(istype(loneop) && prob(loneop.weight))
 			loneop.weight = max(loneop.weight - 1, 0)
+			if(loneop.weight % 5 == 0)
+				message_admins("[src] is on the move (currently in [ADMIN_VERBOSEJMP(newturf)]). The weight of Lone Operative is now [loneop.weight].")
+			log_game("[src] being on the move has reduced the weight of the Lone Operative event to [loneop.weight].")
 
 /obj/item/disk/nuclear/examine(mob/user)
 	. = ..()

code/modules/antagonists/wizard/wizard.dm

@@ -60,50 +60,13 @@
 	owner.current.forceMove(pick(GLOB.wizardstart))
 
 /datum/antagonist/wizard/proc/create_objectives()
-	switch(rand(1,100))
-		if(1 to 30)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = owner
-			kill_objective.find_target()
-			objectives += kill_objective
+	var/datum/objective/new_objective = new("Cause as much creative mayhem as you can aboard the station! The more outlandish your methods of achieving this, the better! Make sure there's a decent amount of crew alive to tell of your tale.")
+	new_objective.owner = owner
+	objectives += new_objective
 
-			if (!(locate(/datum/objective/escape) in owner.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = owner
-				objectives += escape_objective
-
-		if(31 to 60)
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = owner
-			steal_objective.find_target()
-			objectives += steal_objective
-
-			if (!(locate(/datum/objective/escape) in owner.objectives))
-				var/datum/objective/escape/escape_objective = new
-				escape_objective.owner = owner
-				objectives += escape_objective
-
-		if(61 to 85)
-			var/datum/objective/assassinate/kill_objective = new
-			kill_objective.owner = owner
-			kill_objective.find_target()
-			objectives += kill_objective
-
-			var/datum/objective/steal/steal_objective = new
-			steal_objective.owner = owner
-			steal_objective.find_target()
-			objectives += steal_objective
-
-			if (!(locate(/datum/objective/survive) in owner.objectives))
-				var/datum/objective/survive/survive_objective = new
-				survive_objective.owner = owner
-				objectives += survive_objective
-
-		else
-			if (!(locate(/datum/objective/hijack) in owner.objectives))
-				var/datum/objective/hijack/hijack_objective = new
-				hijack_objective.owner = owner
-				objectives += hijack_objective
+	var/datum/objective/escape/escape_objective = new
+	escape_objective.owner = owner
+	objectives += escape_objective
 
 	for(var/datum/objective/O in objectives)
 		owner.objectives += O

code/modules/assembly/flash.dm

@@ -125,7 +125,9 @@
 				to_chat(M, "<span class='userdanger'>[user] blinds you with the flash!</span>")
 			else
 				to_chat(M, "<span class='userdanger'>You are blinded by [src]!</span>")
-			M.Knockdown(rand(80,120))
+			var/toblur = 20 - M.eye_blurry
+			if(toblur > 0)
+				M.blur_eyes(toblur)
 		else if(user)
 			visible_message("<span class='disarm'>[user] fails to blind [M] with the flash!</span>")
 			to_chat(user, "<span class='warning'>You fail to blind [M] with the flash!</span>")
@@ -141,7 +143,7 @@
 	if(!try_use_flash(user))
 		return FALSE
 	if(iscarbon(M))
-		flash_carbon(M, user, 5, 1)
+		flash_carbon(M, user, 20, 1)
 		return TRUE
 	else if(issilicon(M))
 		var/mob/living/silicon/robot/R = M

code/modules/atmospherics/environmental/LINDA_fire.dm

@@ -20,8 +20,8 @@
 	if(active_hotspot)
 		if(soh)
 			if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
-				if(active_hotspot.temperature < exposed_temperature)
-					active_hotspot.temperature = exposed_temperature
+				if(active_hotspot.temperature < exposed_temperature*50)
+					active_hotspot.temperature = exposed_temperature*50
 				if(active_hotspot.volume < exposed_volume)
 					active_hotspot.volume = exposed_volume
 		return 1
@@ -36,7 +36,7 @@
 			return 0
 
 		active_hotspot = new /obj/effect/hotspot(src)
-		active_hotspot.temperature = exposed_temperature
+		active_hotspot.temperature = exposed_temperature*50
 		active_hotspot.volume = exposed_volume*25
 
 		active_hotspot.just_spawned = (current_cycle < SSair.times_fired)
@@ -47,6 +47,7 @@
 		heating.temperature = exposed_temperature
 		heating.react()
 		assume_air(heating)
+		air_update_turf()
 	return igniting
 
 //This is the icon for fire on turfs, also helps for nurturing small fires until they are full tile

code/modules/atmospherics/machinery/airalarm.dm

@@ -650,7 +650,7 @@
 		if(0)
 			add_overlay(AALARM_OVERLAY_GREEN)
 			overlay_state = AALARM_OVERLAY_GREEN
-			light_color = LIGHT_COLOR_BLUEGREEN
+			light_color = LIGHT_COLOR_PALEBLUE
 			set_light(brightness_on)
 		if(1)
 			add_overlay(AALARM_OVERLAY_WARN)

code/modules/awaymissions/mission_code/snowdin.dm

@@ -10,6 +10,10 @@
 	name = "Snowdin Tundra Plains"
 	icon_state = "awaycontent25"
 
+/area/awaymission/snowdin/outside/vip
+	name = "Snowdin Tundra Plains"
+	icon_state = "awaycontent25"
+
 /area/awaymission/snowdin/post
 	name = "Snowdin Outpost"
 	icon_state = "awaycontent2"
@@ -116,7 +120,7 @@
 	name = "Snowdin Main Base"
 	icon_state = "awaycontent16"
 	dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
-	requires_power = TRUE
+	requires_power = FALSE
 
 /area/awaymission/snowdin/dungeon1
 	name = "Snowdin Depths"

code/modules/cargo/exports/manifest.dm

@@ -76,3 +76,17 @@
 /datum/export/manifest_correct_denied/get_cost(obj/O)
 	var/obj/item/paper/fluff/jobs/cargo/manifest/M = O
 	return ..() - M.order_cost
+
+// Paper work done correctly
+
+/datum/export/paperwork_correct
+	cost = 50
+	unit_name = "correct paperwork"
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct)
+
+// Paper work not done retruned
+
+/datum/export/paperwork_incorrect
+	cost = -500 // Failed to meet NT standers
+	unit_name = "returned incorrect paperwork"
+	export_types = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork)

code/modules/cargo/order.dm

@@ -95,3 +95,14 @@
 			while(--lost >= 0)
 				qdel(pick(C.contents))
 	return C
+
+//Paperwork for NT
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork
+	name = "Incomplete Paperwork"
+	desc = "These should've been filled out four months ago! Unfinished grant papers issued by Nanotrasen's finance department. Complete this page for additional funding."
+	icon = 'icons/obj/bureaucracy.dmi'
+
+/obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+	name = "Finished Paperwork"
+	desc = "A neat stack of filled-out forms, in triplicate and signed. Is there anything more satisfying? Make sure they get stamped."
+	icon = 'icons/obj/bureaucracy.dmi'

code/modules/cargo/packs.dm

@@ -81,10 +81,19 @@
 	crate_name = "emergency crate"
 	crate_type = /obj/structure/closet/crate/internals
 
+/datum/supply_pack/emergency/rcds
+	name = "Emergency RCDs"
+	desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!"
+	cost = 1500
+	contains = list(/obj/item/construction/rcd,
+					/obj/item/construction/rcd)
+	crate_name = "emergency rcds"
+	crate_type = /obj/structure/closet/crate/internals
+
 /datum/supply_pack/emergency/soft_suit
 	name = "Emergency Space Suit "
 	desc = "Is there bombs going off left and right? Is there meteors shooting around the station? Well we have two fragile space suit for emergencys as well as air and masks."
-	cost = 1000 
+	cost = 1000
 	contains = list(/obj/item/tank/internals/air,
 					/obj/item/tank/internals/air,
 					/obj/item/clothing/mask/gas,
@@ -256,6 +265,26 @@
 	crate_name = "weed control crate"
 	crate_type = /obj/structure/closet/crate/secure/hydroponics
 
+/datum/supply_pack/medical/anitvirus
+	name = "Virus Containment Crate"
+	desc = "Viro let out a death plague Mk II again? Someone didnt wash there hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it brakes out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot."
+	cost = 3000
+	access = ACCESS_MEDICAL
+	contains = list(/mob/living/simple_animal/bot/medbot,
+					/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/head/bio_hood,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/clothing/suit/bio_suit,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/reagent_containers/syringe/antiviral,
+					/obj/item/storage/box/syringes,
+					/obj/item/storage/box/beakers)
+	crate_name = "virus containment unit crate"
+	crate_type = /obj/structure/closet/crate/secure/plasma
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Security ////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -386,6 +415,29 @@
 					/obj/item/melee/baton/loaded)
 	crate_name = "stun baton crate"
 
+/datum/supply_pack/security/russianclothing
+	name = "Russian Surplus Clothing"
+	desc = "An old russian crate full of surplus armor that they used to use! Has two sets of bulletproff armor, a few union suits and some warm hats!"
+	hidden = TRUE
+	contraband = TRUE
+	cost = 5000 // Its basicly sec suits, good boots/gloves
+	contains = list(/obj/item/clothing/suit/security/officer/russian,
+					/obj/item/clothing/suit/security/officer/russian,
+					/obj/item/clothing/shoes/combat,
+					/obj/item/clothing/shoes/combat,
+					/obj/item/clothing/head/ushanka,
+					/obj/item/clothing/head/ushanka,
+					/obj/item/clothing/suit/armor/bulletproof,
+					/obj/item/clothing/suit/armor/bulletproof,
+					/obj/item/clothing/head/helmet/alt,
+					/obj/item/clothing/head/helmet/alt,
+					/obj/item/clothing/gloves/combat,
+					/obj/item/clothing/gloves/combat,
+					/obj/item/clothing/mask/gas,
+					/obj/item/clothing/mask/gas)
+	crate_name = "surplus russian clothing"
+	crate_type = /obj/structure/closet/crate/internals
+
 /datum/supply_pack/security/taser
 	name = "Taser Crate"
 	desc = "From the depths of stunbased combat, this order rises above, supreme. Contains three hybrid tasers, capable of firing both electrodes and disabling shots. Requires Security access to open."
@@ -666,6 +718,15 @@
 					/obj/item/clothing/suit/space/hardsuit/engine)
 	crate_name = "engineering hardsuit"
 
+/datum/supply_pack/engineering/industrialrcd
+	name = "Industrial RCD"
+	desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles."
+	cost = 4500
+	access = ACCESS_CE
+	contains = list(/obj/item/construction/rcd/industrial)
+	crate_name = "industrial rcd"
+	crate_type = /obj/structure/closet/crate/secure/engineering
+
 /datum/supply_pack/engineering/powergamermitts
 	name = "Insulated Gloves Crate"
 	desc = "The backbone of modern society. Barely ever ordered for actual engineering. Contains three insulated gloves."
@@ -1011,6 +1072,28 @@
 	contains = list(/obj/item/stack/sheet/mineral/wood/fifty)
 	crate_name = "wood planks crate"
 
+/datum/supply_pack/materials/rcdammo
+	name = "Spare RDC ammo"
+	desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on."
+	cost = 3750
+	contains = list(/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo,
+					/obj/item/rcd_ammo)
+	crate_name = "rcd ammo"
+
 /datum/supply_pack/materials/bz
 	name = "BZ Canister Crate"
 	desc = "Contains a canister of BZ. Requires Toxins access to open."
@@ -1153,6 +1236,24 @@
 					/obj/item/storage/firstaid/regular)
 	crate_name = "first aid kit crate"
 
+/datum/supply_pack/medical/iv_drip
+	name = "IV Drip Crate"
+	desc = "Contains a single IV drip stand for intravenous delivery."
+	cost = 700
+	contains = list(/obj/machinery/iv_drip)
+	crate_name = "iv drip crate"
+
+/datum/supply_pack/science/adv_surgery_tools
+	name = "Med-Co Advanced surgery tools"
+	desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open."
+	cost = 5000
+	access = ACCESS_SURGERY
+	contains = list(/obj/item/storage/belt/medical/surgery_belt_adv,
+					/obj/item/reagent_containers/medspray/synthflesh,
+					/obj/item/reagent_containers/medspray/sterilizine)
+	crate_name = "medco newest surgery tools"
+	crate_type = /obj/structure/closet/crate/medical
+
 /datum/supply_pack/medical/medicalhardsuit
 	name = "Medical Hardsuit"
 	desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers."
@@ -1162,13 +1263,6 @@
 					/obj/item/clothing/suit/space/hardsuit/medical)
 	crate_name = "medical hardsuit"
 
-/datum/supply_pack/medical/iv_drip
-	name = "IV Drip Crate"
-	desc = "Contains a single IV drip for administering blood to patients."
-	cost = 700
-	contains = list(/obj/machinery/iv_drip)
-	crate_name = "iv drip crate"
-
 /datum/supply_pack/medical/supplies
 	name = "Medical Supplies Crate"
 	desc = "Contains seven beakers, syringes, and bodybags. Three morphine bottles, four insulin pills. Two charcoal bottles, epinephrine bottles, antitoxin bottles, and large beakers. Finally, a single roll of medical gauze, as well as a bottle of stimulant pills for long, hard work days. German doctor not included."
@@ -1280,6 +1374,7 @@
 	crate_type = /obj/structure/closet/crate/secure/plasma
 	dangerous = TRUE
 
+
 //////////////////////////////////////////////////////////////////////////////
 //////////////////////////// Science /////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////
@@ -1395,6 +1490,19 @@
 /datum/supply_pack/service
 	group = "Service"
 
+
+/datum/supply_pack/service/advlighting
+	name = "Advanced Lighting crate"
+	desc = "Thanks to advanced lighting tech we here at the Lamp Factory have be able to produce more lamps and lamp items! This crate has three lamps, a box of lights and a state of the art rapid-light-device!"
+	cost = 2500 //Fair
+	contains = list(/obj/item/construction/rld,
+					/obj/item/flashlight/lamp,
+					/obj/item/flashlight/lamp,
+					/obj/item/flashlight/lamp/green,
+					/obj/item/storage/box/lights/mixed)
+	crate_name = "advanced lighting crate"  
+	crate_type = /obj/structure/closet/crate/secure
+
 /datum/supply_pack/service/cargo_supples
 	name = "Cargo Supplies Crate"
 	desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping."
@@ -1453,6 +1561,20 @@
 	crate_name = "janitor backpack crate"
 	crate_type = /obj/structure/closet/crate/secure
 
+/datum/supply_pack/service/janitor/janpremium
+	name = "Janitor Premium Supplies"
+	desc = "Do to the union for better supplies, we have desided to make a deal for you, In this crate you can get a brand new chem, Drying Angent this stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, three wet floor signs, and some spare bottles of ammonia."
+	cost = 3000
+	access = ACCESS_JANITOR
+	contains = list(/obj/item/caution,
+					/obj/item/caution,
+					/obj/item/caution,
+					/obj/item/reagent_containers/glass/rag,
+					/obj/item/reagent_containers/glass/bottle/ammonia,
+					/obj/item/reagent_containers/glass/bottle/ammonia,
+					/obj/item/reagent_containers/spray/drying_agent)
+	crate_name = "janitor backpack crate"
+
 /datum/supply_pack/service/mule
 	name = "MULEbot Crate"
 	desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!"
@@ -1606,7 +1728,7 @@
 	name = "Kitchen Cutlery Deluxe Set"
 	desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal."
 	cost = 10000
-	contraband = TRUE 
+	contraband = TRUE
 	contains = list(/obj/item/sharpener,
 					/obj/item/kitchen/fork,
 					/obj/item/kitchen/fork,
@@ -1663,6 +1785,22 @@
 	access = ACCESS_THEATRE
 	crate_type = /obj/structure/closet/crate/secure
 
+/datum/supply_pack/organic/hunting
+	name = "Huntting gear"
+	desc = "Even in space, we can fine prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a huntting shotgun. "
+	cost = 3500
+	contraband = TRUE
+	contains = list(/obj/item/clothing/head/flatcap,
+					/obj/item/clothing/suit/hooded/wintercoat/captain,
+					/obj/item/reagent_containers/food/drinks/bottle/cognac,
+					/obj/item/storage/fancy/cigarettes/cigars/havana,
+					/obj/item/clothing/gloves/color/white,
+					/obj/item/clothing/under/rank/curator,
+					/obj/item/gun/ballistic/shotgun/lethal)
+	access = ACCESS_ARMORY
+	crate_name = "sporting crate"
+	crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:(
+
 /datum/supply_pack/organic/hydroponics
 	name = "Hydroponics Crate"
 	desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron."
@@ -2106,8 +2244,7 @@
 /datum/supply_pack/costumes_toys/randomised/toys
 	name = "Toy Crate"
 	desc = "Who cares about pride and accomplishment? Skip the gaming and get straight to the sweet rewards with this product! Contains five random toys. Warranty void if used to prank research directors."
-	cost = 5000 // or play the arcade machines ya lazy bum
-	// TODID make this actually just use the arcade machine loot list
+	cost = 1500 // or play the arcade machines ya lazy bum
 	num_contained = 5
 	contains = list(/obj/item/storage/box/snappops,
 					/obj/item/toy/talking/AI,
@@ -2161,6 +2298,77 @@
 	crate_name = "toy crate"
 	crate_type = /obj/structure/closet/crate/wooden
 
+/datum/supply_pack/costumes_toys/randomised/plush
+	name = "Plush Crate"
+	desc = "Plush tide station wide. Contains 5 random plushies for you to love. Warranty void if your love violates the terms of use."
+	cost = 1500 // or play the arcade machines ya lazy bum
+	num_contained = 5
+	contains = list(/obj/item/toy/plush/lizardplushie,
+					/obj/item/toy/plush/lizardplushie/durgit,
+					/obj/item/toy/plush/lizardplushie/rio,
+					/obj/item/toy/plush/lizardplushie/urinsu,
+					/obj/item/toy/plush/lizardplushie/arfrehn,
+					/obj/item/toy/plush/lizardplushie/soars,
+					/obj/item/toy/plush/lizardplushie/ghostie,
+					/obj/item/toy/plush/lizardplushie/amber,
+					/obj/item/toy/plush/lizardplushie/cyan,
+					/obj/item/toy/plush/lizardplushie/meena,
+					/obj/item/toy/plush/lizardplushie/stalks,
+					/obj/item/toy/plush/lizardplushie/kobold,
+					/obj/item/toy/plush/lizardplushie/gorgi,
+					/obj/item/toy/plush/lizardplushie/almaz,
+					/obj/item/toy/plush/snakeplushie/sasha,
+					/obj/item/toy/plush/snakeplushie/shay,
+					/obj/item/toy/plush/snakeplushie/vulken,
+					/obj/item/toy/plush/mothplushie,
+					/obj/item/toy/plush/mothplushie/bumble,
+					/obj/item/toy/plush/mothplushie/nameko,
+					/obj/item/toy/plush/mothplushie/suru,
+					/obj/item/toy/plush/xeno,
+					/obj/item/toy/plush/lampplushie,
+					/obj/item/toy/plush/borgplushie,
+					/obj/item/toy/plush/borgplushie/medihound,
+					/obj/item/toy/plush/borgplushie/scrubpuppy,
+					/obj/item/toy/plush/borgplushie/seeking,
+					/obj/item/toy/plush/borgplushie/neeb,
+					/obj/item/toy/plush/bird,
+					/obj/item/toy/plush/bird/esela,
+					/obj/item/toy/plush/bird/jahonna,
+					/obj/item/toy/plush/bird/krick,
+					/obj/item/toy/plush/bird/birddi,
+					/obj/item/toy/plush/bird/jewel,
+					/obj/item/toy/plush/mammal,
+					/obj/item/toy/plush/mammal/dubious,
+					/obj/item/toy/plush/mammal/gladwyn,
+					/obj/item/toy/plush/mammal/gavin,
+					/obj/item/toy/plush/mammal/blep,
+					/obj/item/toy/plush/mammal/circe,
+					/obj/item/toy/plush/mammal/pavel,
+					/obj/item/toy/plush/mammal/oten,
+					/obj/item/toy/plush/mammal/ray,
+					/obj/item/toy/plush/mammal/dawud,
+					/obj/item/toy/plush/mammal/edgar,
+					/obj/item/toy/plush/mammal/frank,
+					/obj/item/toy/plush/mammal/poojawa,
+					/obj/item/toy/plush/mammal/hazel,
+					/obj/item/toy/plush/mammal/jermaine,
+					/obj/item/toy/plush/mammal/gunther,
+					/obj/item/toy/plush/mammal/fox,
+					/obj/item/toy/plush/mammal/zed,
+					/obj/item/toy/plush/mammal/dog,
+					/obj/item/toy/plush/mammal/dog/frost,
+					/obj/item/toy/plush/mammal/dog/atticus,
+					/obj/item/toy/plush/mammal/dog/fletch,
+					/obj/item/toy/plush/mammal/dog/vincent,
+					/obj/item/toy/plush/mammal/dog/zigfried,
+					/obj/item/toy/plush/mammal/dog/nikolai,
+					/obj/item/toy/plush/catgirl,
+					/obj/item/toy/plush/catgirl/skylar,
+					/obj/item/toy/plush/catgirl/mikeel,
+					/obj/item/toy/plush/catgirl/robin)
+	crate_name = "plushie crate"
+	crate_type = /obj/structure/closet/crate/wooden
+
 /datum/supply_pack/costumes_toys/wizard
 	name = "Wizard Costume Crate"
 	desc = "Pretend to join the Wizard Federation with this full wizard outfit! Nanotrasen would like to remind its employees that actually joining the Wizard Federation is subject to termination of job and life."
@@ -2404,7 +2612,7 @@
 	crate_type = /obj/structure/closet/crate
 
 /datum/supply_pack/misc/lewdkeg
-	name = "Lewd Deluxe Keg" 
+	name = "Lewd Deluxe Keg"
 	desc = "That other stuff not getting you ready? Well I have a Chemslut making tons of the good stuff."
 	cost = 7000 //It can be a weapon
 	contraband = TRUE
@@ -2412,6 +2620,27 @@
 	crate_name = "deluxe keg"
 	crate_type = /obj/structure/closet/crate
 
+/datum/supply_pack/misc/paper_work
+	name = "Freelance Paper work"
+	desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (10) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up.
+	cost = 400 // Net of 0 credits
+	contains = list(/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain,
+					/obj/item/pen/fountain)
+	crate_name = "Paperwork"
+
 /datum/supply_pack/misc/toner
 	name = "Toner Crate"
 	desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'"

code/modules/client/verbs/aooc.dm

@@ -61,7 +61,7 @@
 		antaglisting |= M.current.client
 
 	for(var/mob/M in GLOB.player_list)
-		if(M.client && (M.stat == DEAD || M.client.holder))
+		if(M.client && (M.stat == DEAD || M.client.holder) && !istype(M, /mob/dead/new_player))
 			antaglisting |= M.client
 
 	for(var/client/C in antaglisting)

code/modules/clothing/glasses/_glasses.dm

@@ -67,6 +67,11 @@
 	user.visible_message("<span class='suicide'>[user] is putting \the [src] to [user.p_their()] eyes and overloading the brightness! It looks like [user.p_theyre()] trying to commit suicide!</span>")
 	return BRUTELOSS
 
+/obj/item/clothing/glasses/meson/prescription
+	name = "prescription optical meson scanner"
+	desc = "Used by engineering and mining staff to see basic structural and terrain layouts through walls, regardless of lighting conditions. This one has prescription lens fitted in."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/night
 	name = "night vision meson scanner"
 	desc = "An optical meson scanner fitted with an amplified visible light spectrum overlay, providing greater visual clarity in darkness."
@@ -159,6 +164,7 @@
 	attack_verb = list("sliced")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharpness = IS_SHARP
+	vision_correction = 1
 	glass_colour_type = /datum/client_colour/glass_colour/lightgreen
 
 /obj/item/clothing/glasses/regular

code/modules/clothing/glasses/engine_goggles.dm

@@ -21,6 +21,11 @@
 	var/mode = MODE_NONE
 	var/range = 1
 
+/obj/item/clothing/glasses/meson/engine/prescription
+	name = "prescription engineering scanner goggles"
+	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. Each lens has been replaced with a corrective lens."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/engine/Initialize()
 	. = ..()
 	START_PROCESSING(SSobj, src)
@@ -137,6 +142,11 @@
 
 	modes = list(MODE_NONE = MODE_TRAY, MODE_TRAY = MODE_NONE)
 
+/obj/item/clothing/glasses/meson/engine/tray/prescription
+	name = "prescription optical t-ray scanner"
+	desc = "Goggles used by engineers. The Meson Scanner mode lets you see basic structural and terrain layouts through walls, the T-ray Scanner mode lets you see underfloor objects such as cables and pipes, and the Radiation Scanner mode let's you see objects contaminated by radiation. This one has a lens that help correct eye sight."
+	vision_correction = 1
+
 /obj/item/clothing/glasses/meson/engine/shuttle
 	name = "shuttle region scanner"
 	icon_state = "trayson-shuttle"

code/modules/clothing/glasses/hud.dm

@@ -37,6 +37,14 @@
 	hud_type = DATA_HUD_MEDICAL_ADVANCED
 	glass_colour_type = /datum/client_colour/glass_colour/lightblue
 
+/obj/item/clothing/glasses/hud/health/prescription
+	name = "prescription health scanner HUD"
+	desc = "A heads-up display, made with a prescription lens, that scans the humans in view and provides accurate data about their health status."
+	icon_state = "healthhud"
+	hud_type = DATA_HUD_MEDICAL_ADVANCED
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/lightblue
+
 /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."
@@ -62,6 +70,14 @@
 	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
 	glass_colour_type = /datum/client_colour/glass_colour/lightorange
 
+/obj/item/clothing/glasses/hud/diagnostic/prescription
+	name = "prescription diagnostic HUD"
+	desc = "A heads-up display capable of analyzing the integrity and status of robotics and exosuits. This one has a prescription lens."
+	icon_state = "diagnostichud"
+	hud_type = DATA_HUD_DIAGNOSTIC_BASIC
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/lightorange
+
 /obj/item/clothing/glasses/hud/diagnostic/night
 	name = "night vision diagnostic HUD"
 	desc = "A robotics diagnostic HUD fitted with a light amplifier."
@@ -78,6 +94,14 @@
 	hud_type = DATA_HUD_SECURITY_ADVANCED
 	glass_colour_type = /datum/client_colour/glass_colour/red
 
+/obj/item/clothing/glasses/hud/security/prescription
+	name = "prescription security HUD"
+	desc = "A heads-up display that scans the humans in view and provides accurate data about their ID status and security records. This one has a prescription lens so you can see the banana peal that slipped you."
+	icon_state = "securityhud"
+	hud_type = DATA_HUD_SECURITY_ADVANCED
+	vision_correction = 1
+	glass_colour_type = /datum/client_colour/glass_colour/red
+
 /obj/item/clothing/glasses/hud/security/chameleon
 	name = "chameleon security HUD"
 	desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."

code/modules/clothing/spacesuits/miscellaneous.dm

@@ -168,6 +168,7 @@ Contains:
 	strip_delay = 130
 	item_flags = NODROP
 	brightness_on = 7
+	resistance_flags = ACID_PROOF
 
 /obj/item/clothing/suit/space/hardsuit/ert
 	name = "emergency response team suit"
@@ -179,6 +180,7 @@ Contains:
 	armor = list("melee" = 65, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 80, "acid" = 80)
 	slowdown = 0
 	strip_delay = 130
+	resistance_flags = ACID_PROOF
 
 	//ERT Security
 /obj/item/clothing/head/helmet/space/hardsuit/ert/sec

code/modules/clothing/suits/bio.dm

@@ -5,7 +5,7 @@
 	desc = "A hood that protects the head and face from biological contaminants."
 	permeability_coefficient = 0.01
 	clothing_flags = THICKMATERIAL | BLOCK_GAS_SMOKE_EFFECT
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
 	flags_inv = HIDEMASK|HIDEEARS|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR|HIDEFACE
 	resistance_flags = ACID_PROOF
 	flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
@@ -22,7 +22,7 @@
 	body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	slowdown = 1
 	allowed = list(/obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/pen, /obj/item/flashlight/pen, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray)
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 80, "fire" = 30, "acid" = 100)
+	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 60, "fire" = 30, "acid" = 100)
 	flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT|HIDETAUR
 	strip_delay = 70
 	equip_delay_other = 70

code/modules/clothing/suits/reactive_armour.dm

@@ -37,6 +37,7 @@
 	actions_types = list(/datum/action/item_action/toggle)
 	resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
 	hit_reaction_chance = 50 // Only on the chest yet blocks all attacks?
+	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 
 /obj/item/clothing/suit/armor/reactive/attack_self(mob/user)
 	active = !(active)
@@ -64,8 +65,9 @@
 /obj/item/clothing/suit/armor/reactive/teleport
 	name = "reactive teleport armor"
 	desc = "Someone separated our Research Director from his own head!"
-	var/tele_range = 6
-	var/rad_amount= 15
+	var/tele_range = 8
+	var/rad_amount = 60
+	var/rad_amount_before = 120
 	reactivearmor_cooldown_duration = 100
 
 /obj/item/clothing/suit/armor/reactive/teleport/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -79,6 +81,7 @@
 		owner.visible_message("<span class='danger'>The reactive teleport system flings [H] clear of [attack_text], shutting itself off in the process!</span>")
 		playsound(get_turf(owner),'sound/magic/blink.ogg', 100, 1)
 		var/list/turfs = new/list()
+		var/turf/old = get_turf(src)
 		for(var/turf/T in orange(tele_range, H))
 			if(T.density)
 				continue
@@ -93,7 +96,8 @@
 		if(!isturf(picked))
 			return
 		H.forceMove(picked)
-		H.rad_act(rad_amount)
+		radiation_pulse(old, rad_amount_before)
+		radiation_pulse(src, rad_amount)
 		reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
 		return 1
 	return 0
@@ -157,6 +161,8 @@
 	var/tesla_power = 25000
 	var/tesla_range = 20
 	var/tesla_flags = TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE
+	var/legacy = FALSE
+	var/legacy_dmg = 30
 
 /obj/item/clothing/suit/armor/reactive/tesla/dropped(mob/user)
 	..()
@@ -179,7 +185,15 @@
 			owner.visible_message("<span class='danger'>The tesla capacitors on [owner]'s reactive tesla armor are still recharging! The armor merely emits some sparks.</span>")
 			return
 		owner.visible_message("<span class='danger'>[src] blocks [attack_text], sending out arcs of lightning!</span>")
-		tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+		if(!legacy)
+			tesla_zap(owner, tesla_range, tesla_power, tesla_flags)
+		else
+			for(var/mob/living/M in view(7, owner))
+				if(M == owner)
+					continue
+				owner.Beam(M,icon_state="purple_lightning",icon='icons/effects/effects.dmi',time=5)
+				M.adjustFireLoss(legacy_dmg)
+				playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
 		reactivearmor_cooldown = world.time + reactivearmor_cooldown_duration
 		return TRUE
 

code/modules/clothing/under/vg_under.dm

@@ -1,3 +1,6 @@
+// Fixed to work with Citadel code. Apparently none of them had NO_MUTANTRACE flags.
+// I was pissy when I realised how to fix this because it's so fucking easy and nobody apparently had done it.
+
 /obj/item/clothing/under/stripper_pink
 	name = "pink stripper outfit"
 	icon_state = "stripper_p"
@@ -6,7 +9,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/stripper_green
 	name = "green stripper outfit"
@@ -16,8 +19,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_orange
 	name = "orange wedding dress"
@@ -28,7 +30,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_purple
 	name = "purple wedding dress"
@@ -39,7 +41,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_blue
 	name = "blue wedding dress"
@@ -50,7 +52,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_red
 	name = "red wedding dress"
@@ -61,7 +63,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/wedding/bride_white
 	name = "white wedding dress"
@@ -72,7 +74,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/mankini
 	name = "pink mankini"
@@ -82,6 +84,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 /*
 
 /obj/item/clothing/under/psysuit
@@ -126,7 +129,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/russobluecamooutfit
 	name = "russian blue camo"
@@ -137,7 +140,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/stilsuit
 	name = "stillsuit"
@@ -148,7 +151,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/aviatoruniform
 	name = "aviator uniform"
@@ -159,7 +162,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/bikersuit
 	name = "biker's outfit"
@@ -169,7 +172,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/jacketsuit
 	name = "richard's outfit"
@@ -180,7 +183,7 @@
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 obj/item/clothing/under/mega
 	name = "\improper DRN-001 suit"
@@ -191,7 +194,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/proto
 	name = "The Prototype Suit"
@@ -202,7 +205,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/megax
 	name = "\improper Maverick Hunter regalia"
@@ -213,7 +216,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/joe
 	name = "The Sniper Suit"
@@ -224,7 +227,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/roll
 	name = "\improper DRN-002 Dress"
@@ -235,7 +238,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/gokugidown
 	name = "turtle hermit undershirt"
@@ -246,7 +249,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/gokugi
 	name = "turtle hermit outfit"
@@ -257,7 +260,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/doomguy
 	name = "\improper Doomguy's pants"
@@ -268,7 +271,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/vault13
 	name = "vault 13 Jumpsuit"
@@ -279,7 +282,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/vault
 	name = "vault jumpsuit"
@@ -290,7 +293,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/clownpiece
 	name = "Clownpiece's Pierrot suit"
@@ -301,7 +304,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/cia
 	name = "casual IAA outfit"
@@ -312,7 +315,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/greaser
 	name = "greaser outfit"
@@ -322,7 +325,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/greaser/New()
 	var/greaser_colour = "default"
@@ -341,6 +344,8 @@ obj/item/clothing/under/mega
 	item_color = "greaser_[greaser_colour]"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
 
 /obj/item/clothing/under/wintercasualwear
 	name = "winter casualwear"
@@ -351,8 +356,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualwear
 	name = "spring casualwear"
@@ -363,7 +367,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/keyholesweater
 	name = "keyhole sweater"
@@ -374,7 +378,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualhoodie
 	name = "casual hoodie"
@@ -385,8 +389,7 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
-
-
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
 
 /obj/item/clothing/under/casualhoodie/skirt
 	icon_state = "hoodieskirt"
@@ -394,6 +397,8 @@ obj/item/clothing/under/mega
 	item_color = "hoodieskirt"
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+
 /*
 /obj/item/clothing/under/mummy_rags
 	name = "mummy rags"
@@ -427,3 +432,5 @@ obj/item/clothing/under/mega
 	can_adjust = 0
 	icon = 'modular_citadel/icons/obj/clothing/vg_clothes.dmi'
 	alternate_worn_icon = 'modular_citadel/icons/mob/citadel/uniforms.dmi'
+	mutantrace_variation = NO_MUTANTRACE_VARIATION
+

code/modules/crafting/recipes.dm

@@ -694,10 +694,18 @@
 					/obj/item/reagent_containers/food/snacks/grown/potato = 1)
 	category = CAT_MISC
 
+/datum/crafting_recipe/paperwork
+	name = "Filed Paper Work"
+	result =  /obj/item/paper/fluff/jobs/cargo/manifest/paperwork_correct
+	time = 90 //Takes time for people to file and complete paper work!
+	reqs = list(/obj/item/pen = 1,
+					/obj/item/paper/fluff/jobs/cargo/manifest/paperwork = 2)
+	category = CAT_MISC
+
 /datum/crafting_recipe/ghettojetpack
 	name = "Improvised Jetpack"
 	result = /obj/item/tank/jetpack/improvised
 	time = 30
 	reqs = list(/obj/item/tank/internals/oxygen/red = 2, /obj/item/extinguisher = 1, /obj/item/pipe = 3, /obj/item/stack/cable_coil = 30)//red oxygen tank so it looks right
 	category = CAT_MISC
-	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)
+	tools = list(TOOL_WRENCH, TOOL_WELDER, TOOL_WIRECUTTER)

code/modules/events/brand_intelligence.dm

@@ -18,7 +18,14 @@
 									 "Your money can buy happiness!", \
 									 "Engage direct marketing!", \
 									 "Advertising is legalized lying! But don't let that put you off our great deals!", \
-									 "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.")
+									 "You don't want to buy anything? Yeah, well, I didn't want to buy your mom either.",
+									 "Gamers, rise up!",
+									 "Ok, now, this is epic.",
+									 "HUMAN FUNNY.",
+									 "But I'm already tracer!",
+									 "How do I vore people?",
+									 "ERP?",
+									 "Not epic bros...")
 
 
 /datum/round_event/brand_intelligence/announce(fake)

code/modules/events/devil.dm

@@ -39,6 +39,7 @@
 	var/datum/job/jobdatum = SSjob.GetJob("Assistant")
 	devil.job = jobdatum.title
 	jobdatum.equip(devil)
+	success_spawn = TRUE
 	return SUCCESSFUL_SPAWN
 
 

code/modules/events/ion_storm.dm

@@ -12,7 +12,7 @@
 	var/removeDontImproveChance = 10 //chance the randomly created law replaces a random law instead of simply being added
 	var/shuffleLawsChance = 10 //chance the AI's laws are shuffled afterwards
 	var/botEmagChance = 10
-	var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means
+	var/announceEvent = ION_RANDOM // -1 means don't announce, 0 means have it randomly announce, 1 means it is announced
 	var/ionMessage = null
 	var/ionAnnounceChance = 33
 	announceWhen	= 1
@@ -30,7 +30,7 @@
 
 
 /datum/round_event/ion_storm/start()
-	//AI laws
+	//Generate AI law change
 	for(var/mob/living/silicon/ai/M in GLOB.alive_mob_list)
 		M.laws_sanity_check()
 		if(M.stat != DEAD && M.see_in_dark != 0)
@@ -53,6 +53,31 @@
 			log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
 			M.post_lawchange()
 
+	//Generate Cyborg law change
+	for(var/mob/living/silicon/robot/M in GLOB.alive_mob_list)
+		M.laws_sanity_check()
+		if(M.stat != DEAD && M.see_in_dark != 0)
+			if(prob(replaceLawsetChance))
+				M.laws.pick_weighted_lawset()
+
+			if(prob(removeRandomLawChance))
+				M.remove_law(rand(1, M.laws.get_law_amount(list(LAW_INHERENT, LAW_SUPPLIED))))
+
+			var/message = ionMessage || generate_ion_law()
+			if(message)
+				if(prob(removeDontImproveChance))
+					M.replace_random_law(message, list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+				else
+					M.add_ion_law(message)
+
+			if(prob(shuffleLawsChance))
+				M.shuffle_laws(list(LAW_INHERENT, LAW_SUPPLIED, LAW_ION))
+
+			log_game("Ion storm changed laws of [key_name(M)] to [english_list(M.laws.get_law_list(TRUE, TRUE))]")
+			M.post_lawchange()
+
+
+	//Chance to emag a Bot
 	if(botEmagChance)
 		for(var/mob/living/simple_animal/bot/bot in GLOB.alive_mob_list)
 			if(prob(botEmagChance))

code/modules/events/vent_clog.dm

@@ -79,12 +79,28 @@
 	typepath = /datum/round_event/vent_clog/beer
 	max_occurrences = 0
 
+/datum/round_event/vent_clog/beer
+	reagentsAmount = 100
+
 /datum/round_event_control/vent_clog/plasma_decon
 	name = "Plasma decontamination"
 	typepath = /datum/round_event/vent_clog/plasma_decon
 	max_occurrences = 0
 
-/datum/round_event/vent_clog/beer
+/datum/round_event_control/vent_clog/female
+	name = "FemCum stationwide"
+	typepath = /datum/round_event/vent_clog/female
+	max_occurrences = 0
+
+/datum/round_event/vent_clog/female
+	reagentsAmount = 100
+
+/datum/round_event_control/vent_clog/male
+	name = "Semen stationwide"
+	typepath = /datum/round_event/vent_clog/male
+	max_occurrences = 0
+
+/datum/round_event/vent_clog/male
 	reagentsAmount = 100
 
 /datum/round_event/vent_clog/beer/announce()
@@ -102,6 +118,30 @@
 			foam.start()
 		CHECK_TICK
 
+/datum/round_event/vent_clog/male/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+		if(vent && vent.loc)
+			var/datum/reagents/R = new/datum/reagents(1000)
+			R.my_atom = vent
+			R.add_reagent("semen", reagentsAmount)
+
+			var/datum/effect_system/foam_spread/foam = new
+			foam.set_up(200, get_turf(vent), R)
+			foam.start()
+		CHECK_TICK
+
+/datum/round_event/vent_clog/female/start()
+	for(var/obj/machinery/atmospherics/components/unary/vent in vents)
+		if(vent && vent.loc)
+			var/datum/reagents/R = new/datum/reagents(1000)
+			R.my_atom = vent
+			R.add_reagent("femcum", reagentsAmount)
+
+			var/datum/effect_system/foam_spread/foam = new
+			foam.set_up(200, get_turf(vent), R)
+			foam.start()
+		CHECK_TICK
+
 /datum/round_event/vent_clog/plasma_decon/announce()
 	priority_announce("We are deploying an experimental plasma decontamination system. Please stand away from the vents and do not breathe the smoke that comes out.", "Central Command Update")
 

code/modules/food_and_drinks/drinks/drinks.dm

@@ -120,6 +120,12 @@
 	I.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0))
 	B.icon = I
 	B.name = "broken [name]"
+	if(ranged)
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	if(prob(33))
 		new/obj/item/shard(drop_location())
 	playsound(src, "shatter", 70, 1)
@@ -296,6 +302,12 @@
 	B.force = 0
 	B.throwforce = 0
 	B.desc = "A carton with the bottom half burst open. Might give you a papercut."
+	if(ranged)
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	transfer_fingerprints_to(B)
 	qdel(src)
 

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -23,6 +23,12 @@
 	var/obj/item/broken_bottle/B = new (loc)
 	if(!ranged)
 		thrower.put_in_hands(B)
+	else
+		var/matrix/M = matrix(B.transform)
+		M.Turn(rand(-170, 170))
+		B.transform = M
+		B.pixel_x = rand(-12, 12)
+		B.pixel_y = rand(-12, 12)
 	B.icon_state = icon_state
 
 	var/icon/I = new('icons/obj/drinks.dmi', src.icon_state)

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -185,6 +185,17 @@
 	icon_state = ""
 	bitesize = 2
 
+GLOBAL_VAR_INIT(frying_hardmode, TRUE)
+GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
+GLOBAL_LIST_INIT(frying_bad_chems, list(
+"bad_food" = 10,
+"clf3" = 2,
+"aranesp" = 2,
+"blackpowder" = 10,
+"phlogiston" = 3,
+"cyanide" = 3,
+))
+
 /obj/item/reagent_containers/food/snacks/deepfryholder/Initialize(mapload, obj/item/fried)
 	. = ..()
 	name = fried.name //We'll determine the other stuff when it's actually removed
@@ -210,6 +221,13 @@
 	else
 		fried.forceMove(src)
 		trash = fried
+		if(!istype(fried, /obj/item/reagent_containers/food) && GLOB.frying_hardmode && GLOB.frying_bad_chems.len)
+			var/R = rand(1, GLOB.frying_bad_chems.len)
+			var/bad_chem = GLOB.frying_bad_chems[R]
+			var/bad_chem_amount = GLOB.frying_bad_chems[bad_chem]
+			if(GLOB.frying_bad_chem_add_volume)
+				reagents.maximum_volume += bad_chem_amount
+			reagents.add_reagent(bad_chem, bad_chem_amount)
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
 	if(trash)

code/modules/food_and_drinks/food/snacks_other.dm

@@ -563,9 +563,9 @@
 
 /obj/item/reagent_containers/food/snacks/tinychocolate
 	name = "chocolate"
-	desc = "A tiny and sweet chocolate."
+	desc = "A tiny and sweet chocolate. Has a 'strawberry' filling!"
 	icon_state = "tiny_chocolate"
-	list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1)
+	list_reagents = list("nutriment" = 1, "sugar" = 1, "cocoa" = 1, "aphro" = 1)
 	filling_color = "#A0522D"
 	tastes = list("chocolate" = 1)
-	foodtype = JUNKFOOD | SUGAR
+	foodtype = JUNKFOOD | SUGAR

code/modules/food_and_drinks/food/snacks_pizza.dm

@@ -149,16 +149,16 @@
 	icon_state = "pineapplepizza"
 	slice_path = /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
 	bonus_reagents = list("nutriment" = 6, "vitamin" = 6)
-	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2)
+	foodtype = PINEAPPLE //Over powering tast of gods fruit
 
 /obj/item/reagent_containers/food/snacks/pizzaslice/pineapple
 	name = "\improper Hawaiian pizza slice"
 	desc = "A slice of delicious controversy."
 	icon_state = "pineapplepizzaslice"
 	filling_color = "#FF4500"
-	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 2, "ham" = 2)
-	foodtype = GRAIN | VEGETABLES | DAIRY | MEAT | FRUIT | PINEAPPLE
+	tastes = list("crust" = 1, "tomato" = 1, "cheese" = 1, "pineapple" = 6, "ham" = 2)
+	foodtype = PINEAPPLE //Over powering tast of gods fruit
 
 /obj/item/reagent_containers/food/snacks/pizza/arnold
 	name = "\improper Arnold pizza"

code/modules/food_and_drinks/recipes/drinks_recipes.dm

@@ -1,6 +1,5 @@
 ////////////////////////////////////////// COCKTAILS //////////////////////////////////////
 
-
 /datum/chemical_reaction/goldschlager
 	name = "Goldschlager"
 	id = "goldschlager"
@@ -676,7 +675,6 @@
 	results = list("fernet_cola" = 2)
 	required_reagents = list("fernet" = 1, "cola" = 1)
 
-
 /datum/chemical_reaction/fanciulli
 	name = "Fanciulli"
 	id = "fanciulli"
@@ -688,3 +686,9 @@
 	id = "branca_menta"
 	results = list("branca_menta" = 3)
 	required_reagents = list("fernet" = 1, "creme_de_menthe" = 1, "ice" = 1)
+
+/datum/chemical_reaction/pwrgame
+	name = "Power Gamer"
+	id = "pwr_game"
+	results = list("pwr_game" = 5)
+	required_reagents = list("sodawater" = 1, "blackcrayonpowder" = 1, "sodiumchloride" = 1)

code/modules/holodeck/turfs.dm

@@ -122,7 +122,7 @@
 /turf/open/floor/holofloor/wood
 	icon_state = "wood"
 	tiled_dirt = FALSE
-	
+
 /turf/open/floor/holofloor/snow
 	gender = PLURAL
 	name = "snow"
@@ -133,6 +133,15 @@
 	bullet_sizzle = TRUE
 	bullet_bounce_sound = null
 	tiled_dirt = FALSE
+	baseturfs = /turf/open/floor/holofloor/snow
+
+/turf/open/floor/holofloor/snow/attack_hand(mob/living/user)
+	. = ..()
+	if(.)
+		return
+	user.visible_message("<span class='notice'>[user] scroops up some snow from [src].</span>", "<span class='notice'>You scoop up some snow from [src].</span>")
+	var/obj/item/toy/snowball/S = new(get_turf(src))
+	user.put_in_hands(S)
 
 /turf/open/floor/holofloor/snow/cold
 	initial_gas_mix = "nob=7500;TEMP=2.7"
@@ -143,3 +152,22 @@
 	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	tiled_dirt = FALSE
+
+/turf/open/floor/holofloor/ice
+	name = "ice sheet"
+	desc = "A sheet of solid ice. Looks slippery."
+	icon = 'icons/turf/floors/ice_turf.dmi'
+	icon_state = "unsmooth"
+	baseturfs = /turf/open/floor/holofloor/ice
+	slowdown = 1
+	footstep = FOOTSTEP_FLOOR
+
+/turf/open/floor/holofloor/ice/smooth
+	icon_state = "smooth"
+	smooth = SMOOTH_MORE | SMOOTH_BORDER
+	canSmoothWith = list(/turf/open/floor/plating/ice/smooth, /turf/open/floor/plating/ice, /turf/open/floor/holofloor/ice)
+	baseturfs = /turf/open/floor/holofloor/ice/smooth
+
+/turf/open/floor/holofloor/ice/Initialize()
+	. = ..()
+	MakeSlippery(TURF_WET_PERMAFROST, INFINITY, 0, INFINITY, TRUE)

code/modules/hydroponics/grown/tomato.dm

@@ -136,7 +136,7 @@
 
 	spawn(30)
 		if(!QDELETED(src))
-			investigate_log(INVESTIGATE_BOTANY, "[key_name(user)] released a killer tomato at [COORD(src)]")
+			investigate_log("[key_name(user)] released a killer tomato at [COORD(src)]", INVESTIGATE_BOTANY)
 			var/mob/living/simple_animal/hostile/killertomato/K = new /mob/living/simple_animal/hostile/killertomato(get_turf(src.loc))
 			K.maxHealth += round(seed.endurance / 3)
 			K.melee_damage_lower += round(seed.potency / 10)

code/modules/hydroponics/hydroitemdefines.dm

@@ -24,10 +24,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-
-/obj/item/reagent_containers/spray/weedspray/Initialize()
-	. = ..()
-	reagents.add_reagent("weedkiller", 100)
+	list_reagents = list("weedkiller" = 100)
 
 /obj/item/reagent_containers/spray/weedspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -42,10 +39,7 @@
 	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
 	volume = 100
-
-/obj/item/reagent_containers/spray/pestspray/Initialize()
-	. = ..()
-	reagents.add_reagent("pestkiller", 100)
+	list_reagents = list("pestkiller" = 100)
 
 /obj/item/reagent_containers/spray/pestspray/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is huffing [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
@@ -157,71 +151,45 @@
 
 /obj/item/reagent_containers/glass/bottle/nutrient
 	name = "bottle of nutrient"
-	icon = 'icons/obj/chemical.dmi'
 	volume = 50
-	w_class = WEIGHT_CLASS_TINY
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/Initialize()
 	. = ..()
-	src.pixel_x = rand(-5, 5)
-	src.pixel_y = rand(-5, 5)
+	pixel_x = rand(-5, 5)
+	pixel_y = rand(-5, 5)
 
 
 /obj/item/reagent_containers/glass/bottle/nutrient/ez
 	name = "bottle of E-Z-Nutrient"
 	desc = "Contains a fertilizer that causes mild mutations with each harvest."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/ez/Initialize()
-	. = ..()
-	reagents.add_reagent("eznutriment", 50)
+	list_reagents = list("eznutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/l4z
 	name = "bottle of Left 4 Zed"
 	desc = "Contains a fertilizer that limits plant yields to no more than one and causes significant mutations in plants."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/l4z/Initialize()
-	. = ..()
-	reagents.add_reagent("left4zednutriment", 50)
+	list_reagents = list("left4zednutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/rh
 	name = "bottle of Robust Harvest"
 	desc = "Contains a fertilizer that increases the yield of a plant by 30% while causing no mutations."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/nutrient/rh/Initialize()
-	. = ..()
-	reagents.add_reagent("robustharvestnutriment", 50)
+	list_reagents = list("robustharvestnutriment" = 50)
 
 /obj/item/reagent_containers/glass/bottle/nutrient/empty
 	name = "bottle"
-	icon = 'icons/obj/chemical.dmi'
 
 /obj/item/reagent_containers/glass/bottle/killer
-	name = "bottle"
-	icon = 'icons/obj/chemical.dmi'
 	volume = 50
-	w_class = WEIGHT_CLASS_TINY
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(1,2,5,10,15,25,50)
 
 /obj/item/reagent_containers/glass/bottle/killer/weedkiller
 	name = "bottle of weed killer"
 	desc = "Contains a herbicide."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/weedkiller/Initialize()
-	. = ..()
-	reagents.add_reagent("weedkiller", 50)
+	list_reagents = list("weedkiller" = 50)
 
 /obj/item/reagent_containers/glass/bottle/killer/pestkiller
 	name = "bottle of pest spray"
 	desc = "Contains a pesticide."
-	icon = 'icons/obj/chemical.dmi'
-
-/obj/item/reagent_containers/glass/bottle/killer/pestkiller/Initialize()
-	. = ..()
-	reagents.add_reagent("pestkiller", 50)
+	list_reagents = list("pestkiller" = 50)

code/modules/jobs/job_types/job.dm

@@ -127,6 +127,8 @@
 		return 0
 	if(!CONFIG_GET(flag/use_age_restriction_for_jobs))
 		return 0
+	if(C.prefs.db_flags & DB_FLAG_EXEMPT)
+		return 0
 	if(!isnum(C.player_age))
 		return 0 //This is only a number if the db connection is established, otherwise it is text: "Requires database", meaning these restrictions cannot be enforced
 	if(!isnum(minimal_player_age))