Merge pull request #80 from Bird-Lounge/based-and-hypo-sprayed

[SEMIMODULAR] SovlMed

code/__DEFINES/reagents.dm

@@ -52,6 +52,7 @@
 #define CAT_TUBES "tubes"
 #define CAT_PILLS "pills"
 #define CAT_PATCHES "patches"
+#define CAT_HYPOS "hypos" /// DOPPLER SHIFT ADDITION
 #define DEFAULT_PATCH_STYLE "bandaid_blank"
 //used by chem master
 #define CONDIMASTER_STYLE_AUTO "auto"

code/_globalvars/lists/reagents.dm

@@ -35,6 +35,12 @@ GLOBAL_LIST_INIT(reagent_containers, list(
 	CAT_PATCHES = typecacheof(list(
 		/obj/item/reagent_containers/pill/patch/style
 	)),
+	/// DOPPLER SHIFT ADDITION BEGIN
+	CAT_HYPOS = typecacheof(list(
+		/obj/item/reagent_containers/cup/hypovial/small/style,
+		/obj/item/reagent_containers/cup/hypovial/large/style,
+	)),
+	/// DOPPLER SHIFT ADDITION END
 ))
 
 /// list of all /datum/chemical_reaction datums indexed by their typepath. Use this for general lookup stuff

code/game/gamemodes/objective_items.dm

@@ -389,16 +389,21 @@
 
 /datum/objective_item/steal/hypo
 	name = "the hypospray"
-	targetitem = /obj/item/reagent_containers/hypospray/cmo
+	targetitem = /obj/item/hypospray/mkii/deluxe/cmo
 	excludefromjob = list(JOB_CHIEF_MEDICAL_OFFICER)
 	item_owner = list(JOB_CHIEF_MEDICAL_OFFICER)
 	exists_on_map = TRUE
 	difficulty = 3
 	steal_hint = "The Chief Medical Officer's personal medical injector. \
 		Usually found amongst their medical supplies on their person, in their belt, or otherwise in their locker."
 
-/obj/item/reagent_containers/hypospray/cmo/add_stealing_item_objective()
-	return add_item_to_steal(src, /obj/item/reagent_containers/hypospray/cmo)
+/// DOPPLER SHIFT REMOVAL BEGIN
+/*/obj/item/reagent_containers/hypospray/cmo/add_stealing_item_objective()
+	return add_item_to_steal(src, /obj/item/reagent_containers/hypospray/cmo)*/
+/// DOPPLER SHIFT REMOVAL END, REPLACEMENT BEGIN
+/obj/item/hypospray/mkii/deluxe/cmo/add_stealing_item_objective()
+	return add_item_to_steal(src, /obj/item/hypospray/mkii/deluxe/cmo)
+/// DOPPLER SHIFT EDIT END
 
 /datum/objective_item/steal/nukedisc
 	name = "the nuclear authentication disk"

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

@@ -270,6 +270,11 @@
 		/obj/item/reagent_containers/cup/bottle,
 		/obj/item/reagent_containers/cup/tube,
 		/obj/item/reagent_containers/hypospray,
+		/// DOPPLER SHIFT ADDITION BEGIN
+		/obj/item/storage/hypospraykit,
+		/obj/item/hypospray/mkii,
+		/obj/item/reagent_containers/cup/hypovial,
+		/// DOPPLER SHIFT ADDITION END
 		/obj/item/reagent_containers/medigel,
 		/obj/item/reagent_containers/pill,
 		/obj/item/reagent_containers/spray,

code/game/objects/structures/crates_lockers/closets/secure/medical.dm

@@ -99,7 +99,7 @@
 	. = ..()
 
 	// Traitor steal objective
-	new /obj/item/reagent_containers/hypospray/cmo(src)
+	//new /obj/item/reagent_containers/hypospray/cmo(src) /// DOPPLER SHIFT REMOVAL
 
 /obj/structure/closet/secure_closet/animal
 	name = "animal control locker"

code/modules/hallucination/fake_message.dm

@@ -42,7 +42,7 @@
 				/obj/item/melee/cultblade/dagger,
 				/obj/item/melee/energy,
 				/obj/item/powersink, //this is a bulky item what
-				/obj/item/reagent_containers/hypospray/cmo,
+				/obj/item/hypospray/mkii/deluxe/cmo, /// DOPPLER SHIFT EDIT: changing to our hypospray path
 				/obj/item/spellbook,
 			)
 			var/obj/item/stashed_item = pick(stash_item_paths)

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

@@ -162,6 +162,7 @@
 			CAT_TUBES = GLOB.reagent_containers[CAT_TUBES],
 			CAT_PILLS = GLOB.reagent_containers[CAT_PILLS],
 			CAT_PATCHES = GLOB.reagent_containers[CAT_PATCHES],
+			CAT_HYPOS = GLOB.reagent_containers[CAT_HYPOS], /// DOPPLER SHIFT ADDITION
 		)
 	return containers
 

code/modules/reagents/reagent_containers/cups/bottle.dm

@@ -485,7 +485,7 @@
 	amount_per_transfer_from_this = 5
 	spillable = FALSE
 	///variable to tell if the bottle can be refilled
