Merge remote-tracking branch 'upstream/dev' into viro

Conflicts: code/modules/virus2/disease2.dm
2025-12-24 00:51:46 +00:00 · 2015-02-03 15:33:37 +00:00
parent 1b08463b7e c3559556a0
commit c4788ad6f5
581 changed files with 3139 additions and 18688 deletions
--- a/code/modules/reagents/Chemistry-Colours.dm
+++ b/code/modules/reagents/Chemistry-Colours.dm
@@ -8,7 +8,6 @@
 	var/list/greencolor = new /list(contents)
 	var/list/bluecolor = new /list(contents)
 	var/i
-
 	//fill the list of weights
 	for(i=1; i<=contents; i++)
 		var/datum/reagent/re = reagent_list[i]
@@ -17,7 +16,6 @@
 			reagentweight *= 20 //Paint colours a mixture twenty times as much
 		weight[i] = reagentweight

-
 	//fill the lists of colours
 	for(i=1; i<=contents; i++)
 		var/datum/reagent/re = reagent_list[i]
--- a/code/modules/reagents/Chemistry-Holder.dm
+++ b/code/modules/reagents/Chemistry-Holder.dm
@@ -79,9 +79,9 @@ datum
 					if(A.volume > the_volume)
 						the_volume = A.volume
 						the_reagent = A
-				
+
 				return the_reagent
-			
+
 			get_master_reagent_name()
 				var/the_name = null
 				var/the_volume = 0
@@ -353,8 +353,11 @@ datum
 								if(C.result)
 									feedback_add_details("chemical_reaction","[C.result]|[C.result_amount*multiplier]")
 									multiplier = max(multiplier, 1) //this shouldnt happen ...
-									add_reagent(C.result, C.result_amount*multiplier)
-									set_data(C.result, preserved_data)
+									if(!isnull(C.resultcolor)) //paints
+										add_reagent(C.result, C.result_amount*multiplier, C.resultcolor)
+									else
+										add_reagent(C.result, C.result_amount*multiplier)
+										set_data(C.result, preserved_data)

 									//add secondary products
 									for(var/S in C.secondary_results)
@@ -458,7 +461,7 @@ datum
 									else R.reaction_obj(A, R.volume+volume_modifier)
 				return

-			add_reagent(var/reagent, var/amount, var/list/data=null, var/safety = 0)
+			add_reagent(var/reagent, var/amount, var/data=null, var/safety = 0)
 				if(!isnum(amount)) return 1
 				update_total()
 				if(total_volume + amount > maximum_volume) amount = (maximum_volume - total_volume) //Doesnt fit in. Make it disappear. Shouldnt happen. Will happen.
@@ -469,7 +472,6 @@ datum
 					if (R.id == reagent)
 						R.volume += amount
 						update_total()
-						my_atom.on_reagent_change()

 						// mix dem viruses
 						if(R.id == "blood" && reagent == "blood")
@@ -495,9 +497,23 @@ datum
 											if(!istype(D, /datum/disease/advance))
 												preserve += D
 										R.data["viruses"] = preserve
-
+						if(R.id == "paint" && reagent == "paint")
+							if(R.color && data)
+								var/list/mix = new /list(2)
+								//fill the list
+								var/datum/reagent/paint/P = chemical_reagents_list["paint"]
+								var/datum/reagent/paint/P1 = new P.type()
+								P1.color = R.color
+								P1.volume = R.volume - amount //since we just increased that
+								var/datum/reagent/paint/P2 = new P.type()
+								P2.color = data
+								P2.volume = amount
+								mix[1] = P1
+								mix[2] = P2
+								R.color = mix_color_from_reagents(mix)
 						if(!safety)
 							handle_reactions()
+						my_atom.on_reagent_change()
 						return 0

 				var/datum/reagent/D = chemical_reagents_list[reagent]
@@ -507,7 +523,10 @@ datum
 					reagent_list += R
 					R.holder = src
 					R.volume = amount
-					SetViruses(R, data) // Includes setting data
+					if(reagent == "paint")
+						R.color = data
+					else
+						SetViruses(R, data) // Includes setting data for blood

 					//debug
 					//world << "Adding data"
@@ -611,6 +630,7 @@ datum
 					my_atom.reagents = null

 			copy_data(var/datum/reagent/current_reagent)
+				if (current_reagent.id == "paint") return current_reagent.color
 				if (!current_reagent || !current_reagent.data) return null
 				if (!istype(current_reagent.data, /list)) return current_reagent.data

--- a/code/modules/reagents/Chemistry-Machinery.dm
+++ b/code/modules/reagents/Chemistry-Machinery.dm
@@ -646,7 +646,7 @@
 				if(type in diseases) // Make sure this is a disease
 					D = new type(0, null)
 			var/list/data = list("viruses"=list(D))
