Hypospray kits and reworks! (#5907)

* Adds Hypospray kits, fixes reagent overlays

Also adds colors to trek chems other than PINK.

* reee admins.txt

* adds the CMO Hypo MK II kit to the CMO's locker

renames the locker overrides as well, because lazy

* grammer gud

* hypo vial fix suggested by Kfive

* Modifies hypospray functions

* Fixed the Hypospray mk.II, is now comprehensive where it must.

* Fixed bugs, including the vending machine problem.

* Either fixed or didn't fix line terminator issues.

* Turns out there were no line ending problems, rather there were literally spaces after some lines, which got removed automatically.

* Forgot a comma.

* Forgot a comma, even though it's in a comment. Good thing I caught it before somebody tried decommenting it.

* Left a line in the alternative reskin function for hypovials. This has been removed since it's unnecessary.

* delay tweaks. otherwise all good.

* reee github

* unneeded \the I thought were purged

* grammar fix, gives MDs and Chemist hypokits

* Makes chem masters able to produce vials

* recompiles tgui

* Update belt.dm

code/game/machinery/vending.dm

@@ -849,25 +849,27 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	icon_deny = "med-deny"
 	product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!"
 	req_access_txt = "5"
-	products = list(/obj/item/reagent_containers/syringe = 12, 
-					/obj/item/reagent_containers/dropper = 3, 
-					/obj/item/device/healthanalyzer = 4, 
-					/obj/item/device/sensor_device = 2, 
+	/*
+	products = list(/obj/item/reagent_containers/syringe = 12,
+					/obj/item/reagent_containers/dropper = 3,
+					/obj/item/device/healthanalyzer = 4,
+					/obj/item/device/sensor_device = 2,
 					/obj/item/pinpointer/crew = 2,
 					/obj/item/reagent_containers/medspray/sterilizine = 1,
-					/obj/item/stack/medical/gauze = 8, 
-					/obj/item/reagent_containers/pill/patch/styptic = 5, 
-					/obj/item/reagent_containers/medspray/styptic = 2, 
-					/obj/item/reagent_containers/pill/patch/silver_sulf = 5, 
+					/obj/item/stack/medical/gauze = 8,
+					/obj/item/reagent_containers/pill/patch/styptic = 5,
+					/obj/item/reagent_containers/medspray/styptic = 2,
+					/obj/item/reagent_containers/pill/patch/silver_sulf = 5,
 					/obj/item/reagent_containers/medspray/silver_sulf = 2,
 					/obj/item/reagent_containers/pill/insulin = 10,
-					/obj/item/reagent_containers/pill/salbutamol = 2, 
-					/obj/item/reagent_containers/glass/bottle/charcoal = 4, 
-					/obj/item/reagent_containers/glass/bottle/epinephrine = 4, 
+					/obj/item/reagent_containers/pill/salbutamol = 2,
+					/obj/item/reagent_containers/glass/bottle/charcoal = 4,
+					/obj/item/reagent_containers/glass/bottle/epinephrine = 4,
 					/obj/item/reagent_containers/glass/bottle/salglu_solution = 3,
-					/obj/item/reagent_containers/glass/bottle/morphine = 4, 
-					/obj/item/reagent_containers/glass/bottle/toxin = 3, 
+					/obj/item/reagent_containers/glass/bottle/morphine = 4,
+					/obj/item/reagent_containers/glass/bottle/toxin = 3,
 					/obj/item/reagent_containers/syringe/antiviral = 6)
+					*/ //products list in modular_citadel's version of this file
 	contraband = list(/obj/item/reagent_containers/pill/tox = 3, /obj/item/reagent_containers/pill/morphine = 4, /obj/item/reagent_containers/pill/charcoal = 6)
 	premium = list(/obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/storage/belt/medical = 3, /obj/item/wrench/medical = 1)
 	armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
@@ -1066,15 +1068,15 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C
 	icon_state = "engivend"
 	icon_deny = "engivend-deny"
 	req_access_txt = "11" //Engineering Equipment access
-	products = list(/obj/item/clothing/glasses/meson/engine = 2, 
+	products = list(/obj/item/clothing/glasses/meson/engine = 2,
 					/obj/item/clothing/glasses/welding = 3,
-					/obj/item/device/multitool = 4, 
-					/obj/item/construction/rcd/loaded = 3, 
+					/obj/item/device/multitool = 4,
+					/obj/item/construction/rcd/loaded = 3,
 					/obj/item/grenade/chem_grenade/smart_metal_foam = 10,
-					/obj/item/device/geiger_counter = 5, 
+					/obj/item/device/geiger_counter = 5,
 					/obj/item/stock_parts/cell/high = 10,
-					/obj/item/electronics/airlock = 10, 
-					/obj/item/electronics/apc = 10, 
+					/obj/item/electronics/airlock = 10,
+					/obj/item/electronics/apc = 10,
 					/obj/item/electronics/airalarm = 10)
 	contraband = list(/obj/item/stock_parts/cell/potato = 3)
 	premium = list(/obj/item/storage/belt/utility = 3, /obj/item/storage/box/smart_metal_foam = 1)

code/game/objects/items/storage/belt.dm

@@ -160,9 +160,10 @@
 		/obj/item/gun/syringe/syndicate,
 		/obj/item/implantcase,
 		/obj/item/implant,
-		/obj/item/implanter
+		/obj/item/implanter,
+		/obj/item/hypospray
 		)
-
+		// CIT CHANGE added hypospray mk IIs to belt /obj/item/hypospray
 
 /obj/item/storage/belt/security
 	name = "security belt"

code/game/objects/items/vending_items.dm

@@ -75,11 +75,13 @@
 	charges = list(37, 4, 4)// of 111 standard, 12 contraband, 10 premium(?)
 	init_charges = list(37, 4, 4)
 
+/*
 /obj/item/vending_refill/medical
 	machine_name = "NanoMed"
 	icon_state = "refill_medical"
 	charges = list(26, 5, 3)// of 76 standard, 13 contraband, 8 premium
 	init_charges = list(26, 5, 3)
+*/ //I don't know how citadel change comments work, see the modular_citadel folder instead.
 
 /obj/item/vending_refill/donksoft
 	machine_name = "Donksoft Toy Vendor"

code/modules/clothing/suits/labcoat.dm

@@ -5,7 +5,7 @@
 	item_state = "labcoat"
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST|ARMS
-	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/device/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman)
+	allowed = list(/obj/item/device/analyzer, /obj/item/stack/medical, /obj/item/dnainjector, /obj/item/reagent_containers/dropper, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer, /obj/item/device/flashlight/pen, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/pill, /obj/item/storage/pill_bottle, /obj/item/paper, /obj/item/melee/classic_baton/telescopic, /obj/item/soap, /obj/item/device/sensor_device, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman,/obj/item/hypospray) //CITADEL ADD, Hyposprays to laboats
 	armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50)
 	togglename = "buttons"
 	species_exception = list(/datum/species/golem)

