Merge branch 'master' of https://github.com/VOREStation/VOREStation

# Conflicts:
#	code/modules/admin/verbs/buildmode.dm
#	code/modules/multiz/movement.dm
#	code/modules/multiz/structures.dm
#	code/modules/multiz/turf.dm
#	config/custom_items.txt
#	vorestation.dme

code/modules/reagents/reagent_containers/glass_vr.dm

@@ -7,58 +7,57 @@
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr
 	possible_transfer_amounts = list(5,10,15,30) //Dunno why there was no '30' option before.
 	w_class = ITEMSIZE_SMALL //Why would it be the same size as a beaker?
-	var/starting_reagent //Easy way of doing this.
+	var/comes_with = list() //Easy way of doing this.
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/New()
 	..()
-	if(starting_reagent)
-		reagents.add_reagent(starting_reagent, 30)
-		update_icon()
+	for(var/R in comes_with)
+		reagents.add_reagent(R,comes_with[R])
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/bicaridine
 	name = "vial (bicaridine)"
-	starting_reagent = "bicaridine"
+	comes_with = list("bicaridine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dylovene
 	name = "vial (dylovene)"
-	starting_reagent = "dylovene"
+	comes_with = list("dylovene" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dermaline
 	name = "vial (dermaline)"
-	starting_reagent = "dermaline"
+	comes_with = list("dermaline" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/kelotane
 	name = "vial (kelotane)"
-	starting_reagent = "kelotane"
+	comes_with = list("kelotane" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/inaprovaline
 	name = "vial (inaprovaline)"
-	starting_reagent = "inaprovaline"
+	comes_with = list("inaprovaline" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalin
 	name = "vial (dexalin)"
-	starting_reagent = "dexalin"
+	comes_with = list("dexalin" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/dexalinplus
 	name = "vial (dexalinp)"
-	starting_reagent = "dexalinp"
+	comes_with = list("dexalinp" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/tricordrazine
 	name = "vial (tricordrazine)"
-	starting_reagent = "tricordrazine"
+	comes_with = list("tricordrazine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/alkysine
 	name = "vial (alkysine)"
-	starting_reagent = "alkysine"
+	comes_with = list("alkysine" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/imidazoline
 	name = "vial (imidazoline)"
-	starting_reagent = "imidazoline"
+	comes_with = list("imidazoline" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/peridaxon
 	name = "vial (peridaxon)"
-	starting_reagent = "peridaxon"
+	comes_with = list("peridaxon" = 30)
 
 /obj/item/weapon/reagent_containers/glass/beaker/vial/vr/hyronalin
 	name = "vial (hyronalin)"
-	starting_reagent = "hyronalin"
+	comes_with = list("hyronalin" = 30)

code/modules/reagents/reagent_containers/hypospray_vr.dm

@@ -48,3 +48,29 @@
 			user << "<span class='notice'>\The [src] already has a vial.</span>"
 	else
 		..()
+
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/beltminer
+	name = "Emergency trauma injector"
+	desc = "A rapid injector for emergency treatment of injuries. The warning label advises that it is not a substitute for proper medical treatment."
+	icon_state = "autoinjector"
+	item_state = "autoinjector"
+	amount_per_transfer_from_this = 10
+	volume = 10
+
+/obj/item/weapon/reagent_containers/hypospray/autoinjector/beltminer/New()
+	..()
+	reagents.add_reagent("bicaridine", 5)
+	reagents.add_reagent("tricordrazine", 3)
+	reagents.add_reagent("tramadol", 2)
+	update_icon()
+	return
+
+/obj/item/weapon/storage/box/traumainjectors
+	name = "box of emergency trauma injectors"
+	desc = "Contains emergency trauma autoinjectors."
+	icon_state = "syringe"
+
+/obj/item/weapon/storage/box/traumainjectors/New()
+	..()
+	for (var/i = 1 to 7)
+		new /obj/item/weapon/reagent_containers/hypospray/autoinjector/beltminer(src)

code/modules/reagents/reagent_containers/pill.dm

@@ -311,4 +311,4 @@
 
 /obj/item/weapon/reagent_containers/pill/diet/New()
 	..()
-	reagents.add_reagent("lipozine", 2)
+	reagents.add_reagent("lipozine", 15) //VOREStation Edit