Merge remote-tracking branch 'upstream/master' into dev-freeze

Conflicts:
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/ai/ai.dm
	code/modules/research/circuitprinter.dm

code/modules/reagents/reagent_containers/food/drinks/bottle.dm

@@ -9,6 +9,10 @@
 	var/const/duration = 13 //Directly relates to the 'weaken' duration. Lowered by armor (i.e. helmets)
 	var/isGlass = 1 //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/New()
+	..()
+	if(isGlass) unacidable = 1
+
 /obj/item/weapon/reagent_containers/food/drinks/bottle/proc/smash(mob/living/target as mob, mob/living/user as mob)
 
 	//Creates a shattering noise and replaces the bottle with a broken_bottle

code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm

@@ -6,6 +6,7 @@
 	icon_state = "glass_empty"
 	amount_per_transfer_from_this = 5
 	volume = 30
+	unacidable = 1 //glass
 	center_of_mass = list("x"=16, "y"=10)
 
 	on_reagent_change()

code/modules/reagents/reagent_containers/food/drinks/jar.dm

@@ -8,6 +8,7 @@
 	icon_state = "jar"
 	item_state = "beaker"
 	center_of_mass = list("x"=15, "y"=8)
+	unacidable = 1
 	New()
 		..()
 		reagents.add_reagent("slime", 50)

code/modules/reagents/reagent_containers/glass.dm

@@ -14,6 +14,7 @@
 	volume = 60
 	w_class = 2
 	flags = OPENCONTAINER
+	unacidable = 1 //glass doesn't dissolve in acid
 
 	var/label_text = ""
 
@@ -219,6 +220,7 @@
 	possible_transfer_amounts = list(10,20,30,60,120)
 	volume = 120
 	flags = OPENCONTAINER
+	unacidable = 0
 
 	attackby(var/obj/D, mob/user as mob)
 		if(isprox(D))

code/modules/reagents/reagent_containers/hypospray.dm

@@ -9,6 +9,7 @@
 	item_state = "hypo"
 	icon_state = "hypo"
 	amount_per_transfer_from_this = 5
+	unacidable = 1
 	volume = 30
 	possible_transfer_amounts = null
 	flags = OPENCONTAINER

code/modules/reagents/reagent_containers/spray.dm

@@ -11,6 +11,7 @@
 	throw_speed = 2
 	throw_range = 10
 	amount_per_transfer_from_this = 10
+	unacidable = 1 //plastic
 	possible_transfer_amounts = list(5,10) //Set to null instead of list, if there is only one.
 	var/spray_size = 3
 	var/list/spray_sizes = list(1,3)

code/modules/reagents/reagent_containers/syringes.dm

@@ -18,6 +18,7 @@
 	w_class = 1
 	slot_flags = SLOT_EARS
 	sharp = 1
+	unacidable = 1 //glass
 	var/mode = SYRINGE_DRAW
 	var/image/filling //holds a reference to the current filling overlay
 	var/visible_name = "a syringe"