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

code/modules/admin/antag_panel.dm

@@ -104,7 +104,7 @@ GLOBAL_VAR(antag_prototypes)
 
 	var/special_statuses = get_special_statuses()
 	if(length(special_statuses))
-		out += get_special_statuses() + "<br>"
+		out += special_statuses + "<br>"
 
 	if(!GLOB.antag_prototypes)
 		GLOB.antag_prototypes = list()

code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm

@@ -200,39 +200,3 @@
 					to_chat(resident, "<span class='notice'>You fix the mechanism and lock it.</span>")
 					broken = FALSE
 					locked = TRUE
-
-// Look up recipes.dm OR pneumaticCannon.dm
-/datum/crafting_recipe/bloodsucker/blackcoffin
-	name = "Black Coffin"
-	result = /obj/structure/closet/crate/coffin/blackcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
-	reqs = list(/obj/item/stack/sheet/cloth = 1,
-				/obj/item/stack/sheet/mineral/wood = 5,
-				/obj/item/stack/sheet/metal = 1)
-				///obj/item/stack/packageWrap = 8,
-				///obj/item/pipe = 2)
-	time = 150
-	category = CAT_MISC
-	always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/meatcoffin
-	name = "Meat Coffin"
-	result =/obj/structure/closet/crate/coffin/meatcoffin
-	tools = list(/obj/item/kitchen/knife,
-				 /obj/item/kitchen/rollingpin)
-	reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5,
-				/obj/item/restraints/handcuffs/cable = 1)
-	time = 150
-	category = CAT_MISC
-	always_availible = TRUE
-
-/datum/crafting_recipe/bloodsucker/metalcoffin
-	name = "Metal Coffin"
-	result =/obj/structure/closet/crate/coffin/metalcoffin
-	tools = list(/obj/item/weldingtool,
-				 /obj/item/screwdriver)
-	reqs = list(/obj/item/stack/sheet/metal = 5)
-	time = 100
-	category = CAT_MISC
-	always_availible = TRUE

code/modules/antagonists/traitor/classes/hijack.dm

@@ -16,3 +16,6 @@
 /datum/traitor_class/human/hijack/finalize_traitor(datum/antagonist/traitor/T)
 	T.hijack_speed=1
 	return TRUE
+
+/datum/traitor_class/human/hijack/clean_up_traitor(datum/antagonist/traitor/T)
+	T.hijack_speed = 0.5

code/modules/antagonists/traitor/classes/traitor_class.dm

@@ -38,3 +38,7 @@ GLOBAL_LIST_EMPTY(traitor_classes)
 /datum/traitor_class/proc/finalize_traitor(datum/antagonist/traitor/T)
 	// Finalization. Return TRUE if should play standard traitor sound/equip, return FALSE if both are special case
 	return TRUE
+
+/datum/traitor_class/proc/clean_up_traitor(datum/antagonist/traitor/T)
+	// Any effects that need to be cleaned up if traitor class is being swapped.
+	

code/modules/antagonists/traitor/datum_traitor.dm

@@ -15,36 +15,53 @@
 	threat = 5
 
 /datum/antagonist/traitor/New()
-	..()
 	if(!GLOB.traitor_classes.len)//Only need to fill the list when it's needed.
 		for(var/I in subtypesof(/datum/traitor_class))
 			new I
+	..()
 
-/datum/antagonist/traitor/proc/set_traitor_kind(var/kind)
+/datum/antagonist/traitor/proc/set_traitor_kind(kind)
+	var/swap_from_old = FALSE
+	if(traitor_kind)
+		traitor_kind.remove_innate_effects(owner.current)
+		traitor_kind.clean_up_traitor(src)
+		swap_from_old = TRUE
 	traitor_kind = GLOB.traitor_classes[kind]
+	traitor_kind.apply_innate_effects(owner.current)
+	if(give_objectives)
+		for(var/O in objectives)
+			qdel(O)
+		traitor_kind.forge_objectives(src)
+	if(swap_from_old)
+		traitor_kind.finalize_traitor(src)
+		traitor_kind.greet(src)
+		owner.announce_objectives()
+
+/proc/get_random_traitor_kind(var/list/blacklist = list())
+	var/chaos_weight = 0
+	if(istype(SSticker.mode,/datum/game_mode/dynamic))
+		var/datum/game_mode/dynamic/mode = SSticker.mode
+		chaos_weight = (mode.threat - 50)/50
+	var/list/weights = list()
+	for(var/C in GLOB.traitor_classes)
+		if(!(C in blacklist))
+			var/datum/traitor_class/class = GLOB.traitor_classes[C]
+			var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
+			weights[C] = weight * 1000
+	var/choice = pickweightAllowZero(weights)
+	if(!choice)
+		choice = TRAITOR_HUMAN // it's an "easter egg"
+	var/datum/traitor_class/actual_class = GLOB.traitor_classes[choice]
+	actual_class.weight *= 0.8 // less likely this round
+	return choice
 
 /datum/antagonist/traitor/on_gain()
 	if(owner.current && isAI(owner.current))
 		set_traitor_kind(TRAITOR_AI)
 	else
-		var/chaos_weight = 0
-		if(istype(SSticker.mode,/datum/game_mode/dynamic))
-			var/datum/game_mode/dynamic/mode = SSticker.mode
-			chaos_weight = (mode.threat - 50)/50
-		var/list/weights = list()
-		for(var/C in GLOB.traitor_classes)
-			var/datum/traitor_class/class = GLOB.traitor_classes[C]
-			var/weight = LOGISTIC_FUNCTION(1.5*class.weight,chaos_weight,class.chaos,0)
-			weights[C] = weight
-		var/choice = pickweightAllowZero(weights)
-		if(!choice)
-			choice = GLOB.traitor_classes[TRAITOR_HUMAN] // it's an "easter egg"
-		set_traitor_kind(choice)
-		traitor_kind.weight *= 0.8 // less likely this round
+		set_traitor_kind(get_random_traitor_kind())
 	SSticker.mode.traitors += owner
 	owner.special_role = special_role
-	if(give_objectives)
-		traitor_kind.forge_objectives(src)
 	finalize_traitor()
 	..()
 
@@ -97,7 +114,8 @@
 		owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/tatoralert.ogg', 100, FALSE, pressure_affected = FALSE)
 
 /datum/antagonist/traitor/antag_panel_objectives()
-	. = ..()
+	. += "<i><b>Traitor class:</b></i> <a href='?src=[REF(owner)];traitor_class=1;target_antag=[REF(src)]'>[traitor_kind.employer]</a><br>"
+	. += ..()
 	if(contractor_hub?.assigned_targets && length(contractor_hub.assigned_targets))
 		. += "<i><b>Contract Targets</b></i>:<br>"
 		for(var/datum/mind/M in contractor_hub.assigned_targets)

code/modules/cargo/packs/misc.dm

@@ -330,7 +330,7 @@
 /datum/supply_pack/misc/religious_supplies
 	name = "Religious Supplies Crate"
 	desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets."
-	cost = 4000	// it costs so much because the Space Church is ran by Space Jews
+	cost = 4000	// it costs so much because the Space Church needs funding to build a cathedral
 	contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater,
 					/obj/item/reagent_containers/food/drinks/bottle/holywater,
 					/obj/item/storage/book/bible/booze,

code/modules/client/preferences.dm

@@ -197,10 +197,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
 	var/action_buttons_screen_locs = list()
 
 	//bad stuff
-	var/digestable = FALSE
-	var/devourable = FALSE
-	var/feeding = FALSE
-	var/lickable = FALSE
+	var/vore_flags = 0
 	var/list/belly_prefs = list()
 	var/vore_taste = "nothing in particular"
 

code/modules/client/preferences_savefile.dm

@@ -5,7 +5,7 @@
 //	You do not need to raise this if you are adding new values that have sane defaults.
 //	Only raise this value when changing the meaning/format/name/layout of an existing value
 //	where you would want the updater procs below to run
