Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

# Conflicts:
#	code/modules/mob/dead/observer/observer.dm
#	code/modules/mob/living/carbon/human/life.dm
#	code/modules/mob/mob_defines.dm
#	html/changelogs/.all_changelog.yml
#	vorestation.dme

code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm

@@ -95,7 +95,7 @@
 	if(alien == IS_SKRELL)
 		strength_mod *= 5
 	if(alien == IS_TAJARA)
-		strength_mod *= 1.75
+		strength_mod *= 1.25
 	if(alien == IS_UNATHI)
 		strength_mod *= 0.75
 	if(alien == IS_DIONA)

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

@@ -1799,6 +1799,7 @@
 	reagent_state = LIQUID
 	color = "#7F00FF"
 	strength = 10
+	druggy = 15
 
 	glass_name = "Pan-Galactic Gargle Blaster"
 	glass_desc = "Does... does this mean that Arthur and Ford are on the station? Oh joy."
@@ -2232,8 +2233,8 @@
 	glass_name = "special blend whiskey"
 	glass_desc = "Just when you thought regular station whiskey was good... This silky, amber goodness has to come along and ruin everything."
 
-/datum/reagent/ethanol/unathiliquor	//Needs a better name
-	name = "Unathi Liquor"
+/datum/reagent/ethanol/unathiliquor
+	name = "Redeemer's Brew"
 	id = "unathiliquor"
 	description = "This barely qualifies as a drink, and could give jetfuel a run for its money. Also known to cause feelings of euphoria and numbness."
 	taste_description = "spiced numbness"

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

@@ -407,6 +407,16 @@
 	..()
 	reagents.add_reagent("pwine", 100)
 
+/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew
+	name = "Redeemer's Brew"
+	desc = "Just opening the top of this bottle makes you feel a bit tipsy. Not for the faint of heart."
+	icon_state = "redeemersbrew"
+	center_of_mass = list("x"=16, "y"=3)
+
+/obj/item/weapon/reagent_containers/food/drinks/bottle/redeemersbrew/New()
+	..()
+	reagents.add_reagent("unathiliquor", 100)
+
 //////////////////////////JUICES AND STUFF ///////////////////////
 
 /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice

code/modules/reagents/reagent_containers/hypospray.dm

@@ -14,11 +14,19 @@
 	possible_transfer_amounts = null
 	flags = OPENCONTAINER
 	slot_flags = SLOT_BELT
+	var/reusable = 1
+	var/used = 0
+	var/filled = 0
+	var/list/filled_reagents = list()
 
-///obj/item/weapon/reagent_containers/hypospray/New() //comment this to make hypos start off empty
-//	..()
-//	reagents.add_reagent("tricordrazine", 30)
-//	return
+/obj/item/weapon/reagent_containers/hypospray/New()
+	..()
+	if(filled)
+		if(filled_reagents)
+			for(var/r in filled_reagents)
+				reagents.add_reagent(r, filled_reagents[r])
+	update_icon()
+	return
 
 /obj/item/weapon/reagent_containers/hypospray/do_surgery(mob/living/carbon/M, mob/living/user)
 	if(user.a_intent != I_HELP) //in case it is ever used as a surgery tool
@@ -53,6 +61,9 @@
 		admin_inject_log(user, M, src, contained, trans)
 		user << "<span class='notice'>[trans] units injected. [reagents.total_volume] units remaining in \the [src].</span>"
 
+	if(!reusable && !used)
+		used = !used
+
 	return
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector
@@ -62,59 +73,52 @@
 	item_state = "autoinjector"
 	amount_per_transfer_from_this = 5
 	volume = 5
+	reusable = 0
+	filled = 1
+	filled_reagents = list("inaprovaline" = 5)
 
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/New()
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/on_reagent_change()
 	..()
-	reagents.add_reagent("inaprovaline", 5)
 	update_icon()
-	return
+
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/empty
+	filled = 0
+	filled_reagents = list()
+
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/used
+	used = 1
+	filled_reagents = list()
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/attack(mob/M as mob, mob/user as mob)
 	..()
-	if(reagents.total_volume <= 0) //Prevents autoinjectors to be refilled.
+	if(used) //Prevents autoinjectors to be refilled.
 		flags &= ~OPENCONTAINER
 	update_icon()
 	return
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/update_icon()
-	if(reagents.total_volume > 0)
+	if(!used && reagents.reagent_list.len)
 		icon_state = "[initial(icon_state)]1"
-	else
+	else if(used)
 		icon_state = "[initial(icon_state)]0"
+	else
+		icon_state = "[initial(icon_state)]2"
 
 /obj/item/weapon/reagent_containers/hypospray/autoinjector/examine(mob/user)
 	..(user)
 	if(reagents && reagents.reagent_list.len)
 		user << "<span class='notice'>It is currently loaded.</span>"
-	else
+	else if(used)
 		user << "<span class='notice'>It is spent.</span>"
+	else
+		user << "<span class='notice'>It is currently unloaded.</span>"
 
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/clotting
 	name = "clotting agent"
-	desc = "A rapid and safe way to administer clotting drugs by untrained or trained personnel."
-	icon_state = "autoinjector"
-	item_state = "autoinjector"
-	amount_per_transfer_from_this = 10
-	volume = 10
+	desc = "A refined version of the standard autoinjector, allowing greater capacity. This variant excels at treating bleeding wounds and internal bleeding."
+	filled_reagents = list("inaprovaline" = 5, "myelamine" = 10)
 
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/clotting/New()
-	..()
-	reagents.remove_reagent("inaprovaline", 5)
-	reagents.add_reagent("myelamine", 10)
-	update_icon()
-	return
-
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/biginjector/bonemed
 	name = "bone repair injector"
-	desc = "A rapid and safe way to administer advanced drugs by untrained or trained personnel."
-	icon_state = "autoinjector"
-	item_state = "autoinjector"
-	amount_per_transfer_from_this = 10
-	volume = 10
-
-/obj/item/weapon/reagent_containers/hypospray/autoinjector/bonemed/New()
-	..()
-	reagents.remove_reagent("inaprovaline", 5)
-	reagents.add_reagent("osteodaxon", 10)
-	update_icon()
-	return
+	desc = "A refined version of the standard autoinjector, allowing greater capacity. This one excels at treating damage to bones."
+	filled_reagents = list("inaprovaline" = 5, "osteodaxon" = 10)