-			var/name = sanitize(input(usr,"Name:","Name the culture",D.name))
+			var/name = sanitize(copytext(input(usr,"Name:","Name the culture",D.name), 1, MAX_NAME_LEN))
 			if(!name || name == " ") name = D.name
 			B.name = "[name] culture bottle"
 			B.desc = "A small bottle. Contains [D.agent] culture in synthblood medium."
@@ -851,7 +851,10 @@

 		//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
 		/obj/item/weapon/reagent_containers/pill = list(),
-		/obj/item/weapon/reagent_containers/food = list()
+		/obj/item/weapon/reagent_containers/food = list(),
+
+		//Crayons
+		/obj/item/toy/crayon = list()
 	)

 	var/list/juice_items = list (
@@ -1186,6 +1189,21 @@
 				break
 		remove_object(O)

+	//crayons
+	for (var/obj/item/toy/crayon/O in holdingitems)
+		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
+			break
+		var/amount = round(O.uses/3) //full crayon gives 10 juice
+		var/dustcolour = "red"
+		if (O.colourName == "mime")
+			dustcolour = "grey" //black+white
+		else if (O.colourName == "rainbow")
+			dustcolour = "brown" //mix of all colours
+		else if (!isnull(O.colourName)) //all other defined colours
+			dustcolour = O.colourName
+		beaker.reagents.add_reagent("crayon_dust_[dustcolour]",amount)
+		remove_object(O)
+
 	//Everything else - Transfers reagents from it into beaker
 	for (var/obj/item/weapon/reagent_containers/O in holdingitems)
 		if (beaker.reagents.total_volume >= beaker.reagents.maximum_volume)
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -88,7 +88,7 @@ datum
 			on_new(var/data)
 				return

-			// Called when two reagents of the same are mixing.
+			// Called when two reagents of the same are mixing. <-- Blatant lies
 			on_merge(var/data)
 				return

@@ -427,7 +427,7 @@ datum
 					holder.remove_reagent(src.id, 0.25 * REAGENTS_METABOLISM)
 				return

-/*		silicate
+		silicate
 			name = "Silicate"
 			id = "silicate"
 			description = "A compound that can be used to reinforce glass."
@@ -437,31 +437,9 @@ datum
 			reaction_obj(var/obj/O, var/volume)
 				src = null
 				if(istype(O,/obj/structure/window))
-					if(O:silicate <= 200)
-
-						O:silicate += volume
-						O:health += volume * 3
-
-						if(!O:silicateIcon)
-							var/icon/I = icon(O.icon,O.icon_state,O.dir)
-
-							var/r = (volume / 100) + 1
-							var/g = (volume / 70) + 1
-							var/b = (volume / 50) + 1
-							I.SetIntensity(r,g,b)
-							O.icon = I
-							O:silicateIcon = I
-						else
-							var/icon/I = O:silicateIcon
-
-							var/r = (volume / 100) + 1
-							var/g = (volume / 70) + 1
-							var/b = (volume / 50) + 1
-							I.SetIntensity(r,g,b)
-							O.icon = I
-							O:silicateIcon = I
-
-				return*/
+					var/obj/structure/window/W = O
+					W.apply_silicate(volume)
+				return

 		oxygen
 			name = "Oxygen"
@@ -1535,6 +1513,78 @@ datum
 				..()
 				return

+//////////////////////////Ground crayons/////////////////////
+
+
+		crayon_dust
+			name = "Crayon dust"
+			id = "crayon_dust"
+			description = "Intensely coloured powder obtained by grinding crayons."
+			reagent_state = LIQUID
+			color = "#888888"
+			overdose = 5
+
+			red
+				name = "Red crayon dust"
+				id = "crayon_dust_red"
+				color = "#FE191A"
+
+			orange
+				name = "Orange crayon dust"
+				id = "crayon_dust_orange"
+				color = "#FFBE4F"
+
+			yellow
+				name = "Yellow crayon dust"
+				id = "crayon_dust_yellow"
+				color = "#FDFE7D"
+
+			green
+				name = "Green crayon dust"
+				id = "crayon_dust_green"
+				color = "#18A31A"
+
+			blue
+				name = "Blue crayon dust"
+				id = "crayon_dust_blue"
+				color = "#247CFF"
+
+			purple
+				name = "Purple crayon dust"
+				id = "crayon_dust_purple"
+				color = "#CC0099"
+
+			grey //Mime
+				name = "Grey crayon dust"
+				id = "crayon_dust_grey"
+				color = "#808080"
+
+			brown //Rainbow
+				name = "Brown crayon dust"
+				id = "crayon_dust_brown"
+				color = "#846F35"
+
+//////////////////////////Paint//////////////////////////////
+
+		paint
+			name = "Paint"
+			id = "paint"
+			description = "This paint will stick to almost any object"
+			reagent_state = LIQUID
+			color = "#808080"
+			overdose = 15
+
+			reaction_turf(var/turf/T, var/volume)
+				if(!istype(T) || istype(T, /turf/space))
+					return
+				T.color = color
+
+			reaction_obj(var/obj/O, var/volume)
+				..()
+				if(istype(O,/obj/item/weapon/light))
+					O.color = color
+
+
 //////////////////////////Poison stuff///////////////////////

 		toxin
@@ -2038,22 +2088,20 @@ datum
 				if(!M) M = holder.my_atom
 				if(prob(50)) M.heal_organ_damage(1,0)
 				M.nutrition += nutriment_factor	// For hunger and fatness
-/*
-				// If overeaten - vomit and fall down
-				// Makes you feel bad but removes reagents and some effect
-				// from your body
-				if (M.nutrition > 650)
-					M.nutrition = rand (250, 400)
-					M.weakened += rand(2, 10)
-					M.jitteriness += rand(0, 5)
-					M.dizziness = max (0, (M.dizziness - rand(0, 15)))
-					M.druggy = max (0, (M.druggy - rand(0, 15)))
-					M.adjustToxLoss(rand(-15, -5)))
-					M.updatehealth()
-*/
 				..()
 				return

+		nutriment/protein // Bad for Skrell!
+			name = "animal protein"
+			id = "protein"
+			color = "#440000"
+
+			on_mob_life(var/mob/living/M, var/alien)
+				if(alien && alien == IS_SKRELL)
+					M.adjustToxLoss(0.5)
+					M.nutrition -= nutriment_factor
+				..()
+
 		lipozine
 			name = "Lipozine" // The anti-nutriment.
 			id = "lipozine"
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -4,6 +4,7 @@ datum
 		var/name = null
 		var/id = null
 		var/result = null
+		var/resultcolor = null //for paint
 		var/list/required_reagents = new/list()
 		var/list/required_catalysts = new/list()

@@ -55,14 +56,14 @@ datum
 				empulse(location, round(created_volume / 24), round(created_volume / 14), 1)
 				holder.clear_reagents()
 				return
-/*
+
 		silicate
 			name = "Silicate"
 			id = "silicate"
 			result = "silicate"
 			required_reagents = list("aluminum" = 1, "silicon" = 1, "oxygen" = 1)
 			result_amount = 3
-*/
+
 		stoxin
 			name = "Soporific"
 			id = "stoxin"
@@ -131,7 +132,7 @@ datum
 			name = "Water"
 			id = "water"
 			result = "water"
-			required_reagents = list("oxygen" = 2, "hydrogen" = 1)
+			required_reagents = list("oxygen" = 1, "hydrogen" = 2)
 			result_amount = 1

 		thermite
@@ -1344,6 +1345,109 @@ datum
 				var/obj/effect/golemrune/Z = new /obj/effect/golemrune
 				Z.loc = get_turf(holder.my_atom)
 				Z.announce_to_ghosts()
+
+//////////////////////////////////////////PAINT///////////////////////////////////////////
+//Crayon dust -> paint
+		red_paint
+			name = "Red paint"
+			id = "red_paint"
+			result = "paint"
+			resultcolor = "#FE191A"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_red" = 1)
+			result_amount = 5
+
+		orange_paint
+			name = "Orange paint"
+			id = "orange_paint"
+			result = "paint"
+			resultcolor = "#FFBE4F"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_orange" = 1)
+			result_amount = 5
+
+		yellow_paint
+			name = "Yellow paint"
+			id = "yellow_paint"
+			result = "paint"
+			resultcolor = "#FDFE7D"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_yellow" = 1)
+			result_amount = 5
+
+		green_paint
+			name = "Green paint"
+			id = "green_paint"
+			result = "paint"
+			resultcolor = "#18A31A"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_green" = 1)
+			result_amount = 5
+
+		blue_paint
+			name = "Blue paint"
+			id = "blue_paint"
+			result = "paint"
+			resultcolor = "#247CFF"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_blue" = 1)
+			result_amount = 5
+
+		purple_paint
+			name = "Purple paint"
+			id = "purple_paint"
+			result = "paint"
+			resultcolor = "#CC0099"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_purple" = 1)
+			result_amount = 5
+
+		grey_paint //mime
+			name = "Grey paint"
+			id = "grey_paint"
+			result = "paint"
+			resultcolor = "#808080"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_grey" = 1)
+			result_amount = 5
+
+		brown_paint
+			name = "Brown paint"
+			id = "brown_paint"
+			result = "paint"
+			resultcolor = "#846F35"
+			required_reagents = list("plasticide" = 1, "water" = 3, "crayon_dust_brown" = 1)
+			result_amount = 5
+
+//Ghetto reactions
+
+		blood_paint
+			name = "Blood paint"
+			id = "blood_paint"
+			result = "paint"
+			resultcolor = "#FE191A"
+			required_reagents = list("plasticide" = 1, "water" = 3, "blood" = 2)
+			result_amount = 5
+
+		milk_paint
+			name = "Milk paint"
+			id = "milk_paint"
+			result = "paint"
+			resultcolor = "#F0F8FF"
+			required_reagents = list("plasticide" = 1, "water" = 3, "milk" = 5)
+			result_amount = 5
+
+		carbon_paint
+			name = "Carbon paint"
+			id = "carbon_paint"
+			result = "paint"
+			resultcolor = "#333333"
+			required_reagents = list("plasticide" = 1, "water" = 3, "carbon" = 1)
+			result_amount = 5
+
+//Aluminum "non-ghetto" white paint
+
+		aluminum_paint
+			name = "Aluminum paint"
+			id = "aluminum_paint"
+			result = "paint"
+			resultcolor = "#F0F8FF"
+			required_reagents = list("plasticide" = 1, "water" = 3, "aluminum" = 1)
+			result_amount = 5
+
 //////////////////////////////////////////FOOD MIXTURES////////////////////////////////////

 		tofu
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -8,7 +8,6 @@
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = null
-	flags = FPRINT
 	var/mode = 1
 	var/charge_cost = 50
 	var/charge_tick = 0
--- a/code/modules/reagents/reagent_containers/food/condiment.dm
+++ b/code/modules/reagents/reagent_containers/food/condiment.dm
@@ -10,7 +10,7 @@
 	desc = "Just your average condiment container."
 	icon = 'icons/obj/food.dmi'
 	icon_state = "emptycondiment"
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	possible_transfer_amounts = list(1,5,10)
 	center_of_mass = list("x"=16, "y"=6)
 	volume = 50
--- a/code/modules/reagents/reagent_containers/food/drinks.dm
+++ b/code/modules/reagents/reagent_containers/food/drinks.dm
@@ -6,7 +6,7 @@
 	desc = "yummy"
 	icon = 'icons/obj/drinks.dmi'
 	icon_state = null
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	var/gulp_size = 5 //This is now officially broken ... need to think of a nice way to fix it.
 	possible_transfer_amounts = list(5,10,25)
 	volume = 50
@@ -152,7 +152,7 @@
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = null
 	volume = 150
-	flags = FPRINT | CONDUCT | TABLEPASS | OPENCONTAINER
+	flags = CONDUCT | OPENCONTAINER

 /obj/item/weapon/reagent_containers/food/drinks/golden_cup/tournament_26_06_2011
 	desc = "A golden cup. It will be presented to a winner of tournament 26 june and name of the winner will be graved on it."
--- a/code/modules/reagents/reagent_containers/food/snacks.dm
+++ b/code/modules/reagents/reagent_containers/food/snacks.dm
@@ -469,7 +469,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("protein", 2)

 	throw_impact(atom/hit_atom)
 		..()
@@ -533,7 +533,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 3)
 		reagents.add_reagent("sodiumchloride", 1)
 		reagents.add_reagent("blackpepper", 1)
 		bitesize = 1