-	var/cap_on = TRUE
+	//var/cap_on = TRUE /// DOPPLER SHIFT REMOVAL
 
 /obj/item/reagent_containers/cup/bottle/syrup_bottle/examine(mob/user)
 	. = ..()
@@ -523,7 +523,8 @@
 
 	return TRUE
 
-/obj/item/reagent_containers/cup/bottle/syrup_bottle/click_alt(mob/user)
+/// DOPPLER SHIFT REMOVAL BEGIN
+/*/obj/item/reagent_containers/cup/bottle/syrup_bottle/click_alt(mob/user)
 	cap_on = !cap_on
 	if(!cap_on)
 		icon_state = "syrup_open"
@@ -532,7 +533,8 @@
 		icon_state = "syrup"
 		balloon_alert(user, "put pump cap on")
 	update_icon_state()
-	return CLICK_ACTION_SUCCESS
+	return CLICK_ACTION_SUCCESS*/
+/// DOPPLER SHIFT REMOVAL END
 
 /obj/item/reagent_containers/cup/bottle/syrup_bottle/proc/rename(mob/user, obj/item/writing_instrument)
 	if(!user.can_write(writing_instrument))

code/modules/reagents/reagent_containers/cups/drinks.dm

@@ -219,21 +219,25 @@
 	fill_icon_thresholds = list(0, 10, 25, 50, 75, 80, 90)
 	isGlass = FALSE
 	// The 2 bottles have separate cap overlay icons because if the bottle falls over while bottle flipping the cap stays fucked on the moved overlay
-	var/cap_icon = 'icons/obj/drinks/drink_effects.dmi'
+	/// DOPPLER SHIFT REMOVAL BEGIN - everything has caps now
+	/*var/cap_icon = 'icons/obj/drinks/drink_effects.dmi'
 	var/cap_icon_state = "bottle_cap_small"
 	var/cap_on = TRUE
 	var/cap_lost = FALSE
-	var/mutable_appearance/cap_overlay
+	var/mutable_appearance/cap_overlay*/
+	/// DOPPLER SHIFT REMOVAL END
 	var/flip_chance = 10
 	custom_price = PAYCHECK_LOWER * 0.8
 
-/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload)
+/// DOPPLER SHIFT REMOVAL BEGIN
+/*/obj/item/reagent_containers/cup/glass/waterbottle/Initialize(mapload)
 	cap_overlay = mutable_appearance(cap_icon, cap_icon_state)
 	. = ..()
 	if(cap_on)
 		spillable = FALSE
 		update_appearance()
 
+
 /obj/item/reagent_containers/cup/glass/waterbottle/update_overlays()
 	. = ..()
 	if(cap_on)
@@ -302,7 +306,8 @@
 			to_chat(user, span_warning("[other_bottle] has a cap firmly twisted on!"))
 			return ITEM_INTERACT_BLOCKING
 
-	return ..()
+	return ..()*/
+/// DOPPLER SHIFT REMOVAL END
 
 // heehoo bottle flipping
 /obj/item/reagent_containers/cup/glass/waterbottle/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)

code/modules/unit_tests/bake_a_cake.dm

@@ -10,6 +10,9 @@
 	var/obj/structure/table/the_table = allocate(/obj/structure/table, table_loc)
 	var/obj/item/knife/kitchen/a_knife = allocate(/obj/item/knife/kitchen, table_loc)
 	var/obj/item/reagent_containers/cup/beaker/beaker = allocate(/obj/item/reagent_containers/cup/beaker, table_loc)
+	/// DOPPLER SHIFT ADDITION BEGIN
+	beaker.set_cap_status(FALSE)
+	/// DOPPLER SHIFT ADDITION END
 	var/obj/item/reagent_containers/condiment/flour/flour_bag = allocate(/obj/item/reagent_containers/condiment/flour, table_loc)
 	var/obj/item/reagent_containers/condiment/sugar/sugar_bag = allocate(/obj/item/reagent_containers/condiment/sugar, table_loc)
 	var/obj/item/storage/fancy/egg_box/egg_box = allocate(/obj/item/storage/fancy/egg_box, table_loc)

modular_doppler/deforest_medical_items/code/storage_items.dm

@@ -257,7 +257,7 @@
 		/obj/item/healthanalyzer,
 		/obj/item/hemostat,
 		/obj/item/holosign_creator/medical,
-//		/obj/item/hypospray,
+		/obj/item/hypospray,
 		/obj/item/implant,
 		/obj/item/implantcase,
 		/obj/item/implanter,
@@ -268,7 +268,7 @@
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/cup/beaker,
 		/obj/item/reagent_containers/cup/bottle,
-//		/obj/item/reagent_containers/cup/vial,
+		/obj/item/reagent_containers/cup/hypovial,
 		/obj/item/reagent_containers/cup/tube,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/medigel,
@@ -283,6 +283,7 @@
 		/obj/item/tank/internals/emergency_oxygen,
 		/obj/item/storage/box/bandages,
 		/obj/item/bodybag,