-#define SAVEFILE_VERSION_MAX	28
+#define SAVEFILE_VERSION_MAX	29
 
 /*
 SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Carn
@@ -120,10 +120,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(fexists(vr_path))
 			var/list/json_from_file = json_decode(file2text(vr_path))
 			if(json_from_file)
-				digestable = json_from_file["digestable"]
-				devourable = json_from_file["devourable"]
-				feeding = json_from_file["feeding"]
-				lickable = json_from_file["lickable"]
+				if(json_from_file["digestable"])
+					ENABLE_BITFIELD(vore_flags,DIGESTABLE)
+				if(json_from_file["devourable"])
+					ENABLE_BITFIELD(vore_flags,DEVOURABLE)
+				if(json_from_file["feeding"])
+					ENABLE_BITFIELD(vore_flags,FEEDING)
+				if(json_from_file["lickable"])
+					ENABLE_BITFIELD(vore_flags,LICKABLE)
 				belly_prefs = json_from_file["belly_prefs"]
 				vore_taste = json_from_file["vore_taste"]
 
@@ -158,6 +162,24 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 		if(malformed_hockeys[hockey])
 			features["cock_shape"] = malformed_hockeys[hockey]
 			features["cock_taur"] = TRUE
+	
+	if(current_version < 29)
+		var/digestable
+		var/devourable
+		var/feeding
+		var/lickable
+		S["digestable"]						>> digestable
+		S["devourable"]						>> devourable
+		S["feeding"]						>> feeding
+		S["lickable"]						>> lickable
+		if(digestable)
+			ENABLE_BITFIELD(vore_flags,DIGESTABLE)
+		if(devourable)
+			ENABLE_BITFIELD(vore_flags,DEVOURABLE)
+		if(feeding)
+			ENABLE_BITFIELD(vore_flags,FEEDING)
+		if(lickable)
+			ENABLE_BITFIELD(vore_flags,LICKABLE)
 
 /datum/preferences/proc/load_path(ckey,filename="preferences.sav")
 	if(!ckey)
@@ -499,11 +521,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	else //We have no old flavortext, default to new
 		S["feature_flavor_text"]		>> features["flavor_text"]
 
-	S["digestable"]						>> digestable
-	S["devourable"]						>> devourable
-	S["feeding"]						>> feeding
+	S["vore_flags"]						>> vore_flags
 	S["vore_taste"]						>> vore_taste
-	S["lickable"]						>> lickable
 	S["belly_prefs"]					>> belly_prefs
 
 	//try to fix any outdated data if necessary
@@ -623,10 +642,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 
 	all_quirks = SANITIZE_LIST(all_quirks)
 
-	lickable						= sanitize_integer(lickable, FALSE, TRUE, initial(lickable))
-	devourable						= sanitize_integer(devourable, FALSE, TRUE, initial(devourable))
-	digestable						= sanitize_integer(digestable, FALSE, TRUE, initial(digestable))
-	feeding							= sanitize_integer(feeding, FALSE, TRUE, initial(feeding))
+	vore_flags						= sanitize_integer(vore_flags, 0, MAX_VORE_FLAG, 0)
 	vore_taste						= copytext(vore_taste, 1, MAX_TASTE_LEN)
 	belly_prefs 					= SANITIZE_LIST(belly_prefs)
 
@@ -736,11 +752,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
 	//Quirks
 	WRITE_FILE(S["all_quirks"]			, all_quirks)
 
-	WRITE_FILE(S["digestable"]			, digestable)
-	WRITE_FILE(S["devourable"]			, devourable)
-	WRITE_FILE(S["feeding"]				, feeding)
+	WRITE_FILE(S["vore_flags"]			, vore_flags)
 	WRITE_FILE(S["vore_taste"]			, vore_taste)
-	WRITE_FILE(S["lickable"]			, lickable)
 	WRITE_FILE(S["belly_prefs"]			, belly_prefs)
 
 	cit_character_pref_save(S)

code/modules/clothing/suits/miscellaneous.dm

@@ -996,7 +996,7 @@
 	item_state = "coatpoly"
 	hoodtype = /obj/item/clothing/head/hooded/winterhood/polychromic
 
-/obj/item/clothing/suit/hooded/wintercoat/ComponentInitialize()
+/obj/item/clothing/suit/hooded/wintercoat/polychromic/ComponentInitialize()
 	. = ..()
 	AddElement(/datum/element/polychromic, list("#6A6964", "#C4B8A6", "#0000FF"), 3)
 

code/modules/clothing/suits/toggles.dm

@@ -37,7 +37,6 @@
 	..()
 
 /obj/item/clothing/suit/hooded/proc/RemoveHood()
-	src.icon_state = "[initial(icon_state)]"
 	suittoggled = FALSE
 	if(ishuman(hood.loc))
 		var/mob/living/carbon/H = hood.loc
@@ -45,9 +44,14 @@
 		H.update_inv_wear_suit()
 	else
 		hood.forceMove(src)
-	for(var/X in actions)
-		var/datum/action/A = X
-		A.UpdateButtonIcon()
+	update_icon()
+
+/obj/item/clothing/suit/hooded/update_icon_state()
+	icon_state = "[initial(icon_state)]"
+	if(ishuman(hood.loc))
+		var/mob/living/carbon/human/H = hood.loc
+		if(H.head == hood)
+			icon_state += "_t"
 
 /obj/item/clothing/suit/hooded/dropped(mob/user)
 	..()
@@ -65,11 +69,8 @@
 				return
 			else if(H.equip_to_slot_if_possible(hood,SLOT_HEAD,0,0,1))
 				suittoggled = TRUE
-				src.icon_state = "[initial(icon_state)]_t"
+				update_icon()
 				H.update_inv_wear_suit()
-				for(var/X in actions)
-					var/datum/action/A = X
-					A.UpdateButtonIcon()
 	else
 		RemoveHood()
 

code/modules/clothing/under/jobs/cargo.dm

@@ -18,7 +18,7 @@
 /obj/item/clothing/under/rank/cargo/tech
 	name = "cargo technician's jumpsuit"
 	desc = "Shooooorts! They're comfy and easy to wear!"
-	icon_state = "cargotech"
+	icon_state = "cargo"
 	item_state = "lb_suit"
 	body_parts_covered = CHEST|GROIN|ARMS
 	alt_covers_chest = TRUE

code/modules/clothing/under/trek.dm

@@ -44,6 +44,7 @@
 /obj/item/clothing/under/trek/medsci/next
 	desc = "The uniform worn by medsci officers. This one's from the mid 2360s."
 	icon_state = "trek_next_medsci"
+	item_state = "b_suit"
 
 
 //ENT
@@ -67,35 +68,51 @@
 /obj/item/clothing/under/trek/command/voy
 	desc = "The uniform worn by command officers of the 2370s."
 	icon_state = "trek_voy_command"
-	item_state = "trek_voy_command"
+	item_state = "r_suit"
 
 /obj/item/clothing/under/trek/engsec/voy
 	desc = "The uniform worn by operations officers of the 2370s."
 	icon_state = "trek_voy_engsec"
-	item_state = "trek_voy_engsec"
+	item_state = "y_suit"
 
 /obj/item/clothing/under/trek/medsci/voy
 	desc = "The uniform worn by medsci officers of the 2370s."
 	icon_state = "trek_voy_medsci"
-	item_state = "trek_voy_medsci"
+	item_state = "b_suit"
 
 
 //DS9
 /obj/item/clothing/under/trek/command/ds9
 	desc = "The uniform worn by command officers of the 2380s."
 	icon_state = "trek_ds9_command"
-	item_state = "trek_ds9_command"
+	item_state = "r_suit"
 
 /obj/item/clothing/under/trek/engsec/ds9
 	desc = "The uniform worn by operations officers of the 2380s."
 	icon_state = "trek_ds9_engsec"
-	item_state = "trek_ds9_engsec"
+	item_state = "y_suit"
 
 /obj/item/clothing/under/trek/medsci/ds9
 	desc = "The uniform undershirt worn by medsci officers of the 2380s."
 	icon_state = "trek_ds9_medsci"
-	item_state = "trek_ds9_medsci"
+	item_state = "b_suit"
 
+//The Motion Picture
+/obj/item/clothing/under/trek/fedutil
+	name = "federation utility uniform"
+	desc = "The uniform worn by United Federation enlisted crew members in 2285s."
+	icon_state = "trek_tmp_enlist"
+	item_state = "r_suit"
+
+/obj/item/clothing/under/trek/fedutil/trainee
+	name = "federation trainee utility uniform"
+	desc = "The uniform worn by United Federation enlisted trainees in 2285s."
+	icon_state = "trek_tmp_trainee"
+
+/obj/item/clothing/under/trek/fedutil/service
+	name = "federation service uniform"
+	desc = "The uniform worn by United Federation enlists for service work in 2285s."
+	icon_state = "trek_tmp_service"
 
 //Q
 /obj/item/clothing/under/trek/Q

code/modules/food_and_drinks/food.dm

@@ -16,6 +16,7 @@
 	resistance_flags = FLAMMABLE
 	var/foodtype = NONE
 	var/last_check_time
+	var/food_quality = 50
 
 /obj/item/reagent_containers/food/Initialize(mapload)
 	. = ..()
@@ -23,6 +24,9 @@
 		pixel_x = rand(-5, 5)
 		pixel_y = rand(-5, 5)
 
+/obj/item/reagent_containers/food/proc/adjust_food_quality(new_quality)
+	food_quality = CLAMP(new_quality,0,100)
+
 /obj/item/reagent_containers/food/proc/checkLiked(var/fraction, mob/M)
 	if(last_check_time + 50 < world.time)
 		if(ishuman(M))
@@ -32,13 +36,13 @@
 					to_chat(H,"<span class='warning'>What the hell was that thing?!</span>")
 					H.adjust_disgust(25 + 30 * fraction)
 					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "toxic_food", /datum/mood_event/disgusting_food)
-				else if(foodtype & H.dna.species.disliked_food)
+				else if((foodtype & H.dna.species.disliked_food) || food_quality <= 30)
 					to_chat(H,"<span class='notice'>That didn't taste very good...</span>")
 					H.adjust_disgust(11 + 15 * fraction)
 					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "gross_food", /datum/mood_event/gross_food)
-				else if(foodtype & H.dna.species.liked_food)
+				else if(((foodtype & H.dna.species.liked_food) && food_quality >= 50) || food_quality >= 70) //you like food of high quality, and food of regular quality you have a preference for
 					to_chat(H,"<span class='notice'>I love this taste!</span>")
-					H.adjust_disgust(-5 + -2.5 * fraction)
+					H.adjust_disgust(-5 + (-2.5 * food_quality/50) + -2.5 * fraction)
 					SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "fav_food", /datum/mood_event/favorite_food)
 			else
 				if(foodtype & H.dna.species.toxic_food)
@@ -48,4 +52,4 @@
 				SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "breakfast", /datum/mood_event/breakfast)
 			last_check_time = world.time
 
-#undef STOP_SERVING_BREAKFAST
+#undef STOP_SERVING_BREAKFAST

code/modules/food_and_drinks/food/customizables.dm

@@ -20,6 +20,7 @@
 	var/list/ingredients = list()
 	var/ingredients_placement = INGREDIENTS_FILL
 	var/customname = "custom"
+	var/total_quality = 0 //quality of all ingredients added together
 
 /obj/item/reagent_containers/food/snacks/customizable/examine(mob/user)
 	. = ..()
@@ -56,6 +57,9 @@
 			S.reagents.trans_to(src,min(S.reagents.total_volume, 15)) //limit of 15, we don't want our custom food to be completely filled by just one ingredient with large reagent volume.
 			foodtype |= S.foodtype
 			update_snack_overlays(S)
+			//quality of customised food is average of the ingredient's qualities
+			total_quality += S.food_quality
+			food_quality = total_quality / length(ingredients)
 			to_chat(user, "<span class='notice'>You add the [I.name] to the [name].</span>")
 			update_name(S)
 	else

code/modules/food_and_drinks/food/snacks.dm

@@ -153,6 +153,12 @@ All foods are distributed among various categories. Use common sense.
 
 /obj/item/reagent_containers/food/snacks/examine(mob/user)
 	. = ..()
+	if(food_quality >= 70)
+		. += "It is of a high quality."
+	else
+		if(food_quality <= 30)
+			. += "It is of a low quality."
+
 	if(bitecount == 0)
 		return
 	else if(bitecount == 1)
@@ -283,9 +289,9 @@ All foods are distributed among various categories. Use common sense.
 	S.create_reagents(S.volume, reagent_flags, reagent_value)
 	if(reagents)
 		reagents.trans_to(S, reagents.total_volume)
-	if(S.bonus_reagents && S.bonus_reagents.len)
+	if(cooking_efficiency && length(S.bonus_reagents))
 		for(var/r_id in S.bonus_reagents)
-			var/amount = S.bonus_reagents[r_id] * cooking_efficiency
+			var/amount = round(S.bonus_reagents[r_id] * cooking_efficiency)
 			if(r_id == /datum/reagent/consumable/nutriment || r_id == /datum/reagent/consumable/nutriment/vitamin)
 				S.reagents.add_reagent(r_id, amount, tastes)
 			else
@@ -296,6 +302,10 @@ All foods are distributed among various categories. Use common sense.
 	var/obj/item/result
 	if(cooked_type)
 		result = new cooked_type(T)
+		//if the result is food, set its food quality to the original food item's quality
+		if(isfood(result))
+			var/obj/item/reagent_containers/food/food_output = result
+			food_output.adjust_food_quality(food_quality + M.quality_increase)
 		if(istype(M))
 			initialize_cooked_food(result, M.efficiency)
 		else

code/modules/food_and_drinks/food/snacks_bread.dm

@@ -197,6 +197,7 @@
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = ""
 	bitesize = 2
+	var/fried_garbage = FALSE //did you really fry a fire extinguisher?
 
 GLOBAL_VAR_INIT(frying_hardmode, TRUE)
 GLOBAL_VAR_INIT(frying_bad_chem_add_volume, TRUE)
@@ -227,21 +228,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	item_flags = fried.item_flags
 	obj_flags = fried.obj_flags
 
-	if(istype(fried, /obj/item/reagent_containers/food/snacks))
+	if(isfood(fried))
 		fried.reagents.trans_to(src, fried.reagents.total_volume)
 		qdel(fried)
 	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 + 2 //Added room for condensed cooking oil
-			reagents.add_reagent(bad_chem, bad_chem_amount)
-			//All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
-			reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
+		fried_garbage = TRUE
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/Destroy()
 	if(trash)
@@ -249,6 +242,13 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 	. = ..()
 
 /obj/item/reagent_containers/food/snacks/deepfryholder/On_Consume(mob/living/eater)
+	if(fried_garbage && 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]
+		eater.reagents.add_reagent(bad_chem, bad_chem_amount)
+		//All fried inedible items also get condensed cooking oil added, which induces minor vomiting and heart damage
+		eater.reagents.add_reagent(/datum/reagent/toxin/condensed_cooking_oil, 2)
 	if(trash)
 		QDEL_NULL(trash)
 	..()
@@ -259,18 +259,22 @@ GLOBAL_LIST_INIT(frying_bad_chems, list(
 			add_atom_colour(rgb(166,103,54), FIXED_COLOUR_PRIORITY)
 			name = "lightly-fried [name]"
 			desc = "[desc] It's been lightly fried in a deep fryer."
+			adjust_food_quality(food_quality - 5)
 		if(16 to 49)
 			add_atom_colour(rgb(103,63,24), FIXED_COLOUR_PRIORITY)
 			name = "fried [name]"
 			desc = "[desc] It's been fried, increasing its tastiness value by [rand(1, 75)]%."
+			adjust_food_quality(food_quality - 10)
 		if(50 to 59)
 			add_atom_colour(rgb(63,23,4), FIXED_COLOUR_PRIORITY)
 			name = "deep-fried [name]"
 			desc = "[desc] Deep-fried to perfection."
+			adjust_food_quality(food_quality) //we shouldn't punish perfection in the fried arts
 		if(60 to INFINITY)
 			add_atom_colour(rgb(33,19,9), FIXED_COLOUR_PRIORITY)
 			name = "the physical manifestation of the very concept of fried foods"
 			desc = "A heavily-fried...something.  Who can tell anymore?"
+			adjust_food_quality(0) //good job, you're truly the best cook.
 	filling_color = color
 	foodtype |= FRIED
 

code/modules/food_and_drinks/food/snacks_burgers.dm

@@ -365,7 +365,7 @@
 
 /obj/item/reagent_containers/food/snacks/burger/chicken
 	name = "chicken sandwich" //Apparently the proud people of Americlapstan object to this thing being called a burger. Apparently McDonald's just calls it a burger in Europe as to not scare and confuse us.
-	desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize homosexuality on the space frontier."
+	desc = "A delicious chicken sandwich, it is said the proceeds from this treat helps criminalize disarming people on the space frontier."
 	icon_state = "chickenburger"
 	tastes = list("bun" = 2, "chicken" = 4, "God's covenant" = 1)
 	bonus_reagents = list(/datum/reagent/consumable/mayonnaise = 3, /datum/reagent/consumable/cooking_oil = 2, /datum/reagent/consumable/nutriment = 2)

code/modules/food_and_drinks/food/snacks_pastry.dm

@@ -440,6 +440,40 @@
 	filling_color = "#CD853F"
 	tastes = list("meat" = 2, "dough" = 2, "laziness" = 1)
 	foodtype = GRAIN
+	var/list/cached_reagents_amount
+	var/previous_typepath
+
+/obj/item/reagent_containers/food/snacks/donkpocket/Initialize(mapload)
+	. = ..()
+	if(!cooked_type) //maploaded cooked donk pockets won't cool down anyway.
+		desc += " This one will stay warm for a long time, great."
+
+/obj/item/reagent_containers/food/snacks/donkpocket/initialize_cooked_food(obj/item/reagent_containers/food/snacks/donkpocket/S, cooking_efficiency = 1)
+	. = ..()
+	if(istype(S))
+		desc = initial(desc) //reset the desc since will now cool down.
+		for(var/R in S.bonus_reagents)
+			LAZYSET(S.cached_reagents_amount, R, S.reagents.get_reagent_amount(R))
+		S.previous_typepath = type
+		addtimer(CALLBACK(S, .proc/cool_down), 7 MINUTES) //canonically they reverted back to normal after 7 minutes.
+
+/obj/item/reagent_containers/food/snacks/donkpocket/proc/cool_down()
+	if(!previous_typepath) //This shouldn't happen.
+		qdel(src)
+		return
+	var/spoiled = FALSE
+	for(var/R in cached_reagents_amount)
+		var/amount = cached_reagents_amount[R]
+		if(reagents.get_reagent_amount(R) < amount)
+			spoiled = TRUE
+		reagents.remove_reagent(R, amount) //no reagent duping please.
+	var/obj/item/reagent_containers/food/snacks/donkpocket/D = new previous_typepath(drop_location())
+	D.create_reagents(D.volume, reagent_flags, reagent_value)
+	reagents.trans_to(D, reagents.total_volume)
+	if(spoiled)
+		D.cooked_type = null
+		D.desc += " This one has gone cold and mushy, pretty unsuitable for cooking."
+	qdel(src)
 
 /obj/item/reagent_containers/food/snacks/donkpocket/warm
 	name = "warm Donk-pocket"

code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

@@ -104,6 +104,12 @@ God bless America.
 		else if(!frying && user.transferItemToLoc(I, src))
 			to_chat(user, "<span class='notice'>You put [I] into [src].</span>")
 			frying = new/obj/item/reagent_containers/food/snacks/deepfryholder(src, I)
+			//setup food quality for item depending on if it's edible or not
+			if(isfood(I))
+				var/obj/item/reagent_containers/food/original_food = I
+				frying.adjust_food_quality(original_food.food_quality) //food quality remains unchanged until degree of frying is calculated
+			else
+				frying.adjust_food_quality(10) //inedible fried item has low quality
 			icon_state = "fryer_on"
 			fry_loop.start()
 

code/modules/food_and_drinks/kitchen_machinery/gibber.dm

@@ -14,6 +14,7 @@
 	var/gibtime = 40 // Time from starting until meat appears
 	var/meat_produced = 0
 	var/ignore_clothing = FALSE
+	var/meat_quality = 35 //food_quality of meat produced
 
 
 /obj/machinery/gibber/Initialize()
@@ -23,8 +24,10 @@
 /obj/machinery/gibber/RefreshParts()
 	gibtime = 40
 	meat_produced = 0
+	meat_quality = 35 // unupgraded this means quality is 50, and max upgraded it is 95
 	for(var/obj/item/stock_parts/matter_bin/B in component_parts)
 		meat_produced += B.rating
+		meat_quality += B.rating * 15
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		gibtime -= 5 * M.rating
 		if(M.rating >= 2)
@@ -181,6 +184,7 @@
 
 	for (var/i=1 to meat_produced)
 		var/obj/item/reagent_containers/food/snacks/meat/slab/newmeat = new typeofmeat
+		newmeat.adjust_food_quality(meat_quality)
 		newmeat.name = "[sourcename] [newmeat.name]"
 		if(istype(newmeat))
 			newmeat.subjectname = sourcename

code/modules/food_and_drinks/kitchen_machinery/microwave.dm

@@ -19,6 +19,8 @@
 	var/broken = 0 // 0, 1 or 2 // How broken is it???
 	var/max_n_of_items = 10
 	var/efficiency = 0
+	var/quality_increase = 5 // how much do we increase the quality of microwaved items
+	var/productivity = 0
 	var/datum/looping_sound/microwave/soundloop
 	var/list/ingredients = list() // may only contain /atom/movables
 
@@ -43,11 +45,16 @@
 	. = ..()
 
 /obj/machinery/microwave/RefreshParts()
-	efficiency = 0
+	efficiency = 0.6
+	productivity = 0
+	max_n_of_items = 5
 	for(var/obj/item/stock_parts/micro_laser/M in component_parts)
-		efficiency += M.rating
+		efficiency += M.rating * 0.4
+		productivity += M.rating
 	for(var/obj/item/stock_parts/matter_bin/M in component_parts)
+
 		max_n_of_items = 10 * M.rating
+		quality_increase = M.rating * 5
 		break
 
 /obj/machinery/microwave/examine(mob/user)
@@ -83,7 +90,7 @@
 	if(!(stat & (NOPOWER|BROKEN)))
 		. += "<span class='notice'>The status display reads:</span>"
 		. += "<span class='notice'>- Capacity: <b>[max_n_of_items]</b> items.<span>"
-		. += "<span class='notice'>- Cook time reduced by <b>[(efficiency - 1) * 25]%</b>.<span>"
+		. += "<span class='notice'>- Cook time reduced by <b>[(productivity - 1) * 25]%</b>.<span>"
 
 /obj/machinery/microwave/update_icon_state()
 	if(broken)
@@ -240,7 +247,7 @@
 		playsound(src, 'sound/machines/buzz-sigh.ogg', 50, 0)
 		return
 
-	if(prob(max((5 / efficiency) - 5, dirty * 5))) //a clean unupgraded microwave has no risk of failure
+	if(prob(dirty * 5 / (5 * efficiency))) //a clean unupgraded microwave has no risk of failure
 		muck()
 		return
 	for(var/obj/O in ingredients)
@@ -285,7 +292,7 @@
 	update_icon()
 	loop(MICROWAVE_MUCK, 4)
 
-/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * efficiency, 2)) // standard wait is 10
+/obj/machinery/microwave/proc/loop(type, time, wait = max(12 - 2 * productivity, 2)) // standard wait is 10
 	if(stat & (NOPOWER|BROKEN))
 		if(type == MICROWAVE_PRE)
 			pre_fail()

code/modules/food_and_drinks/kitchen_machinery/processor.dm

@@ -14,10 +14,13 @@
 	var/processing = FALSE
 	var/rating_speed = 1
 	var/rating_amount = 1
+	var/quality_increase = 5
 
 /obj/machinery/processor/RefreshParts()
+	quality_increase = 0
 	for(var/obj/item/stock_parts/matter_bin/B in component_parts)
 		rating_amount = B.rating
+		quality_increase += B.rating * 5
 	for(var/obj/item/stock_parts/manipulator/M in component_parts)
 		rating_speed = M.rating
 
@@ -28,8 +31,10 @@
 
 /obj/machinery/processor/proc/process_food(datum/food_processor_process/recipe, atom/movable/what)
 	if (recipe.output && loc && !QDELETED(src))
+		var/obj/item/reagent_containers/food/food_input = what
 		for(var/i = 0, i < rating_amount, i++)
-			new recipe.output(drop_location())
+			var/obj/item/reagent_containers/food/food_output = new recipe.output(drop_location())
+			food_output.adjust_food_quality(food_input.food_quality + quality_increase)
 	if (ismob(what))
 		var/mob/themob = what
 		themob.gib(TRUE,TRUE,TRUE)

code/modules/food_and_drinks/recipes/food_mixtures.dm

@@ -8,7 +8,6 @@
 	parts |= reqs
 
 //////////////////////////////////////////FOOD MIXTURES////////////////////////////////////
-
 /datum/chemical_reaction/tofu
 	name = "Tofu"
 	id = "tofu"

code/modules/holodeck/area_copy.dm

@@ -70,7 +70,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars_by_type, typecacheof_assoc_list(list(
 	for (var/turf/T in turfs_src)
 		src_min_x = min(src_min_x,T.x)
 		src_min_y = min(src_min_y,T.y)
-		src_max_x = max(src_max_x,T.y)
+		src_max_x = max(src_max_x,T.x)
 		src_max_y = max(src_max_y,T.y)
 	for (var/turf/T in turfs_src)
 		refined_src[T] = "[T.x - src_min_x].[T.y - src_min_y]"
@@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(duplicate_forbidden_vars_by_type, typecacheof_assoc_list(list(
 	for (var/turf/T in turfs_trg)
 		trg_min_x = min(trg_min_x,T.x)
 		trg_min_y = min(trg_min_y,T.y)
-		trg_max_x = max(trg_max_x,T.y)
+		trg_max_x = max(trg_max_x,T.x)
 		trg_max_y = max(trg_max_y,T.y)
 
 	var/diff_x = round(((src_max_x - src_min_x) - (trg_max_x - trg_min_x))/2)

code/modules/holodeck/computer.dm

@@ -31,12 +31,12 @@
 	var/area/holodeck/last_program
 	var/area/offline_program = /area/holodeck/rec_center/offline
 
-	var/list/program_cache
-	var/list/emag_programs
-
 	// Splitting this up allows two holodecks of the same size
 	// to use the same source patterns.  Y'know, if you want to.
-	var/holodeck_type = /area/holodeck/rec_center	// locate(this) to get the target holodeck
+	var/holodeck_type = /area/holodeck/rec_center
+
+	var/list/program_cache
+	var/list/emag_programs
 
 	var/active = FALSE
 	var/damaged = FALSE
@@ -49,16 +49,18 @@
 	return INITIALIZE_HINT_LATELOAD
 
 /obj/machinery/computer/holodeck/LateInitialize()
-	if(ispath(holodeck_type, /area))
-		linked = pop(get_areas(holodeck_type, FALSE))
-	if(ispath(offline_program, /area))
-		offline_program = pop(get_areas(offline_program), FALSE)
-	// the following is necessary for power reasons
+	linked = SSholodeck.target_holodeck_area[type]
+	offline_program = SSholodeck.offline_programs[type]
 	if(!linked || !offline_program)
 		log_world("No matching holodeck area found")
 		qdel(src)
 		return
-	var/area/AS = get_area(src)
+
+	program_cache = SSholodeck.program_cache[type]
+	emag_programs = SSholodeck.emag_program_cache[type]
+
+	// the following is necessary for power reasons
+	var/area/AS = get_base_area(src)
 	if(istype(AS, /area/holodeck))
 		log_mapping("Holodeck computer cannot be in a holodeck, This would cause circular power dependency.")
 		qdel(src)
@@ -66,7 +68,6 @@
 	else
 		linked.linked = src
 
-	generate_program_list()
 	load_program(offline_program, FALSE, FALSE)
 
 /obj/machinery/computer/holodeck/Destroy()
@@ -181,19 +182,6 @@
 	emergency_shutdown()
 	return ..()
 
-/obj/machinery/computer/holodeck/proc/generate_program_list()
-	for(var/typekey in GLOB.holodeck_areas_prototypes[type])
-		var/area/holodeck/A = GLOB.areas_by_type[typekey]
-		if(!A || !A.contents.len)
-			continue
-		var/list/info_this = list()
-		info_this["name"] = A.name
-		info_this["type"] = A.type
-		if(A.restricted)
-			LAZYADD(emag_programs, list(info_this))
-		else
-			LAZYADD(program_cache, list(info_this))
-
 /obj/machinery/computer/holodeck/proc/toggle_power(toggleOn = FALSE)
 	if(active == toggleOn)
 		return

code/modules/holodeck/holo_effect.dm

@@ -81,9 +81,7 @@
 	ENABLE_BITFIELD(mob.flags_1, HOLOGRAM_1)
 	if(isliving(mob))
 		var/mob/living/L = mob
-		L.feeding = FALSE
-		L.devourable = FALSE
-		L.digestable = FALSE
+		L.vore_flags = 0
 	return mob
 
 /obj/effect/holodeck_effect/mobspawner/deactivate(var/obj/machinery/computer/holodeck/HC)

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

@@ -206,8 +206,6 @@
 		newtonian_move(get_dir(target, src))
 		thrown_thing.safe_throw_at(target, thrown_thing.throw_range, thrown_thing.throw_speed, src, null, null, null, move_force, random_turn)
 
-
-
 /mob/living/carbon/restrained(ignore_grab)
 	. = (handcuffed || (!ignore_grab && pulledby && pulledby.grab_state >= GRAB_AGGRESSIVE))
 

code/modules/mob/living/carbon/human/dummy.dm

@@ -4,7 +4,6 @@
 	status_flags = GODMODE|CANPUSH
 	mouse_drag_pointer = MOUSE_INACTIVE_POINTER
 	var/in_use = FALSE
-	no_vore = TRUE
 
 INITIALIZE_IMMEDIATE(/mob/living/carbon/human/dummy)
 

code/modules/mob/living/carbon/human/species_types/furrypeople.dm

@@ -74,9 +74,7 @@
 
 //misc
 /mob/living/carbon/human/dummy
-	no_vore = TRUE
+	vore_flags = NO_VORE
 
 /mob/living/carbon/human/vore
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING

code/modules/mob/living/carbon/human/update_icons.dm

@@ -283,7 +283,7 @@ There are several things that need to be remembered:
 			alt_icon = S.anthro_mob_worn_overlay || 'icons/mob/clothing/feet_digi.dmi'
 			variation_flag |= STYLE_DIGITIGRADE
 
-		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, variation_flag, FALSE)
+		overlays_standing[SHOES_LAYER] = shoes.build_worn_icon(SHOES_LAYER, alt_icon, FALSE, NO_FEMALE_UNIFORM, S.icon_state, variation_flag, FALSE)
 		var/mutable_appearance/shoes_overlay = overlays_standing[SHOES_LAYER]
 		if(OFFSET_SHOES in dna.species.offset_features)
 			shoes_overlay.pixel_x += dna.species.offset_features[OFFSET_SHOES][1]

code/modules/mob/living/living.dm

@@ -645,7 +645,7 @@
 		attempt_resist_grab(FALSE)
 		// Return as we should only resist one thing at a time. Give clickdelay if the grab wasn't passive.
 		return old_gs? TRUE : FALSE
-
+		
 	// unbuckling yourself. stops the chain if you try it.
 	if(buckled && last_special <= world.time)
 		log_combat(src, buckled, "resisted buckle")
@@ -668,19 +668,22 @@
 			resist_fire() //stop, drop, and roll
 			// Give clickdelay
 			return TRUE
+
 	if(resting) //cit change - allows resisting out of resting
 		resist_a_rest() // ditto
 		// DO NOT GIVE CLCIKDELAY - resist_a_rest() handles spam prevention. Somewhat.
 		return FALSE
-	if(last_special <= world.time)
-		resist_restraints() //trying to remove cuffs.
-		// DO NOT GIVE CLICKDELAY - last_special handles this.
-		return FALSE
+
 	if(CHECK_MOBILITY(src, MOBILITY_USE) && resist_embedded()) //Citadel Change for embedded removal memes - requires being able to use items.
 		// DO NOT GIVE DEFAULT CLICKDELAY - This is a combat action.
 		changeNext_move(CLICK_CD_MELEE)
 		return FALSE
 
+	if(last_special <= world.time)
+		resist_restraints() //trying to remove cuffs.
+		// DO NOT GIVE CLICKDELAY - last_special handles this.
+		return FALSE
+
 /// Proc to resist a grab. moving_resist is TRUE if this began by someone attempting to move. Return FALSE if still grabbed/failed to break out. Use this instead of resist_grab() directly.
 /mob/proc/attempt_resist_grab(moving_resist, forced, log = TRUE)
 	if(!pulledby)	//not being grabbed

code/modules/mob/living/login.dm

@@ -23,5 +23,5 @@
 
 	if(ranged_ability)
 		ranged_ability.add_ranged_ability(src, "<span class='notice'>You currently have <b>[ranged_ability]</b> active!</span>")
-	if(vore_init && !vorepref_init) //Vore's been initialized, voreprefs haven't. If this triggers then that means that voreprefs failed to load due to the client being missing.
+	if((vore_flags & VORE_INIT) && !(vore_flags & VOREPREF_INIT)) //Vore's been initialized, voreprefs haven't. If this triggers then that means that voreprefs failed to load due to the client being missing.
 		copy_from_prefs_vr()

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

@@ -14,7 +14,7 @@
 	rad_flags = RAD_PROTECT_CONTENTS | RAD_NO_CONTAMINATE
 	speech_span = SPAN_ROBOT
 	flags_1 = PREVENT_CONTENTS_EXPLOSION_1 | HEAR_1
-	no_vore = TRUE
+	vore_flags = NO_VORE
 	/// Enable sprint system but not stamina
 	combat_flags = COMBAT_FLAGS_STAMEXEMPT_YESSPRINT
 

code/modules/mob/living/simple_animal/hostile/hostile.dm

@@ -347,10 +347,11 @@
 /mob/living/simple_animal/hostile/proc/AttackingTarget()
 	SEND_SIGNAL(src, COMSIG_HOSTILE_ATTACKINGTARGET, target)
 	in_melee = TRUE
+	/* sorry for the simplemob vore fans
 	if(vore_active)
 		if(isliving(target))
 			var/mob/living/L = target
-			if(!client && L.Adjacent(src) && L.devourable) // aggressive check to ensure vore attacks can be made
+			if(!client && L.Adjacent(src) && CHECK_BITFIELD(L.vore_flags,DEVOURABLE)) // aggressive check to ensure vore attacks can be made
 				if(prob(voracious_chance))
 					vore_attack(src,L,src)
 				else
@@ -361,6 +362,8 @@
 			return target.attack_animal(src)
 	else
 		return target.attack_animal(src)
+	*/
+	return target.attack_animal(src)
 
 /mob/living/simple_animal/hostile/proc/Aggro()
 	vision_range = aggro_vision_range

