Merge branch 'master' of https://github.com/PolarisSS13/Polaris into parachute

# Conflicts:
#	icons/obj/storage.dmi

code/game/objects/items/weapons/material/material_weapons.dm

@@ -19,6 +19,7 @@
 	var/unbreakable = 0		//Doesn't lose health
 	var/fragile = 0			//Shatters when it dies
 	var/dulled = 0			//Has gone dull
+	var/can_dull = 1		//Can it go dull?
 	var/force_divisor = 0.5
 	var/thrown_force_divisor = 0.5
 	var/dulled_divisor = 0.5	//Just drops the damage by half
@@ -92,7 +93,7 @@
 	if(health<=0)
 		if(fragile)
 			shatter(consumed)
-		else if(!dulled)
+		else if(!dulled && can_dull)
 			dull()
 
 /obj/item/weapon/material/proc/shatter(var/consumed)

code/game/objects/items/weapons/material/misc.dm

@@ -85,4 +85,37 @@
 	thrown_force_divisor = 0.25 // as above
 	dulled_divisor = 0.75	//Still metal on a long pole
 	w_class = ITEMSIZE_SMALL
-	attack_verb = list("slashed", "sliced", "cut", "clawed")
+	attack_verb = list("slashed", "sliced", "cut", "clawed")
+
+/obj/item/weapon/material/snow/snowball
+	name = "loose packed snowball"
+	desc = "A fun snowball. Throw it at your friends!"
+	icon = 'icons/obj/weapons.dmi'
+	icon_state = "snowball"
+	default_material = MAT_SNOW
+	health = 1
+	fragile = 1
+	force_divisor = 0.01
+	thrown_force_divisor = 0.10
+	w_class = ITEMSIZE_SMALL
+	attack_verb = list("mushed", "splatted", "splooshed", "splushed") // Words that totally exist.
+
+/obj/item/weapon/material/snow/snowball/attack_self(mob/user as mob)
+	if(user.a_intent == I_HURT)
+		visible_message("[user] has smashed the snowball in their hand!", "You smash the snowball in your hand.")
+		var/atom/S = new /obj/item/stack/material/snow(user.loc)
+		del(src)
+		user.put_in_hands(S)
+	else
+		visible_message("[user] starts compacting the snowball.", "You start compacting the snowball.")
+		if(do_after(user, 2000))
+			var/atom/S = new /obj/item/weapon/material/snow/snowball/reinforced(user.loc)
+			del(src)
+			user.put_in_hands(S)
+
+/obj/item/weapon/material/snow/snowball/reinforced
+	name = "snowball"
+	desc = "A well-formed and fun snowball. It looks kind of dangerous."
+	icon_state = "snowball-reinf"
+	force_divisor = 0.20
+	thrown_force_divisor = 0.25

code/game/objects/items/weapons/material/twohanded.dm

@@ -145,6 +145,7 @@
 	base_icon = "spearglass"
 	name = "spear"
 	desc = "A haphazardly-constructed yet still deadly weapon of ancient design."
+	description_info = "This weapon can strike from two tiles away, and over certain objects such as tables, or other people."
 	force = 10
 	w_class = ITEMSIZE_LARGE
 	slot_flags = SLOT_BACK
@@ -158,4 +159,6 @@
 	attack_verb = list("attacked", "poked", "jabbed", "torn", "gored")
 	default_material = "glass"
 	applies_material_colour = 0
-	fragile = 1	//It's a haphazard thing of glass, wire, and steel
+	fragile = 1	//It's a haphazard thing of glass, wire, and steel
+	reach = 2 // Spears are long.
+	attackspeed = 14

code/game/objects/items/weapons/storage/bags.dm

@@ -10,7 +10,9 @@
  *		Plant Bag
  *		Sheet Snatcher
  *		Cash Bag
- *
+ *		Chemistry Bag
+ 		Food Bag
+
  *	-Sayu
  */
 
@@ -261,3 +263,16 @@
 	w_class = ITEMSIZE_LARGE
 	slowdown = 1
 	can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/reagent_containers/glass/beaker,/obj/item/weapon/reagent_containers/glass/bottle)
+
+	// -----------------------------
+	//           Food Bag
+	// -----------------------------
+/obj/item/weapon/storage/bag/food
+	name = "food bag"
+	icon = 'icons/obj/storage.dmi'
+	icon_state = "foodbag"
+	desc = "A bag for storing foods of all kinds."
+	max_storage_space = ITEMSIZE_COST_NORMAL * 25
+	max_w_class = ITEMSIZE_NORMAL
+	w_class = ITEMSIZE_SMALL
+	can_hold = list(/obj/item/weapon/reagent_containers/food/snacks,/obj/item/weapon/reagent_containers/food/condiment)

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

@@ -149,6 +149,7 @@
 	new /obj/item/weapon/surgical/bonegel(src)
 	new /obj/item/weapon/surgical/FixOVein(src)
 	new /obj/item/stack/medical/advanced/bruise_pack(src)
+	new /obj/item/device/healthanalyzer/advanced(src)
 	return
 
 /obj/item/weapon/storage/firstaid/clotting