+		/obj/item/storage/hypospraykit,
 	))
 
 // Big surgical kit that can be worn like a bag, holds 14 normal items (more than what a backpack can do!) but works like a duffelbag
@@ -354,7 +355,7 @@
 		/obj/item/healthanalyzer,
 		/obj/item/hemostat,
 		/obj/item/holosign_creator/medical,
-//		/obj/item/hypospray,
+		/obj/item/hypospray,
 		/obj/item/implant,
 		/obj/item/implantcase,
 		/obj/item/implanter,
@@ -367,7 +368,7 @@
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/cup/beaker,
 		/obj/item/reagent_containers/cup/bottle,
-//		/obj/item/reagent_containers/cup/vial,
+		/obj/item/reagent_containers/cup/hypovial,
 		/obj/item/reagent_containers/cup/tube,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/medigel,
@@ -390,6 +391,7 @@
 		/obj/item/emergency_bed,
 		/obj/item/storage/box/bandages,
 		/obj/item/bodybag,
+		/obj/item/storage/hypospraykit,
 	))
 
 // Midrange bag for paramedics, hypospray and more flexible item wise than surgical, but restricted to small items only
@@ -429,10 +431,10 @@
 		/obj/item/stack/medical/suture/medicated = 2,
 		/obj/item/stack/medical/gauze/sterilized = 1,
 		/obj/item/storage/pill_bottle/painkiller = 1,
-//		/obj/item/hypospray/mkii/piercing/atropine = 1,
-//		/obj/item/reagent_containers/cup/vial/small/libital = 1,
-//		/obj/item/reagent_containers/cup/vial/small/lenturi = 1,
-//		/obj/item/reagent_containers/cup/vial/small/seiver = 1,
+		/obj/item/hypospray/mkii/piercing/atropine = 1,
+		/obj/item/reagent_containers/cup/hypovial/small/libital = 1,
+		/obj/item/reagent_containers/cup/hypovial/small/lenturi = 1,
+		/obj/item/reagent_containers/cup/hypovial/small/seiver = 1,
 		/obj/item/healthanalyzer = 1,
 	)
 	generate_items_inside(items_inside,src)
@@ -461,7 +463,7 @@
 		/obj/item/healthanalyzer,
 		/obj/item/hemostat,
 		/obj/item/holosign_creator/medical,
-//		/obj/item/hypospray,
+		/obj/item/hypospray,
 		/obj/item/implant,
 		/obj/item/implantcase,
 		/obj/item/implanter,
@@ -472,7 +474,7 @@
 		/obj/item/reagent_containers/dropper,
 		/obj/item/reagent_containers/cup/beaker,
 		/obj/item/reagent_containers/cup/bottle,
-//		/obj/item/reagent_containers/cup/vial,
+		/obj/item/reagent_containers/cup/hypovial,
 		/obj/item/reagent_containers/cup/tube,
 		/obj/item/reagent_containers/hypospray,
 		/obj/item/reagent_containers/medigel,
@@ -490,4 +492,5 @@
 		/obj/item/tank/internals/emergency_oxygen,
 		/obj/item/storage/box/bandages,
 		/obj/item/bodybag,
+		/obj/item/storage/hypospraykit,
 	))

modular_doppler/modular_cosmetics/GAGS/greyscale_configs_sets.dm

@@ -48,3 +48,23 @@
 /datum/greyscale_config/maid_headband/worn
 	name = "Maid Headband (Worn)"
 	icon_file = 'modular_doppler/modular_cosmetics/GAGS/icons/mob/maid_costume_worn.dmi'
+
+
+//////////////
+//HYPOSPRAYS//
+//////////////
+
+/datum/greyscale_config/hypokit
+	name = "Hypospray Kit"
+	icon_file = 'modular_doppler/modular_items/hyposprays/icons/hypokits.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/items/hypokit.json'
+
+/datum/greyscale_config/hypospray_mkii
+	name = "Hypospray Mk. II"
+	icon_file = 'modular_doppler/modular_items/hyposprays/icons/hyposprays.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/items/hypospray.json'
+
+/datum/greyscale_config/hypovial
+	name = "Hypovial"
+	icon_file = 'modular_doppler/modular_items/hyposprays/icons/vials.dmi'
+	json_config = 'modular_doppler/modular_cosmetics/GAGS/json_configs/items/hypovial.json'

modular_doppler/modular_cosmetics/GAGS/json_configs/items/hypokit.json

@@ -0,0 +1,41 @@
+{
+	"custom-mini": [
+		{
+			"type": "icon_state",
+			"icon_state": "standard-box",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "standard-face",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"deluxe-custom-mini": [
+		{
+			"type": "icon_state",
+			"icon_state": "deluxe-box-normal",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "deluxe-face",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	],
+	"tactical-custom-mini": [
+		{
+			"type": "icon_state",
+			"icon_state": "deluxe-box-tactical",
+			"blend_mode": "overlay"
+		},
+		{
+			"type": "icon_state",
+			"icon_state": "deluxe-face",
+			"blend_mode": "overlay",
+			"color_ids": [ 1 ]
+		}
+	]
+}