code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm

@@ -103,7 +103,7 @@ Difficulty: Hard
 	if(.)
 		SSshuttle.shuttle_purchase_requirements_met |= "bubblegum"
 
-/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
 	if(charging)
 		return
 	..()

code/modules/mob/living/simple_animal/hostile/megafauna/dragon_vore.dm

@@ -1,6 +1,5 @@
 /mob/living/simple_animal/hostile/megafauna/dragon
 	vore_active = TRUE
-	no_vore = FALSE
 	isPredator = TRUE
 
 /mob/living/simple_animal/hostile/megafauna/dragon/Initialize()

code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm

@@ -87,7 +87,7 @@
 			if(!client && ranged && ranged_cooldown <= world.time)
 				OpenFire()
 			if(L.Adjacent(src) && (L.stat != CONSCIOUS))
-				if(vore_active && L.devourable == TRUE)
+				if(vore_active && CHECK_BITFIELD(L.vore_flags,DEVOURABLE))
 					vore_attack(src,L,src)
 					LoseTarget()
 		else

code/modules/mob/living/simple_animal/simple_animal_vr.dm

@@ -49,54 +49,53 @@
 
 // Simple animals have only one belly.  This creates it (if it isn't already set up)
 /mob/living/simple_animal/init_vore()
-	vore_init = TRUE
+	ENABLE_BITFIELD(vore_flags, VORE_INIT)
 	if(CHECK_BITFIELD(flags_1, HOLOGRAM_1))
 		return