code/modules/reagents/chemistry/machinery/chem_master.dm

@@ -307,6 +307,34 @@
 					reagents.trans_to(P, vol_part)
 			. = TRUE
 
+		if("createvial")
+			var/many = params["many"]
+			if(reagents.total_volume == 0)
+				return
+
+			var/amount_full = 0
+			var/vol_part = min(reagents.total_volume, 30)
+			if(text2num(many))
+				amount_full = round(reagents.total_volume / 30)
+				vol_part = reagents.total_volume % 30
+			var/name = stripped_input(usr, "Name:","Name your hypovial!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
+			if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, BE_CLOSE))
+				return
+
+			var/obj/item/reagent_containers/glass/bottle/vial/small/V
+			for(var/i = 0; i < amount_full; i++)
+				V = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
+				V.name = trim("[name] hypovial")
+				adjust_item_drop_location(V)
+				reagents.trans_to(V, 30)
+
+			if(vol_part)
+				V = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location())
+				V.name = trim("[name] hypovial")
+				adjust_item_drop_location(V)
+				reagents.trans_to(V, vol_part)
+			. = TRUE
+
 		if("analyze")
 			var/datum/reagent/R = GLOB.chemical_reagents_list[params["id"]]
 			if(R)

code/modules/reagents/chemistry/reagents/medicine_reagents.dm

@@ -931,7 +931,7 @@
 	id = "bicaridine"
 	description = "Restores bruising. Overdose causes it instead."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#BF0000"
 	overdose_threshold = 30
 
 /datum/reagent/medicine/bicaridine/on_mob_life(mob/living/M)
@@ -949,7 +949,7 @@
 	id = "dexalin"
 	description = "Restores oxygen loss. Overdose causes it instead."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#0080FF"
 	overdose_threshold = 30
 
 /datum/reagent/medicine/dexalin/on_mob_life(mob/living/M)
@@ -967,7 +967,7 @@
 	id = "kelotane"
 	description = "Restores fire damage. Overdose causes it instead."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#FFA800"
 	overdose_threshold = 30
 
 /datum/reagent/medicine/kelotane/on_mob_life(mob/living/M)
@@ -985,7 +985,7 @@
 	id = "antitoxin"
 	description = "Heals toxin damage and removes toxins in the bloodstream. Overdose causes toxin damage."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#00A000"
 	overdose_threshold = 30
 	taste_description = "a roll of gauze"
 
@@ -1006,7 +1006,7 @@
 	id = "inaprovaline"
 	description = "Stabilizes the breathing of patients. Good for those in critical condition."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#00BFFF"
 
 /datum/reagent/medicine/inaprovaline/on_mob_life(mob/living/M)
 	if(M.losebreath >= 5)
@@ -1018,7 +1018,7 @@
 	id = "tricordrazine"
 	description = "Has a high chance to heal all types of damage. Overdose instead causes it."
 	reagent_state = LIQUID
-	color = "#C8A5DC"
+	color = "#8040FF"
 	overdose_threshold = 30
 	taste_description = "grossness"