@@ -546,7 +546,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 2)

 /obj/item/weapon/reagent_containers/food/snacks/flour
 	name = "flour"
@@ -566,7 +566,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", rand(3,5))
+		reagents.add_reagent("protein", rand(3,5))
 		reagents.add_reagent("toxin", rand(1,3))
 		src.bitesize = 3

@@ -612,7 +612,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("protein", 3)
 		reagents.add_reagent("carpotoxin", 3)
 		src.bitesize = 6

@@ -624,7 +624,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("protein", 4)
 		reagents.add_reagent("carpotoxin", 3)
 		bitesize = 3

@@ -659,7 +659,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 12)
+		reagents.add_reagent("protein", 12)
 		reagents.add_reagent("hyperzine", 5)
 		src.bitesize = 3

@@ -671,7 +671,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("protein", 3)
 		src.bitesize = 6

 /obj/item/weapon/reagent_containers/food/snacks/meatball
@@ -682,7 +682,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("protein", 3)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/sausage
@@ -693,7 +693,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/donkpocket
@@ -704,7 +704,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 2)

 	var/warm = 0
 	proc/cooltime() //Not working, derp?
@@ -723,7 +724,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)
 		reagents.add_reagent("alkysine", 6)
 		bitesize = 2

@@ -750,7 +751,7 @@
 	icon_state = "hburger"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/cheeseburger