-	if(!vore_active || no_vore) //If it can't vore, let's not give it a stomach.
+	if(!vore_active || CHECK_BITFIELD(vore_flags, NO_VORE)) //If it can't vore, let's not give it a stomach.
 		return
 	if(vore_active && !IsAdvancedToolUser()) //vore active, but doesn't have thumbs to grab people with.
 		verbs |= /mob/living/simple_animal/proc/animal_nom
 
-	if(LAZYLEN(vore_organs))
-		return
-
-	LAZYINITLIST(vore_organs)
-	var/obj/belly/B = new (src)
-	vore_selected = B
-	B.immutable = TRUE
-	B.name = vore_stomach_name ? vore_stomach_name : "stomach"
-	B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]."
-	B.digest_mode = vore_default_mode
-	B.vore_sound = vore_default_sound
-	B.release_sound = vore_default_release
-	B.is_wet = vore_wetness
-	B.escapable = vore_escape_chance > 0
-	B.escapechance = vore_escape_chance
-	B.digestchance = vore_digest_chance
-	B.absorbchance = vore_absorb_chance
-	B.human_prey_swallow_time = swallowTime
-	B.nonhuman_prey_swallow_time = swallowTime
-	B.vore_verb = "swallow"
-	B.emote_lists[DM_HOLD] = list( // We need more that aren't repetitive. I suck at endo. -Ace
-		"The insides knead at you gently for a moment.",
-		"The guts glorp wetly around you as some air shifts.",
-		"The predator takes a deep breath and sighs, shifting you somewhat.",
-		"The stomach squeezes you tight for a moment, then relaxes harmlessly.",
-		"The predator's calm breathing and thumping heartbeat pulses around you.",
-		"The warm walls kneads harmlessly against you.",
-		"The liquids churn around you, though there doesn't seem to be much effect.",
-		"The sound of bodily movements drown out everything for a moment.",
-		"The predator's movements gently force you into a different position.")
-	B.emote_lists[DM_DIGEST] = list(
-		"The burning acids eat away at your form.",
-		"The muscular stomach flesh grinds harshly against you.",
-		"The caustic air stings your chest when you try to breathe.",
-		"The slimy guts squeeze inward to help the digestive juices soften you up.",
-		"The onslaught against your body doesn't seem to be letting up; you're food now.",
-		"The predator's body ripples and crushes against you as digestive enzymes pull you apart.",
-		"The juices pooling beneath you sizzle against your sore skin.",
-		"The churning walls slowly pulverize you into meaty nutrients.",
-		"The stomach glorps and gurgles as it tries to work you into slop.")
+/mob/living/simple_animal/lazy_init_belly()
+	if(!LAZYLEN(vore_organs))
+		LAZYINITLIST(vore_organs)
+		var/obj/belly/B = new (src)
+		vore_selected = B
+		B.immutable = TRUE
+		B.name = vore_stomach_name ? vore_stomach_name : "stomach"
+		B.desc = vore_stomach_flavor ? vore_stomach_flavor : "Your surroundings are warm, soft, and slimy. Makes sense, considering you're inside \the [name]."
+		B.digest_mode = vore_default_mode
+		B.vore_sound = vore_default_sound
+		B.release_sound = vore_default_release
+		B.is_wet = vore_wetness
+		B.escapable = vore_escape_chance > 0
+		B.escapechance = vore_escape_chance
+		B.digestchance = vore_digest_chance
+		B.absorbchance = vore_absorb_chance
+		B.human_prey_swallow_time = swallowTime
+		B.nonhuman_prey_swallow_time = swallowTime
+		B.vore_verb = "swallow"
+		B.emote_lists[DM_HOLD] = list( // We need more that aren't repetitive. I suck at endo. -Ace
+			"The insides knead at you gently for a moment.",
+			"The guts glorp wetly around you as some air shifts.",
+			"The predator takes a deep breath and sighs, shifting you somewhat.",
+			"The stomach squeezes you tight for a moment, then relaxes harmlessly.",
+			"The predator's calm breathing and thumping heartbeat pulses around you.",
+			"The warm walls kneads harmlessly against you.",
+			"The liquids churn around you, though there doesn't seem to be much effect.",
+			"The sound of bodily movements drown out everything for a moment.",
+			"The predator's movements gently force you into a different position.")
+		B.emote_lists[DM_DIGEST] = list(
+			"The burning acids eat away at your form.",
+			"The muscular stomach flesh grinds harshly against you.",
+			"The caustic air stings your chest when you try to breathe.",
+			"The slimy guts squeeze inward to help the digestive juices soften you up.",
+			"The onslaught against your body doesn't seem to be letting up; you're food now.",
+			"The predator's body ripples and crushes against you as digestive enzymes pull you apart.",
+			"The juices pooling beneath you sizzle against your sore skin.",
+			"The churning walls slowly pulverize you into meaty nutrients.",
+			"The stomach glorps and gurgles as it tries to work you into slop.")
 
 //
 // Simple proc for animals to have their digestion toggled on/off externally
