Merge remote-tracking branch 'upstream/master' into universal-damage

code/game/objects/items/weapons/tanks/tanks.dm

@@ -8,7 +8,7 @@
 	slot_flags = SLOT_BACK
 	hitsound = 'sound/weapons/smash.ogg'
 	w_class = WEIGHT_CLASS_NORMAL
-	pressure_resistance = ONE_ATMOSPHERE*5
+	pressure_resistance = ONE_ATMOSPHERE * 5
 	force = 5.0
 	throwforce = 10.0
 	throw_speed = 1

code/game/objects/items/weapons/tanks/watertank.dm

@@ -279,22 +279,22 @@
 		if(Adj)
 			return //Safety check so you don't blast yourself trying to refill your tank
 		var/datum/reagents/R = reagents
-		if(R.total_volume < 50)
-			to_chat(user, "You need at least 50 units of water to use the nanofrost launcher!")
+		if(R.total_volume < 100)
+			to_chat(user, "You need at least 100 units of water to use the nanofrost launcher!")
 			return
 		if(nanofrost_cooldown)
 			to_chat(user, "Nanofrost launcher is still recharging")
 			return
 		nanofrost_cooldown = 1
-		R.remove_any(50)
+		R.remove_any(100)
 		var/obj/effect/nanofrost_container/A = new /obj/effect/nanofrost_container(get_turf(src))
 		log_game("[key_name(user)] used Nanofrost at [get_area(user)] ([user.x], [user.y], [user.z]).")
 		playsound(src,'sound/items/syringeproj.ogg',40,1)
 		for(var/a=0, a<5, a++)
 			step_towards(A, target)
-			sleep(1)
+			sleep(2)
 		A.Smoke()
-		spawn(50)
+		spawn(100)
 			if(src)
 				nanofrost_cooldown = 0
 		return