@@ -759,6 +760,7 @@
 	icon_state = "cheeseburger"
 	New()
 		..()
+		reagents.add_reagent("protein", 2)
 		reagents.add_reagent("nutriment", 2)

 /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
@@ -769,7 +771,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/fishburger
@@ -780,7 +783,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)
 		reagents.add_reagent("carpotoxin", 3)
 		bitesize = 3

@@ -828,7 +831,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 8)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/clownburger
@@ -839,11 +842,6 @@

 	New()
 		..()
-/*
-		var/datum/disease/F = new /datum/disease/pierrot_throat(0)
-		var/list/data = list("viruses"= list(F))
-		reagents.add_reagent("blood", 4, data)
-*/
 		reagents.add_reagent("nutriment", 6)
 		bitesize = 2

@@ -868,7 +866,7 @@
 	//var/herp = 0
 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 8)
 		bitesize = 1

 /obj/item/weapon/reagent_containers/food/snacks/muffin
@@ -945,7 +943,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 10)
+		reagents.add_reagent("protein", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/soylenviridians
@@ -970,7 +968,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 10)
+		reagents.add_reagent("protein", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/tofupie
@@ -1025,7 +1023,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 10)
+		reagents.add_reagent("protein", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/wingfangchu
@@ -1037,7 +1035,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)
 		bitesize = 2