@@ -134,6 +133,6 @@
 
 	if (stat != CONSCIOUS)
 		return
-	if(!T.devourable)
+	if(!CHECK_BITFIELD(T.vore_flags,DEVOURABLE))
 		return
 	return vore_attack(src,T,src)

code/modules/mob/living/simple_animal/simplemob_vore_values.dm

@@ -1,13 +1,9 @@
 //CARBON MOBS
 /mob/living/carbon/alien
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 
 /mob/living/carbon/monkey
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 
 
 /*
@@ -17,121 +13,68 @@
 
 //NUETRAL MOBS
 /mob/living/simple_animal/crab
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 
 /mob/living/simple_animal/cow
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
-	vore_default_mode = DM_HOLD
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 
 /mob/living/simple_animal/chick
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 /mob/living/simple_animal/chicken
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 /mob/living/simple_animal/mouse
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 /mob/living/simple_animal/kiwi
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 //STATION PETS
 /mob/living/simple_animal/pet
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
-
-/mob/living/simple_animal/pet/fox
-	vore_active = TRUE
-	isPredator = TRUE
-	vore_default_mode = DM_HOLD
-
-/mob/living/simple_animal/pet/cat
-	vore_active = TRUE
-	isPredator = TRUE
-	vore_default_mode = DM_HOLD
-
-/mob/living/simple_animal/pet/dog
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 	vore_default_mode = DM_HOLD
 
 /mob/living/simple_animal/sloth
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 /mob/living/simple_animal/parrot
-	devourable = TRUE
-	digestable = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE
 
 //HOSTILE MOBS
 /mob/living/simple_animal/hostile/retaliate/goat
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
-	vore_stomach_flavor = "You find yourself squeezed into the hollow of the goat, the smell of oats and hay thick in the tight space, all of which grinds in on you. Harmless for now..."
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 	vore_default_mode = DM_HOLD
 
+
 /mob/living/simple_animal/hostile/lizard
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/alien
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/bear
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/poison/giant_spider
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/retaliate/poison/snake
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/gorilla
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/asteroid/goliath
-	feeding = TRUE //for pet Goliaths I guess or something.
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = FEEDING
 	vore_default_mode = DM_DIGEST
 
 /mob/living/simple_animal/hostile/carp
-	devourable = TRUE
-	digestable = TRUE
-	feeding = TRUE
-	vore_active = TRUE
-	isPredator = TRUE
+	vore_flags = DEVOURABLE | DIGESTABLE | FEEDING
 	vore_default_mode = DM_DIGEST

code/modules/mob/mob.dm

@@ -146,7 +146,7 @@
 		//CITADEL EDIT, required for vore code to remove (T != loc && T != src)) as a check
 		if(M.see_invisible<invisibility) //if src is invisible to us,
 			msg = blind_message
-		else if(T.lighting_object && T.lighting_object.invisibility <= M.see_invisible && T.is_softly_lit()) //the light object is dark and not invisible to us
+		else if(T.lighting_object && T.lighting_object.invisibility <= M.see_invisible && T.is_softly_lit() && !in_range(T,M)) //the light object is dark and not invisible to us, darkness does not matter if you're directly next to the target
 			msg = blind_message
 
 		if(!msg)

code/modules/power/cable.dm

@@ -557,13 +557,12 @@ By design, d1 is the smallest direction and d2 is the highest
 		new_cable.update_icon()
 
 /obj/item/stack/cable_coil/attack_self(mob/user)
-	if(!use(15))
-		to_chat(user, "<span class='notice'>You dont have enough cable coil to make restraints out of them</span>")
+	if(amount < 15)
+		to_chat(user, "<span class='notice'>You don't have enough cable coil to make restraints out of them</span>")
 		return
 	to_chat(user, "<span class='notice'>You start making some cable restraints.</span>")
-	if(!do_after(user, 30, TRUE, user, TRUE))
-		to_chat(user, "<span class='notice'>You fail to make cable restraints, you need to stand still while doing so.</span>")
-		give(15)
+	if(!do_after(user, 30, TRUE, user, TRUE) || !use(15))
+		to_chat(user, "<span class='notice'>You fail to make cable restraints, you need to be standing still to do it</span>")
 		return
 	var/obj/item/restraints/handcuffs/cable/result = new(get_turf(user))
 	user.put_in_hands(result)

code/modules/reagents/chemistry/machinery/chem_dispenser.dm

@@ -508,7 +508,6 @@
 	upgrade_reagents3 = list(
 		/datum/reagent/drug/mushroomhallucinogen,
 		/datum/reagent/consumable/nothing,
-		/datum/reagent/medicine/cryoxadone,
 		/datum/reagent/consumable/peachjuice
 	)
 	emagged_reagents = list(
@@ -516,7 +515,8 @@
 		/datum/reagent/consumable/ethanol/changelingsting,
 		/datum/reagent/consumable/ethanol/whiskey_cola,
 		/datum/reagent/toxin/mindbreaker,
-		/datum/reagent/toxin/staminatoxin
+		/datum/reagent/toxin/staminatoxin,
+		/datum/reagent/medicine/cryoxadone
 	)
 
 /obj/machinery/chem_dispenser/drinks/fullupgrade //fully ugpraded stock parts, emagged
@@ -722,4 +722,4 @@
 	component_parts += new /obj/item/stock_parts/manipulator/femto(null)
 	component_parts += new /obj/item/stack/sheet/glass(null)
 	component_parts += new /obj/item/stock_parts/cell/bluespace(null)
-	RefreshParts()
+	RefreshParts()

code/modules/reagents/chemistry/reagents/drug_reagents.dm

@@ -353,7 +353,7 @@
 
 /datum/reagent/drug/aranesp
 	name = "Aranesp"
-	description = "Amps you up and gets you going, fixes all stamina damage you might have but can cause toxin and oxygen damage."
+	description = "Amps you up and gets you going, fixing stamina damage but possibly causing toxin and oxygen damage."
 	reagent_state = LIQUID
 	color = "#78FFF0"
 	pH = 9.2
@@ -362,7 +362,7 @@
 	var/high_message = pick("You feel amped up.", "You feel ready.", "You feel like you can push it to the limit.")
 	if(prob(5))
 		to_chat(M, "<span class='notice'>[high_message]</span>")
-	M.adjustStaminaLoss(-18, 0)
+	M.adjustStaminaLoss(-10, 0)
 	M.adjustToxLoss(0.5, 0)
 	if(prob(50))
 		M.losebreath++

code/modules/reagents/chemistry/reagents/food_reagents.dm

@@ -35,8 +35,6 @@
 					SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/quality_fantastic)
 				if (RACE_DRINK)
 					SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_drink", /datum/mood_event/race_drink)
-				if (FOOD_AMAZING)
-					SEND_SIGNAL(M, COMSIG_ADD_MOOD_EVENT, "quality_food", /datum/mood_event/amazingtaste)
 	return ..()
 
 /datum/reagent/consumable/nutriment
@@ -819,11 +817,20 @@
 	nutriment_factor = 2 * REAGENTS_METABOLISM
 	color = "#792300"
 	taste_description = "indescribable"
-	quality = FOOD_AMAZING
 	taste_mult = 100
 	can_synth = FALSE
 	pH = 6.1
 
+/datum/reagent/consumable/secretsauce/reaction_obj(obj/O, reac_volume)
+	//splashing any amount above or equal to 1u of secret sauce onto a piece of food turns its quality to 100
+	if(reac_volume >= 1 && isfood(O))
+		var/obj/item/reagent_containers/food/splashed_food = O
+		splashed_food.adjust_food_quality(100)
+		// if it's a customisable food, we need to edit its total quality too, to prevent its quality resetting from adding more ingredients!
+		if(istype(O, /obj/item/reagent_containers/food/snacks/customizable))
+			var/obj/item/reagent_containers/food/snacks/customizable/splashed_custom_food = O
+			splashed_custom_food.total_quality += 10000
+
 /datum/reagent/consumable/char
 	name = "Char"
 	description = "Essence of the grill. Has strange properties when overdosed."

code/modules/reagents/chemistry/reagents/toxin_reagents.dm

@@ -506,7 +506,7 @@
 	taste_description = "awful cooking"
 
 /datum/reagent/toxin/condensed_cooking_oil/on_mob_life(mob/living/carbon/M)
-	if(prob(15))
+	if(prob(5))
 		M.vomit()
 	else
 		if(prob(40))

code/modules/recycling/conveyor2.dm

@@ -330,7 +330,7 @@ GLOBAL_LIST_EMPTY(conveyors_by_id)
 	desc = "A conveyor control switch assembly."
 	icon = 'icons/obj/recycling.dmi'
 	icon_state = "switch-off"
-	w_class = WEIGHT_CLASS_BULKY
+	w_class = WEIGHT_CLASS_NORMAL
 	var/id = "" //inherited by the switch
 
 /obj/item/conveyor_switch_construct/Initialize()

code/modules/research/designs/misc_designs.dm

@@ -293,20 +293,20 @@
 	name = "Broom"
 	desc = "Just your everyday standard broom."
 	id = "broom"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 1000, /datum/material/glass = 600)
 	build_path = /obj/item/twohanded/broom
-	category = list("Equipment")
+	category = list("initial", "Equipment", "Misc")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
 /datum/design/mop
 	name = "Mop"
 	desc = "Just your everyday standard mop."
 	id = "mop"
-	build_type = PROTOLATHE
+	build_type = PROTOLATHE | AUTOLATHE
 	materials = list(/datum/material/iron = 1200, /datum/material/glass = 100)
 	build_path = /obj/item/mop
-	category = list("Equipment")
+	category = list("initial", "Equipment", "Misc")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
 /datum/design/advmop
@@ -329,6 +329,16 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
+/datum/design/normtrash
+	name = "Trashbag"
+	desc = "It's a bag for trash, you put garbage in it."
+	id = "normtrash"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/plastic = 2000)
+	build_path = /obj/item/storage/bag/trash
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
 /datum/design/blutrash
 	name = "Trashbag of Holding"
 	desc = "An advanced trash bag with bluespace properties; capable of holding a plethora of garbage."
@@ -349,6 +359,17 @@
 	category = list("Equipment")
 	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
 
+/datum/design/paint_remover
+	name = "Paint Remover"
+	desc = "Removes stains from the floor, and not much else."
+	id = "paint_remover"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 1000)
+	reagents_list = list(/datum/reagent/acetone = 60)
+	build_path = /obj/item/paint/paint_remover
+	category = list("Equipment")
+	departmental_flags = DEPARTMENTAL_FLAG_SERVICE
+
 /datum/design/spraybottle
 	name = "Spray Bottle"
 	desc = "A spray bottle, with an unscrewable top."

code/modules/research/designs/weapon_designs.dm

@@ -435,9 +435,9 @@
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY | DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SCIENCE
 
-//////////
-//MISC////
-//////////
+///////////
+//Shields//
+///////////
 
 /datum/design/tele_shield
 	name = "Telescopic Riot Shield"
@@ -449,6 +449,30 @@
 	category = list("Weapons")
 	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
 
+/datum/design/laser_shield
+	name = "Laser Resistant Riot Shield"
+	desc = "An advanced riot shield made of darker glasses to prevent laser fire from passing through."
+	id = "laser_shield"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/plastic = 4000, /datum/material/silver = 800, /datum/material/titanium = 600, /datum/material/plasma = 5000)
+	build_path = /obj/item/shield/riot/laser_proof
+	category = list("Weapons")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+/datum/design/bullet_shield
+	name = "Bullet Resistant Riot Shield"
+	desc = "An advanced riot shield made bullet resistant plastics and heavy metals to protect against projectile harm."
+	id = "bullet_shield"
+	build_type = PROTOLATHE
+	materials = list(/datum/material/iron = 4000, /datum/material/glass = 1000, /datum/material/silver = 2000, /datum/material/titanium = 1200, /datum/material/plastic = 2500)
+	build_path = /obj/item/shield/riot/bullet_proof
+	category = list("Weapons")
+	departmental_flags = DEPARTMENTAL_FLAG_SECURITY
+
+//////////
+//MISC////
+//////////
+
 /datum/design/suppressor
 	name = "Suppressor"
 	desc = "A reverse-engineered suppressor that fits on most small arms with threaded barrels."

code/modules/research/techweb/all_nodes.dm

@@ -535,7 +535,7 @@
 	display_name = "Combat Cybernetic Implants"
 	description = "Military grade combat implants to improve performance."
 	prereq_ids = list("adv_cyber_implants","weaponry","NVGtech","high_efficiency")
-	design_ids = list("ci-xray", "ci-thermals", "ci-antidrop", "ci-antistun", "ci-thrusters")
+	design_ids = list("ci-xray", "ci-thermals", "ci-antidrop", "ci-antistun", "ci-thrusters", "ci-shield")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 2500)
 
 ////////////////////////Tools////////////////////////
@@ -544,7 +544,7 @@
 	display_name = "Basic Tools"
 	description = "Basic mechanical, electronic, surgical and botanical tools."
 	prereq_ids = list("base")
-	design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom")
+	design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop", "broom", "normtrash")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
 
 /datum/techweb_node/basic_mining
@@ -568,7 +568,7 @@
 	display_name = "Advanced Sanitation Technology"
 	description = "Clean things better, faster, stronger, and harder!"
 	prereq_ids = list("adv_engi")
-	design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor")
+	design_ids = list("advmop", "buffer", "light_replacer", "spraybottle", "beartrap", "ci-janitor", "paint_remover")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 1750) // No longer has its bag
 
 /datum/techweb_node/botany
@@ -609,7 +609,7 @@
 	display_name = "Advanced Weapon Development Technology"
 	description = "Our weapons are breaking the rules of reality by now."
 	prereq_ids = list("adv_engi", "weaponry")
-	design_ids = list("pin_loyalty")
+	design_ids = list("pin_loyalty", "laser_shield", "bullet_shield")
 	research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 7500)
 
 /datum/techweb_node/electric_weapons

code/modules/surgery/helpers.dm

@@ -89,18 +89,23 @@
 			"<span class='notice'>You remove [I] from [M]'s [parse_zone(selected_zone)].</span>")
 		qdel(S)
 	else if(S.can_cancel)
-		var/close_tool_type = /obj/item/cautery
+		var/required_tool_type = TOOL_CAUTERY
 		var/obj/item/close_tool = user.get_inactive_held_item()
 		var/is_robotic = S.requires_bodypart_type == BODYPART_ROBOTIC
 		if(is_robotic)
-			close_tool_type = /obj/item/screwdriver
-		if(istype(close_tool, close_tool_type) || iscyborg(user))
-			M.surgeries -= S
-			user.visible_message("[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and removes [I].", \
-				"<span class='notice'>You close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].</span>")
-			qdel(S)
-		else
+			required_tool_type = TOOL_SCREWDRIVER
+		if(iscyborg(user))
+			close_tool = locate(/obj/item/cautery) in user.held_items
+			if(!close_tool)
+				to_chat(user, "<span class='warning'>You need to equip a cautery in an inactive slot to stop [M]'s surgery!</span>")
+				return
+		else if(!close_tool || close_tool.tool_behaviour != required_tool_type)
 			to_chat(user, "<span class='warning'>You need to hold a [is_robotic ? "screwdriver" : "cautery"] in your inactive hand to stop [M]'s surgery!</span>")
+			return
+		M.surgeries -= S
+		user.visible_message("<span class='notice'>[user] closes [M]'s [parse_zone(selected_zone)] with [close_tool] and removes [I].</span>", \
+			"<span class='notice'>You close [M]'s [parse_zone(selected_zone)] with [close_tool] and remove [I].</span>")
+		qdel(S)
 
 /proc/get_location_modifier(mob/M)
 	var/turf/T = get_turf(M)

code/modules/surgery/organs/liver.dm

@@ -52,7 +52,7 @@
 
 /obj/item/organ/liver/applyOrganDamage(d, maximum = maxHealth)
 	. = ..()
-	if(!.)
+	if(!. || QDELETED(owner))
 		return
 	if(damage >= high_threshold)
 		var/move_calc = 1+((round(damage) - high_threshold)/(high_threshold/3))

code/modules/uplink/uplink_items/uplink_badass.dm

@@ -24,13 +24,6 @@
 			Radio headset does not include encryption key. No gun included."
 	item = /obj/item/storage/box/syndie_kit/centcom_costume
 
-/datum/uplink_item/badass/claymore
-	name = "Claymore"
-	cost = 8
-	player_minimum = 25
-	desc = "A claymore. We don't know why you'd do this."
-	item = /obj/item/claymore
-
 /datum/uplink_item/badass/costumes/clown
 	name = "Clown Costume"
 	desc = "Nothing is more terrifying than clowns with fully automatic weaponry."
@@ -85,11 +78,3 @@
 	limited_stock = 1
 	cant_discount = TRUE
 	include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-
-/datum/uplink_item/badass/shades
-	name = "Big Sunglasses"
-	desc = "Prevents flashes and looks badbass with some Smokes."
-	item = /obj/item/clothing/glasses/sunglasses/big
-	cost = 1
-	surplus = 5
-	illegal_tech = FALSE

code/modules/uplink/uplink_items/uplink_bundles.dm

@@ -151,6 +151,23 @@
 			U.purchase_log.LogPurchase(goods, I, 0)
 	return C
 
+/datum/uplink_item/bundles_TC/reroll
+	name = "Renegotiate Contract"
+	desc = "Selecting this will inform the syndicate that you wish to change employers. Can only be done once; no take-backs."
+	item = /obj/effect/gibspawner/generic
+	cost = 0
+	cant_discount = TRUE
+	restricted = TRUE
+	limited_stock = 1
+
+/datum/uplink_item/bundles_TC/reroll/purchase(mob/user, datum/component/uplink/U)
+	var/datum/antagonist/traitor/T = user?.mind?.has_antag_datum(/datum/antagonist/traitor)
+	if(istype(T))
+		var/new_traitor_kind = get_random_traitor_kind(list(T.traitor_kind.type))
+		T.set_traitor_kind(new_traitor_kind)
+	else
+		to_chat(user,"Invalid user for contract renegotiation.")
+
 /datum/uplink_item/bundles_TC/random
 	name = "Random Item"
 	desc = "Picking this will purchase a random item. Useful if you have some TC to spare or if you haven't decided on a strategy yet."

code/modules/uplink/uplink_items/uplink_dangerous.dm

@@ -117,17 +117,6 @@
 /datum/uplink_item/dangerous/doublesword/get_discount()
 	return pick(4;0.8,2;0.65,1;0.5)
 
-/datum/uplink_item/dangerous/cxneb
-	name = "Dragon's Tooth Non-Eutactic Blade"
-	desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
-			the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
-	 		generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
-	 		This particular model has a polychromic hardlight generator, allowing you to murder in style! \
-	 		The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
-	item = /obj/item/melee/transforming/energy/sword/cx/traitor
-	cost = 8
-	exclude_modes = list(/datum/game_mode/nuclear/clown_ops)
-
 /datum/uplink_item/dangerous/sword
 	name = "Energy Sword"
 	desc = "The energy sword is an edged weapon with a blade of pure energy. The sword is small enough to be \

code/modules/uplink/uplink_items/uplink_roles.dm

@@ -64,14 +64,6 @@
 	restricted_roles = list("Clown")
 */
 
