Merge pull request Civ13#2436 from savethetreez/branch

Fixes some reagents as drinks and fixes icons for cans

code/game/objects/map_metadata/bank_robbery.dm

@@ -6,7 +6,7 @@
 	caribbean_blocking_area_types = list(
 		/area/caribbean/no_mans_land/invisible_wall,
 		/area/caribbean/no_mans_land/invisible_wall/inside)
-	respawn_delay = 0
+	respawn_delay = 600 // 1 minute
 
 	faction_organization = list(
 		CIVILIAN,

code/game/objects/map_metadata/drug_bust.dm

@@ -6,7 +6,7 @@
 	caribbean_blocking_area_types = list(
 		/area/caribbean/no_mans_land/invisible_wall,
 		/area/caribbean/no_mans_land/invisible_wall/inside)
-	respawn_delay = 0
+	respawn_delay = 600
 
 	faction_organization = list(
 		CIVILIAN,

code/game/objects/map_metadata/hill_3234.dm

@@ -4,7 +4,7 @@
 	no_winner = "Hill 3234 is still under Soviet control."
 	lobby_icon = "icons/lobby/sovafghan.png"
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 600 // 1 minute
 	victory_time = 24000
 	no_hardcore = TRUE
 

code/game/objects/map_metadata/magistral.dm

@@ -4,7 +4,7 @@
 	no_winner = "The compound is still under the Mujahideen's control."
 	lobby_icon = "icons/lobby/magistral.png"
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall, /area/caribbean/no_mans_land/invisible_wall/one, /area/caribbean/no_mans_land/invisible_wall/two)
-	respawn_delay = 0
+	respawn_delay = 600 // 1 minute
 	victory_time = 21000
 	no_hardcore = TRUE
 

code/game/objects/map_metadata/stalingrad.dm

@@ -5,7 +5,7 @@
 	lobby_icon = "icons/lobby/stalingrad.png"
 	no_winner ="The battle for the city is still going on."
 	caribbean_blocking_area_types = list(/area/caribbean/no_mans_land/invisible_wall/taiga,/area/caribbean/no_mans_land/invisible_wall/taiga/one,/area/caribbean/no_mans_land/invisible_wall/taiga/two)
-	respawn_delay = 0
+	respawn_delay = 600 // 1 minute
 
 	faction_organization = list(
 		GERMAN,

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm

@@ -174,14 +174,14 @@
 	reagent_state = LIQUID
 	nutriment_factor = 0.9
 
-/datum/reagent/nutriment/cola
+/datum/reagent/drink/cola
 	name = "cola"
 	id = "cola"
 	description = "A sweet taste of sugar."
 	taste_description = "sweet"
 	taste_mult = 1.1
 	reagent_state = LIQUID
-	nutriment_factor = 3
+	nutrition = 1
 	color = "#120b02"
 
 /datum/reagent/nutriment/ketchup
@@ -203,20 +203,22 @@
 	nutriment_factor = TRUE
 	color = "#FFFFFF"
 
-/datum/reagent/nutriment/coconutmilk //Added new reagent for coconuts
+/datum/reagent/drink/coconutmilk //Added new reagent for coconuts
 	name = "Coconut milk"
 	id = "coconutmilk"
 	description = "A white, milky liquid, loaded with sugary sweetness."
 	taste_description = "sweetness"
-	nutriment_factor = 25
+	nutrition = 25
+	reagent_state = LIQUID
 	color = "#FFFFFF"
 
-/datum/reagent/nutriment/apricotjuice //Added new reagent for apricots
+/datum/reagent/drink/apricotjuice //Added new reagent for apricots
 	name = "Apricot juice"
 	id = "apricotjuice"
 	description = "An orange, transparant liquid, tasting of apricots."
 	taste_description = "sweetness"
-	nutriment_factor = 25
+	nutrition = 25
+	reagent_state = LIQUID
 	color = "#FFFFFF"
 
 /datum/reagent/nutriment/cherryjelly
@@ -226,7 +228,7 @@
 	taste_description = "cherry"
 	taste_mult = 1.3
 	reagent_state = LIQUID
-	nutriment_factor = TRUE
+	nutriment_factor = 1
 	color = "#801E28"
 
 /datum/reagent/nutriment/cornoil

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

@@ -884,6 +884,8 @@
 	else
 		icon_state = "[base_icon]_empty"
 	return
+/obj/item/weapon/reagent_containers/food/drinks/can/on_reagent_change()
+	update_icon()
 
 /obj/item/weapon/reagent_containers/food/drinks/can/monster
 	icon_state = "monster"