@@ -1050,7 +1048,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 8)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
@@ -1062,7 +1060,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 8)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/tofukabob
@@ -1079,14 +1077,15 @@

 /obj/item/weapon/reagent_containers/food/snacks/cubancarp
 	name = "Cuban Carp"
-	desc = "A grifftastic sandwich that burns your tongue and then leaves it numb!"
+	desc = "A sandwich that burns your tongue and then leaves it numb!"
 	icon_state = "cubancarp"
 	trash = /obj/item/trash/plate
 	filling_color = "#E9ADFF"

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		reagents.add_reagent("carpotoxin", 3)
 		reagents.add_reagent("capsaicin", 3)
 		bitesize = 3
@@ -1120,7 +1119,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("protein", 4)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/no_raisin
@@ -1178,7 +1177,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("nutriment", 3)
+		reagents.add_reagent("protein", 3)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/fries
@@ -1225,7 +1225,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 2)
+		reagents.add_reagent("nutriment", 4)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
@@ -1260,7 +1261,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 4)
+		reagents.add_reagent("protein", 4)
 		reagents.add_reagent("sodiumchloride", 1)
 		reagents.add_reagent("blackpepper", 1)
 		bitesize = 3
@@ -1314,7 +1315,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 8)
 		reagents.add_reagent("water", 5)
 		bitesize = 5

@@ -1332,13 +1333,13 @@

 /obj/item/weapon/reagent_containers/food/snacks/bloodsoup
 	name = "Tomato soup"
-	desc = "Smells like copper"
+	desc = "Smells like copper."
 	icon_state = "tomatosoup"
 	filling_color = "#FF0000"

 	New()
 		..()
-		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 2)
 		reagents.add_reagent("blood", 10)
 		reagents.add_reagent("water", 5)
 		bitesize = 5
@@ -1454,7 +1455,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		reagents.add_reagent("capsaicin", 3)
 		reagents.add_reagent("tomatojuice", 2)
 		bitesize = 5
@@ -1469,7 +1471,8 @@
 	trash = /obj/item/trash/snack_bowl
 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		reagents.add_reagent("frostoil", 3)
 		reagents.add_reagent("tomatojuice", 2)
 		bitesize = 5
@@ -1503,7 +1506,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment",10)
+		reagents.add_reagent("protein", 10)

 	afterattack(obj/O as obj, mob/user as mob, proximity)
 		if(!proximity) return
@@ -1568,24 +1571,18 @@
 	desc = "Still wrapped in some paper."
 	icon_state = "monkeycubewrap"
 	wrapped = 1
-
-
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/farwacube
 	name = "farwa cube"
 	monkey_type = /mob/living/carbon/monkey/tajara
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/farwacube
 	name = "farwa cube"
 	monkey_type =/mob/living/carbon/monkey/tajara
-
-
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/stokcube
 	name = "stok cube"
 	monkey_type = /mob/living/carbon/monkey/unathi
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/wrapped/stokcube
 	name = "stok cube"
 	monkey_type =/mob/living/carbon/monkey/unathi
-
-
 /obj/item/weapon/reagent_containers/food/snacks/monkeycube/neaeracube
 	name = "neaera cube"
 	monkey_type = /mob/living/carbon/monkey/skrell
@@ -1613,7 +1610,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 14)
+		reagents.add_reagent("protein", 10)
+		reagents.add_reagent("nutriment", 4)
 		bitesize = 3

 /obj/item/weapon/reagent_containers/food/snacks/enchiladas
@@ -1625,7 +1623,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment",8)
+		reagents.add_reagent("protein", 6)
+		reagents.add_reagent("nutriment",2)
 		reagents.add_reagent("capsaicin", 6)
 		bitesize = 4

@@ -1638,7 +1637,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 10)
+		reagents.add_reagent("protein", 10)
 		reagents.add_reagent("banana", 5)
 		reagents.add_reagent("blackpepper", 1)
 		reagents.add_reagent("sodiumchloride", 1)