-/datum/uplink_item/role_restricted/clumsyDNA
-	name = "Clumsy Clown DNA"
-	desc = "A DNA injector that has been loaded with the clown gene that makes people clumsy.. \
-	Making someone clumsy will allow them to use clown firing pins as well as Reverse Revolvers. For a laugh try using this on the HOS to see how many times they shoot themselves in the foot!"
-	cost = 1
-	item = /obj/item/dnainjector/clumsymut
-	restricted_roles = list("Clown")
-
 /datum/uplink_item/role_restricted/haunted_magic_eightball
 	name = "Haunted Magic Eightball"
 	desc = "Most magic eightballs are toys with dice inside. Although identical in appearance to the harmless toys, this occult device reaches into the spirit world to find its answers. \
@@ -116,19 +108,11 @@
 	cost = 4
 	restricted_roles = list("Cook", "Botanist", "Clown", "Mime")
 
-/datum/uplink_item/role_restricted/strange_seeds
-	name = "Pack of strange seeds"
-	desc = "Mysterious seeds as strange as their name implies. Spooky."
-	item = /obj/item/seeds/random
-	cost = 2
-	restricted_roles = list("Botanist")
-	illegal_tech = FALSE
-
 /datum/uplink_item/role_restricted/strange_seeds_10pack
-	name = "Pack of strange seeds x10"
+	name = "Pack of strange seeds"
 	desc = "Mysterious seeds as strange as their name implies. Spooky. These come in bulk"
 	item = /obj/item/storage/box/strange_seeds_10pack
-	cost = 20
+	cost = 10
 	restricted_roles = list("Botanist")
 
 /datum/uplink_item/role_restricted/ez_clean_bundle

code/modules/vore/eating/belly_obj.dm

@@ -221,9 +221,9 @@
 		if(isliving(AM))
 			var/mob/living/L = AM
 			var/mob/living/OW = owner
-			if(L.absorbed && !include_absorbed)
+			if(L.vore_flags & ABSORBED && !include_absorbed)
 				continue
-			L.absorbed = FALSE
+			L.vore_flags &= ~ABSORBED
 			L.stop_sound_channel(CHANNEL_PREYLOOP)
 			SEND_SIGNAL(OW, COMSIG_CLEAR_MOOD_EVENT, "fedpred", /datum/mood_event/fedpred)
 			SEND_SIGNAL(L, COMSIG_CLEAR_MOOD_EVENT, "fedprey", /datum/mood_event/fedprey)
@@ -277,14 +277,14 @@
 		SEND_SIGNAL(OW, COMSIG_ADD_MOOD_EVENT, "emptypred", /datum/mood_event/emptypred)
 		SEND_SIGNAL(ML, COMSIG_ADD_MOOD_EVENT, "emptyprey", /datum/mood_event/emptyprey)
 
-		if(ML.absorbed)
-			ML.absorbed = FALSE
+		if(CHECK_BITFIELD(ML.vore_flags,ABSORBED))
+			DISABLE_BITFIELD(ML.vore_flags,ABSORBED)
 			if(ishuman(M) && ishuman(OW))
 				var/mob/living/carbon/human/Prey = M
 				var/mob/living/carbon/human/Pred = OW
 				var/absorbed_count = 2 //Prey that we were, plus the pred gets a portion
 				for(var/mob/living/P in contents)
-					if(P.absorbed)
+					if(CHECK_BITFIELD(P.vore_flags,ABSORBED))
 						absorbed_count++
 				Pred.reagents.trans_to(Prey, Pred.reagents.total_volume / absorbed_count)
 
@@ -389,7 +389,7 @@
 		formatted_message = replacetext(formatted_message,"%pred",owner)
 		formatted_message = replacetext(formatted_message,"%prey",english_list(contents))
 		for(var/mob/living/P in contents)
-			if(!P.absorbed) //This is required first, in case there's a person absorbed and not absorbed in a stomach.
+			if(!CHECK_BITFIELD(P.vore_flags, ABSORBED)) //This is required first, in case there's a person absorbed and not absorbed in a stomach.
 				total_bulge += P.mob_size
 		if(total_bulge >= bulge_size && bulge_size != 0)
 			return("<span class='warning'>[formatted_message]</span><BR>")
@@ -484,7 +484,7 @@
 
 // Handle a mob being absorbed
 /obj/belly/proc/absorb_living(var/mob/living/M)
-	M.absorbed = TRUE
+	ENABLE_BITFIELD(M.vore_flags, ABSORBED)
 	to_chat(M,"<span class='notice'>[owner]'s [lowertext(name)] absorbs your body, making you part of them.</span>")
 	to_chat(owner,"<span class='notice'>Your [lowertext(name)] absorbs [M]'s body, making them part of you.</span>")
 
@@ -498,7 +498,7 @@
 	for(var/belly in M.vore_organs)
 		var/obj/belly/B = belly
 		for(var/mob/living/Mm in B)
-			if(Mm.absorbed)
+			if(CHECK_BITFIELD(Mm.vore_flags, ABSORBED))
 				absorb_living(Mm)
 
 	//Update owner

code/modules/vore/eating/bellymodes.dm

@@ -1,6 +1,6 @@
 // Process the predator's effects upon the contents of its belly (i.e digestion/transformation etc)
 /obj/belly/proc/process_belly(var/times_fired,var/wait) //Passed by controller
-	if((times_fired < next_process) || !contents.len)
+	if((times_fired < next_process) || !length(contents))
 		recent_sound = FALSE
 		return SSBELLIES_IGNORED
 
@@ -27,7 +27,7 @@
 		var/list/EL = emote_lists[digest_mode]
 		if(LAZYLEN(EL))
 			for(var/mob/living/M in contents)
-				if(M.digestable || !(digest_mode == DM_DIGEST)) // don't give digesty messages to indigestible people
+				if((M.vore_flags & DIGESTABLE) || !(digest_mode == DM_DIGEST)) // don't give digesty messages to indigestible people
 					to_chat(M,"<span class='notice'>[pick(EL)]</span>")
 
 ///////////////////// Prey Loop Refresh/hack //////////////////////
@@ -51,7 +51,7 @@
 
 //////////////////////// Absorbed Handling ////////////////////////
 	for(var/mob/living/M in contents)
-		if(M.absorbed)
+		if(M.vore_flags & ABSORBED)
 			M.Stun(5)
 
 ////////////////////////// Sound vars /////////////////////////////
@@ -76,7 +76,7 @@
 					play_sound = pick(pred_digest)
 
 				//Pref protection!
-				if (!M.digestable || M.absorbed)
+				if (!M.vore_flags & DIGESTABLE || M.vore_flags & ABSORBED)
 					continue
 
 				//Person just died in guts!
@@ -150,7 +150,7 @@
 						SEND_SOUND(M,prey_digest)
 					play_sound = pick(pred_digest)
 
-				if(M.absorbed)
+				if(M.vore_flags & ABSORBED)
 					continue
 
 				if(M.nutrition >= 100) //Drain them until there's no nutrients left. Slowly "absorb" them.
@@ -164,8 +164,8 @@
 		if(DM_UNABSORB)
 
 			for (var/mob/living/M in contents)
-				if(M.absorbed && owner.nutrition >= 100)
-					M.absorbed = FALSE
+				if(M.vore_flags & ABSORBED && owner.nutrition >= 100)
+					DISABLE_BITFIELD(M.vore_flags, ABSORBED)
 					to_chat(M,"<span class='notice'>You suddenly feel solid again </span>")
 					to_chat(owner,"<span class='notice'>You feel like a part of you is missing.</span>")
 					owner.nutrition -= 100

code/modules/vore/eating/living.dm

@@ -1,18 +1,11 @@
 ///////////////////// Mob Living /////////////////////
 /mob/living
-	var/digestable = FALSE					// Can the mob be digested inside a belly?
+	var/vore_flags = 0
 	var/showvoreprefs = TRUE				// Determines if the mechanical vore preferences button will be displayed on the mob or not.
 	var/obj/belly/vore_selected				// Default to no vore capability.
 	var/list/vore_organs = list()			// List of vore containers inside a mob
-	var/devourable = FALSE					// Can the mob be vored at all?
-	var/feeding = FALSE						// Are we going to feed someone else?
 	var/vore_taste = null					// What the character tastes like
-	var/no_vore = FALSE 					// If the character/mob can vore.
-	var/openpanel = FALSE					// Is the vore panel open?
-	var/absorbed = FALSE					//are we absorbed?
 	var/next_preyloop
-	var/vore_init = FALSE					//Has this mob's vore been initialized yet?
-	var/vorepref_init = FALSE				//Has this mob's voreprefs been initialized?
 
 //
 // Hook for generic creation of stuff on new creatures
@@ -22,7 +15,7 @@
 	M.verbs += /mob/living/proc/lick
 	M.verbs += /mob/living/proc/escapeOOC
 
-	if(M.no_vore) //If the mob isn't supposed to have a stomach, let's not give it an insidepanel so it can make one for itself, or a stomach.
+	if(M.vore_flags & NO_VORE) //If the mob isn't supposed to have a stomach, let's not give it an insidepanel so it can make one for itself, or a stomach.
 		return TRUE
 	M.verbs += /mob/living/proc/insidePanel
 
@@ -35,7 +28,7 @@
 	return TRUE
 
 /mob/living/proc/init_vore()
-	vore_init = TRUE
+	ENABLE_BITFIELD(vore_flags, VORE_INIT)
 	//Something else made organs, meanwhile.
 	if(LAZYLEN(vore_organs))
 		return TRUE
@@ -49,8 +42,8 @@
 			vore_selected = vore_organs[1]
 			return TRUE
 
-	//Or, we can create a basic one for them
-	if(!LAZYLEN(vore_organs))
+/mob/living/proc/lazy_init_belly()
+	if(!length(vore_organs))
 		LAZYINITLIST(vore_organs)
 		var/obj/belly/B = new /obj/belly(src)
 		vore_selected = B
@@ -68,6 +61,7 @@
 			// Critical adjustments due to TG grab changes - Poojawa
 
 /mob/living/proc/vore_attack(var/mob/living/user, var/mob/living/prey, var/mob/living/pred)
+	lazy_init_belly()
 	if(!user || !prey || !pred)
 		return
 
@@ -75,7 +69,7 @@
 		return
 
 	if(pred == prey) //you click your target
-		if(!pred.feeding)
+		if(!CHECK_BITFIELD(pred.vore_flags,FEEDING))
 			to_chat(user, "<span class='notice'>They aren't able to be fed.</span>")
 			to_chat(pred, "<span class='notice'>[user] tried to feed you themselves, but you aren't voracious enough to be fed.</span>")
 			return
@@ -91,11 +85,11 @@
 		feed_grabbed_to_self(user, prey)
 
 	else // click someone other than you/prey
-		if(!pred.feeding)
+		if(!CHECK_BITFIELD(pred.vore_flags,FEEDING))
 			to_chat(user, "<span class='notice'>They aren't voracious enough to be fed.</span>")
 			to_chat(pred, "<span class='notice'>[user] tried to feed you [prey], but you aren't voracious enough to be fed.</span>")
 			return
-		if(!prey.feeding)
+		if(!CHECK_BITFIELD(prey.vore_flags,FEEDING))
 			to_chat(user, "<span class='notice'>They aren't able to be fed to someone.</span>")
 			to_chat(prey, "<span class='notice'>[user] tried to feed you to [pred], but you aren't able to be fed to them.</span>")
 			return
@@ -107,14 +101,17 @@
 // Eating procs depending on who clicked what
 //
 /mob/living/proc/feed_grabbed_to_self(var/mob/living/user, var/mob/living/prey)
+	user.lazy_init_belly()
 	var/belly = user.vore_selected
 	return perform_the_nom(user, prey, user, belly)
 
 /mob/living/proc/feed_self_to_grabbed(var/mob/living/user, var/mob/living/pred)
+	pred.lazy_init_belly()
 	var/belly = input("Choose Belly") in pred.vore_organs
 	return perform_the_nom(user, user, pred, belly)
 
 /mob/living/proc/feed_grabbed_to_other(var/mob/living/user, var/mob/living/prey, var/mob/living/pred)
+	pred.lazy_init_belly()
 	var/belly = input("Choose Belly") in pred.vore_organs
 	return perform_the_nom(user, prey, pred, belly)
 
@@ -128,7 +125,7 @@
 		testing("[user] attempted to feed [prey] to [pred], via [lowertext(belly.name)] but it went wrong.")
 		return
 
-	if (!prey.devourable)
+	if (!prey.vore_flags & DEVOURABLE)
 		to_chat(user, "This can't be eaten!")
 		return FALSE
 
@@ -267,9 +264,7 @@
 		to_chat(src,"<span class='warning'>You attempted to save your vore prefs but somehow you're in this character without a client.prefs variable. Tell a dev.</span>")
 		return FALSE
 
-	client.prefs.digestable = digestable
-	client.prefs.devourable = devourable
-	client.prefs.feeding = feeding
+	client.prefs.vore_flags = vore_flags // there's garbage data in here, but it doesn't matter
 	client.prefs.vore_taste = vore_taste
 
 	var/list/serialized = list()
@@ -288,12 +283,17 @@
 	if(!client || !client.prefs)
 		to_chat(src,"<span class='warning'>You attempted to apply your vore prefs but somehow you're in this character without a client.prefs variable. Tell a dev.</span>")
 		return FALSE