@@ -1665,7 +1664,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		reagents.add_reagent("carpotoxin", 3)
 		bitesize = 3

@@ -1678,7 +1678,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
@@ -1690,7 +1691,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 3)
 		reagents.add_reagent("carbon", 2)
 		bitesize = 2

@@ -1703,7 +1705,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 7)
+		reagents.add_reagent("protein", 4)
+		reagents.add_reagent("nutriment", 3)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/tomatosoup
@@ -1740,7 +1743,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 10)
+		reagents.add_reagent("protein", 4)
+		reagents.add_reagent("nutriment", 6)
 		reagents.add_reagent("tomatojuice", 5)
 		reagents.add_reagent("imidazoline", 5)
 		reagents.add_reagent("water", 5)
@@ -1836,7 +1840,7 @@

 /obj/item/weapon/reagent_containers/food/snacks/ricepudding
 	name = "Rice Pudding"
-	desc = "Where's the Jam!"
+	desc = "Where's the jam?"
 	icon_state = "rpudding"
 	trash = /obj/item/trash/snack_bowl
 	filling_color = "#FFFBDB"
@@ -1868,7 +1872,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 4)
+		reagents.add_reagent("nutriment", 4)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/spesslaw
@@ -1879,7 +1884,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 4)
+		reagents.add_reagent("nutriment", 4)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/poppypretzel
@@ -1914,7 +1920,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 50)
+		reagents.add_reagent("protein", 25)
+		reagents.add_reagent("nutriment", 25)
 		bitesize = 10

 /obj/item/weapon/reagent_containers/food/snacks/candiedapple
@@ -2043,7 +2050,7 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 5)
+		reagents.add_reagent("protein", 5)
 		bitesize = 1

 /obj/item/weapon/reagent_containers/food/snacks/beetsoup
@@ -2055,19 +2062,7 @@

 	New()
 		..()
-		switch(rand(1,6))
-			if(1)
-				name = "borsch"
-			if(2)
-				name = "bortsch"
-			if(3)
-				name = "borstch"
-			if(4)
-				name = "borsh"
-			if(5)
-				name = "borshch"
-			if(6)
-				name = "borscht"
+		name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
 		reagents.add_reagent("nutriment", 8)
 		bitesize = 2

@@ -2092,7 +2087,8 @@

 	New()
 		..()
-		reagents.add_reagent("nutriment", 8)
+		reagents.add_reagent("protein", 2)
+		reagents.add_reagent("nutriment", 6)
 		bitesize = 3

 /obj/item/weapon/reagent_containers/food/snacks/appletart
@@ -2125,7 +2121,8 @@
 	filling_color = "#FF7575"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 30)
+		reagents.add_reagent("protein", 20)
+		reagents.add_reagent("nutriment", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/meatbreadslice
@@ -2145,7 +2142,8 @@
 	filling_color = "#8AFF75"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 30)
+		reagents.add_reagent("protein", 20)
+		reagents.add_reagent("nutriment", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice
@@ -2228,7 +2226,8 @@
 	filling_color = "#E6AEDB"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 25)
+		reagents.add_reagent("protein", 25)
+		reagents.add_reagent("nutriment", 5)
 		reagents.add_reagent("alkysine", 10)
 		bitesize = 2

@@ -2249,7 +2248,8 @@
 	filling_color = "#FAF7AF"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 25)
+		reagents.add_reagent("protein", 15)
+		reagents.add_reagent("nutriment", 10)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice
@@ -2364,7 +2364,7 @@
 	filling_color = "#FFF700"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 20)
+		reagents.add_reagent("protein", 20)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/cheesewedge
@@ -2389,7 +2389,7 @@

 /obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice
 	name = "Birthday Cake slice"
-	desc = "A slice of your birthday"
+	desc = "A slice of your birthday."
 	icon_state = "birthdaycakeslice"
 	trash = /obj/item/trash/plate
 	filling_color = "#FFD6D6"
@@ -2426,7 +2426,8 @@
 	filling_color = "#FFF896"
 	New()
 		..()
-		reagents.add_reagent("nutriment", 20)
+		reagents.add_reagent("protein", 15)
+		reagents.add_reagent("nutriment", 5)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice
@@ -2511,7 +2512,8 @@
 	slices_num = 6
 	New()
 		..()
-		reagents.add_reagent("nutriment", 40)
+		reagents.add_reagent("nutriment", 35)
+		reagents.add_reagent("protein", 5)
 		reagents.add_reagent("tomatojuice", 6)
 		bitesize = 2

@@ -2530,7 +2532,7 @@
 	slices_num = 6
 	New()
 		..()
-		reagents.add_reagent("nutriment", 50)
+		reagents.add_reagent("protein", 50)
 		reagents.add_reagent("tomatojuice", 6)
 		bitesize = 2

@@ -2550,6 +2552,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 35)
+		reagents.add_reagent("protein", 5)
 		bitesize = 2

 /obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice
@@ -2568,6 +2571,7 @@
 	New()
 		..()
 		reagents.add_reagent("nutriment", 30)
+		reagents.add_reagent("protein", 5)
 		reagents.add_reagent("tomatojuice", 6)
 		reagents.add_reagent("imidazoline", 12)
 		bitesize = 2
@@ -2799,6 +2803,7 @@
 	bitesize = 2
 	New()
 		..()
+		reagents.add_reagent("protein", 1)
 		reagents.add_reagent("nutriment", 3)

 // Dough + rolling pin = flat dough
@@ -2818,6 +2823,7 @@
 	slices_num = 3
 	New()
 		..()
+		reagents.add_reagent("protein", 1)
 		reagents.add_reagent("nutriment", 3)

 /obj/item/weapon/reagent_containers/food/snacks/doughslice
@@ -2891,7 +2897,8 @@
 	bitesize = 3
 	New()
 		..()
-		reagents.add_reagent("nutriment", 7)
+		reagents.add_reagent("protein", 3)
+		reagents.add_reagent("nutriment", 4)

 /obj/item/weapon/reagent_containers/food/snacks/rawcutlet
 	name = "raw cutlet"
@@ -2901,7 +2908,7 @@
 	bitesize = 1
 	New()
 		..()
-		reagents.add_reagent("nutriment", 1)
+		reagents.add_reagent("protein", 1)

 /obj/item/weapon/reagent_containers/food/snacks/cutlet
 	name = "cutlet"
@@ -2911,7 +2918,7 @@
 	bitesize = 2
 	New()
 		..()
-		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 2)

 /obj/item/weapon/reagent_containers/food/snacks/rawmeatball
 	name = "raw meatball"
@@ -2921,7 +2928,7 @@
 	bitesize = 2
 	New()
 		..()
-		reagents.add_reagent("nutriment", 2)
+		reagents.add_reagent("protein", 2)

 /obj/item/weapon/reagent_containers/food/snacks/hotdog
 	name = "hotdog"
@@ -2930,7 +2937,7 @@
 	bitesize = 2
 	New()
 		..()
-		reagents.add_reagent("nutriment", 6)
+		reagents.add_reagent("protein", 6)

 /obj/item/weapon/reagent_containers/food/snacks/flatbread
 	name = "flatbread"
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -12,7 +12,7 @@
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60)
 	volume = 60
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER

 	var/label_text = ""

@@ -137,7 +137,7 @@

 	attackby(obj/item/weapon/W as obj, mob/user as mob)
 		if(istype(W, /obj/item/weapon/pen) || istype(W, /obj/item/device/flashlight/pen))
-			var/tmp_label = sanitize(input(user, "Enter a label for [src.name]","Label",src.label_text))
+			var/tmp_label = sanitize(copytext(input(user, "Enter a label for [src.name]","Label",src.label_text), 1, MAX_NAME_LEN))
 			if(length(tmp_label) > 10)
 				user << "\red The label can be at most 10 characters long."
 			else
@@ -209,7 +209,7 @@
 	volume = 120
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60,120)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER

 /obj/item/weapon/reagent_containers/glass/beaker/noreact
 	name = "cryostasis beaker"
@@ -218,7 +218,7 @@
 	matter = list("glass" = 500)
 	volume = 60
 	amount_per_transfer_from_this = 10
-	flags = FPRINT | TABLEPASS | OPENCONTAINER | NOREACT
+	flags = OPENCONTAINER | NOREACT

 /obj/item/weapon/reagent_containers/glass/beaker/bluespace
 	name = "bluespace beaker"
@@ -228,7 +228,7 @@
 	volume = 300
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60,120,300)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER


 /obj/item/weapon/reagent_containers/glass/beaker/vial
@@ -239,7 +239,7 @@
 	volume = 30
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER

 /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
 	New()
@@ -270,7 +270,7 @@
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60,120)
 	volume = 120
-	flags = FPRINT | OPENCONTAINER
+	flags = OPENCONTAINER

 	attackby(var/obj/D, mob/user as mob)
 		if(isprox(D))
@@ -297,7 +297,7 @@
 	volume = 15
 	amount_per_transfer_from_this = 5
 	possible_transfer_amounts = list(1,5,15)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER */
+	flags = OPENCONTAINER */

 /*
 /obj/item/weapon/reagent_containers/glass/blender_jug
@@ -329,7 +329,6 @@
 	amount_per_transfer_from_this = 20
 	possible_transfer_amounts = list(10,20,30,60)
 	volume = 120
-	flags = FPRINT

 /obj/item/weapon/reagent_containers/glass/dispenser
 	name = "reagent glass"
@@ -337,7 +336,7 @@
 	icon = 'icons/obj/chemical.dmi'
 	icon_state = "beaker0"
 	amount_per_transfer_from_this = 10
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER

 /obj/item/weapon/reagent_containers/glass/dispenser/surfactant
 	name = "reagent glass (surfactant)"
--- a/code/modules/reagents/reagent_containers/glass/bottle.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle.dm
@@ -9,7 +9,7 @@
 	item_state = "atoxinbottle"
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,60)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	volume = 60

 	on_reagent_change()
--- a/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
+++ b/code/modules/reagents/reagent_containers/glass/bottle/robot.dm
@@ -2,7 +2,7 @@
 /obj/item/weapon/reagent_containers/glass/bottle/robot
 	amount_per_transfer_from_this = 10
 	possible_transfer_amounts = list(5,10,15,25,30,50,100)
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	volume = 60
 	var/reagent = ""

--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -11,7 +11,7 @@
 	amount_per_transfer_from_this = 5
 	volume = 30
 	possible_transfer_amounts = null
-	flags = FPRINT | TABLEPASS | OPENCONTAINER
+	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT

 /obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -4,7 +4,7 @@
 	icon = 'icons/obj/janitor.dmi'
 	icon_state = "cleaner"
 	item_state = "cleaner"
-	flags = TABLEPASS|OPENCONTAINER|FPRINT|NOBLUDGEON
+	flags = OPENCONTAINER|NOBLUDGEON
 	slot_flags = SLOT_BELT
 	throwforce = 3
 	w_class = 2.0
@@ -21,7 +21,7 @@
 	..()
 	src.verbs -= /obj/item/weapon/reagent_containers/verb/set_APTFT

-/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob)
+/obj/item/weapon/reagent_containers/spray/afterattack(atom/A as mob|obj, mob/user as mob, proximity)
 	if(istype(A, /obj/item/weapon/storage) || istype(A, /obj/structure/table) || istype(A, /obj/structure/closet) \
 	|| istype(A, /obj/item/weapon/reagent_containers) || istype(A, /obj/structure/sink) || istype(A, /obj/structure/janitorialcart))
 		return
@@ -46,7 +46,7 @@
 		user << "<span class='notice'>\The [src] is empty!</span>"
 		return

-	Spray_at(A)
+	Spray_at(A, user, proximity)

 	playsound(src.loc, 'sound/effects/spray2.ogg', 50, 1, -6)

@@ -61,28 +61,39 @@
 		log_game("[key_name(user)] fired Space lube from \a [src].")
 	return

-/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj)
-	var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
-	D.create_reagents(amount_per_transfer_from_this)
-	reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_size)
-	D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+/obj/item/weapon/reagent_containers/spray/proc/Spray_at(atom/A as mob|obj, mob/user as mob, proximity)
+	if (A.density && proximity)
+		A.visible_message("[usr] sprays [A] with [src].")
+		var/obj/D = new/obj()
+		D.create_reagents(amount_per_transfer_from_this)
+		reagents.trans_to(D, amount_per_transfer_from_this)
+		D.icon += mix_color_from_reagents(D.reagents.reagent_list)
+		spawn(0)
+			D.reagents.reaction(A)
+			sleep(5)
+			del(D)
+	else
+		var/obj/effect/decal/chempuff/D = new/obj/effect/decal/chempuff(get_turf(src))
+		D.create_reagents(amount_per_transfer_from_this)
+		reagents.trans_to(D, amount_per_transfer_from_this, 1/spray_size)
+		D.icon += mix_color_from_reagents(D.reagents.reagent_list)

-	var/turf/A_turf = get_turf(A)//BS12
+		var/turf/A_turf = get_turf(A)//BS12

-	spawn(0)
-		for(var/i=0, i<spray_size, i++)
-			step_towards(D,A)
-			D.reagents.reaction(get_turf(D))
-			for(var/atom/T in get_turf(D))
-				D.reagents.reaction(T)
+		spawn(0)
+			for(var/i=0, i<spray_size, i++)
+				step_towards(D,A)
+				D.reagents.reaction(get_turf(D))
+				for(var/atom/T in get_turf(D))
+					D.reagents.reaction(T)

-				// When spraying against the wall, also react with the wall, but
-				// not its contents. BS12
-				if(get_dist(D, A_turf) == 1 && A_turf.density)
-					D.reagents.reaction(A_turf)
-				sleep(2)
-			sleep(3)
-		del(D)
+					// When spraying against the wall, also react with the wall, but
+					// not its contents. BS12
+					if(get_dist(D, A_turf) == 1 && A_turf.density)
+						D.reagents.reaction(A_turf)
+					sleep(2)
+				sleep(3)
+			del(D)

 	return

--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -7,7 +7,6 @@
 	icon_state = "watertank"
 	density = 1
 	anchored = 0
-	flags = FPRINT
 	pressure_resistance = 2*ONE_ATMOSPHERE

 	var/amount_per_transfer_from_this = 10