-	vorepref_init = TRUE
+	ENABLE_BITFIELD(vore_flags,VOREPREF_INIT)
 
+	// garbage data coming back the other way or breaking absorbed would be bad, so instead we do this
+	vore_flags |= CHECK_BITFIELD(client.prefs.vore_flags,DIGESTABLE) // set to 1 if prefs is 1
+	vore_flags |= CHECK_BITFIELD(client.prefs.vore_flags,DEVOURABLE)
+	vore_flags |= CHECK_BITFIELD(client.prefs.vore_flags,FEEDING)
+
+	vore_flags &= CHECK_BITFIELD(client.prefs.vore_flags,DIGESTABLE) // set to 0 if prefs is 0
+	vore_flags &= CHECK_BITFIELD(client.prefs.vore_flags,DEVOURABLE)
+	vore_flags &= CHECK_BITFIELD(client.prefs.vore_flags,FEEDING)
 
-	digestable = client.prefs.digestable
-	devourable = client.prefs.devourable
-	feeding = client.prefs.feeding
 	vore_taste = client.prefs.vore_taste
 
 	release_vore_contents(silent = TRUE)
@@ -361,7 +361,7 @@
 
 	var/list/choices
 	for(var/mob/living/L in view(1))
-		if(L != src && (!L.ckey || L.client?.prefs.lickable) && Adjacent(L))
+		if(L != src && (!L.ckey || L.client?.prefs.vore_flags & LICKABLE) && Adjacent(L))
 			LAZYADD(choices, L)
 
 	if(!choices)
@@ -369,7 +369,7 @@
 
 	var/mob/living/tasted = input(src, "Who would you like to lick? (Excluding yourself and those with the preference disabled)", "Licking") as null|anything in choices
 
-	if(QDELETED(tasted) || (tasted.ckey && !(tasted.client?.prefs.lickable)) || !Adjacent(tasted) || incapacitated(ignore_restraints = TRUE))
+	if(QDELETED(tasted) || (tasted.ckey && !(tasted.client?.prefs.vore_flags & LICKABLE)) || !Adjacent(tasted) || incapacitated(ignore_restraints = TRUE))
 		return
 
 	setClickCooldown(100)

code/modules/vore/eating/vorepanel.dm

@@ -20,10 +20,10 @@
 	picker_holder.popup = new(src, "insidePanel","Vore Panel", 450, 700, picker_holder)
 	picker_holder.popup.set_content(dat)
 	picker_holder.popup.open()
-	src.openpanel = TRUE
+	vore_flags |= OPEN_PANEL
 
 /mob/living/proc/updateVRPanel() //Panel popup update call from belly events.
-	if(src.openpanel == TRUE)
+	if(vore_flags & OPEN_PANEL)
 		var/datum/vore_look/picker_holder = new()
 		picker_holder.loop = picker_holder
 		picker_holder.selected = vore_selected
@@ -65,7 +65,7 @@
 
 		//Don't display this part if we couldn't find the belly since could be held in hand.
 		if(inside_belly)
-			dat += "<font color = 'green'>You are currently [user.absorbed ? "absorbed into " : "inside "]</font> <font color = 'yellow'>[eater]'s</font> <font color = 'red'>[inside_belly]</font>!<br><br>"
+			dat += "<font color = 'green'>You are currently [(user.vore_flags & ABSORBED) ? "absorbed into " : "inside "]</font> <font color = 'yellow'>[eater]'s</font> <font color = 'red'>[inside_belly]</font>!<br><br>"
 
 			if(inside_belly.desc)
 				dat += "[inside_belly.desc]<br><br>"
@@ -80,8 +80,8 @@
 							continue
 
 						//That's an absorbed person you're checking
-						if(M.absorbed)
-							if(user.absorbed)
+						if(M.vore_flags & ABSORBED)
+							if(user.vore_flags & ABSORBED)
 								dat += "<a href='?src=\ref[src];outsidepick=\ref[O];outsidebelly=\ref[inside_belly]'><span style='color:purple;'>[O]</span></a>"
 								continue
 							else
@@ -139,7 +139,7 @@
 					var/mob/living/M = O
 
 					//Absorbed gets special color OOoOOOOoooo
-					if(M.absorbed)
+					if(M.vore_flags & ABSORBED)
 						dat += "<a href='?src=\ref[src];insidepick=\ref[O]'><span style='color:purple;'>[O]</span></a>"
 						continue
 
@@ -243,11 +243,11 @@
 	dat += "<HR>"
 	var/pref_on = "#173d15"
 	var/pref_off = "#990000"
-	dat += "<br><a style='background:[user.digestable ? pref_on : pref_off];' href='?src=\ref[src];toggledg=1'>Toggle Digestable (Currently: [user.digestable ? "ON" : "OFF"])</a>"
-	dat += "<br><a style='background:[user.devourable ? pref_on : pref_off];' href='?src=\ref[src];toggledvor=1'>Toggle Devourable (Currently: [user.devourable ? "ON" : "OFF"])</a>"
-	dat += "<br><a style='background:[user.feeding ? pref_on : pref_off];' href='?src=\ref[src];toggledfeed=1'>Toggle Feeding (Currently: [user.feeding ? "ON" : "OFF"])</a>"
+	dat += "<br><a style='background:[(user.vore_flags & DIGESTABLE) ? pref_on : pref_off];' href='?src=\ref[src];toggledg=1'>Toggle Digestable (Currently: [(user.vore_flags & DIGESTABLE) ? "ON" : "OFF"])</a>"
+	dat += "<br><a style='background:[(user.vore_flags & DEVOURABLE) ? pref_on : pref_off];' href='?src=\ref[src];toggledvor=1'>Toggle Devourable (Currently: [(user.vore_flags & DEVOURABLE) ? "ON" : "OFF"])</a>"
+	dat += "<br><a style='background:[(user.vore_flags & FEEDING) ? pref_on : pref_off];' href='?src=\ref[src];toggledfeed=1'>Toggle Feeding (Currently: [(user.vore_flags & FEEDING) ? "ON" : "OFF"])</a>"
 	if(user.client.prefs)
-		dat += "<br><a style='background:[user.client.prefs.lickable ? pref_on : pref_off];' href='?src=\ref[src];toggledlickable=1'>Toggle Licking (Currently: [user.client.prefs.lickable ? "ON" : "OFF"])</a>"
+		dat += "<br><a style='background:[(user.client.prefs.vore_flags & LICKABLE) ? pref_on : pref_off];' href='?src=\ref[src];toggledlickable=1'>Toggle Licking (Currently: [(user.client.prefs.vore_flags & LICKABLE) ? "ON" : "OFF"])</a>"
 	//Returns the dat html to the vore_look
 	return dat
 
@@ -257,7 +257,7 @@
 
 	if(href_list["close"])
 		qdel(src)  // Cleanup
-		user.openpanel = FALSE
+		user.vore_flags &= ~OPEN_PANEL
 		return
 
 	if(href_list["show_int"])
@@ -287,7 +287,7 @@
 					M.examine(user)
 
 				if("Help Out") //Help the inside-mob out
-					if(user.stat || user.absorbed || M.absorbed)
+					if(user.stat || user.vore_flags & ABSORBED || M.vore_flags & ABSORBED)
 						to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
 						return TRUE
 
@@ -306,7 +306,7 @@
 						to_chat(OB.owner,"<font color='green'>Your body efficiently shoves [M] back where they belong.</font>")
 
 				if("Devour") //Eat the inside mob
-					if(user.absorbed || user.stat)
+					if(user.vore_flags & ABSORBED || user.stat)
 						to_chat(user,"<span class='warning'>You can't do that in your state!</span>")
 						return TRUE
 
@@ -687,58 +687,58 @@
 		user.vore_taste = new_flavor
 
 	if(href_list["toggledg"])
-		var/choice = alert(user, "This button is for those who don't like being digested. It can make you undigestable to all mobs. Digesting you is currently: [user.digestable ? "Allowed" : "Prevented"]", "", "Allow Digestion", "Cancel", "Prevent Digestion")
+		var/choice = alert(user, "This button is for those who don't like being digested. It can make you undigestable to all mobs. Digesting you is currently: [(user.vore_flags & DIGESTABLE) ? "Allowed" : "Prevented"]", "", "Allow Digestion", "Cancel", "Prevent Digestion")
 		if(!user || !user.client)
 			return
 		switch(choice)
 			if("Cancel")
 				return FALSE
 			if("Allow Digestion")
-				user.digestable = TRUE
+				user.vore_flags |= DIGESTABLE
+				user.client.prefs.vore_flags |= DIGESTABLE
 			if("Prevent Digestion")
-				user.digestable = FALSE
-
-		user.client.prefs.digestable = user.digestable
+				user.vore_flags &= ~DIGESTABLE
+				user.client.prefs.vore_flags &= ~DIGESTABLE
 
 	if(href_list["toggledvor"])
-		var/choice = alert(user, "This button is for those who don't like vore at all. Devouring you is currently: [user.devourable ? "Allowed" : "Prevented"]", "", "Allow Devourment", "Cancel", "Prevent Devourment")
+		var/choice = alert(user, "This button is for those who don't like vore at all. Devouring you is currently: [(user.vore_flags & DEVOURABLE) ? "Allowed" : "Prevented"]", "", "Allow Devourment", "Cancel", "Prevent Devourment")
 		if(!user || !user.client)
 			return
 		switch(choice)
 			if("Cancel")
 				return FALSE
 			if("Allow Devourment")
-				user.devourable = TRUE
+				user.vore_flags |= DEVOURABLE
+				user.client.prefs.vore_flags |= DEVOURABLE
 			if("Prevent Devourment")
-				user.devourable = FALSE
-
-		user.client.prefs.devourable = user.devourable
+				user.vore_flags &= ~DEVOURABLE
+				user.client.prefs.vore_flags &= ~DEVOURABLE
 
 	if(href_list["toggledfeed"])
-		var/choice = alert(user, "This button is to toggle your ability to be fed to others. Feeding predators is currently: [user.feeding ? "Allowed" : "Prevented"]", "", "Allow Feeding", "Cancel", "Prevent Feeding")
+		var/choice = alert(user, "This button is to toggle your ability to be fed to others. Feeding predators is currently: [(user.vore_flags & FEEDING) ? "Allowed" : "Prevented"]", "", "Allow Feeding", "Cancel", "Prevent Feeding")
 		if(!user || !user.client)
 			return
 		switch(choice)
 			if("Cancel")
 				return FALSE
 			if("Allow Feeding")
-				user.feeding = TRUE
+				user.vore_flags |= FEEDING
+				user.client.prefs.vore_flags |= FEEDING
 			if("Prevent Feeding")
-				user.feeding = FALSE
-
-		user.client.prefs.feeding = user.feeding
+				user.vore_flags &= ~FEEDING
+				user.client.prefs.vore_flags &= ~FEEDING
 
 	if(href_list["toggledlickable"])
-		var/choice = alert(user, "This button is to toggle your ability to be licked. Being licked is currently: [user.client.prefs.lickable ? "Allowed" : "Prevented"]", "", "Allow Licking", "Cancel", "Prevent Licking")
+		var/choice = alert(user, "This button is to toggle your ability to be licked. Being licked is currently: [(user.client.prefs.vore_flags & LICKABLE) ? "Allowed" : "Prevented"]", "", "Allow Licking", "Cancel", "Prevent Licking")
 		if(!user || !user.client)
 			return
 		switch(choice)
 			if("Cancel")
 				return FALSE
 			if("Allow Licking")
-				user.client.prefs.lickable = TRUE
+				user.client.prefs.vore_flags |= LICKABLE
 			if("Prevent Licking")
-				user.client.prefs.lickable = FALSE
+				user.client.prefs.vore_flags &= ~LICKABLE
 
 	//Refresh when interacted with, returning 1 makes vore_look.Topic update
 	return TRUE