Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28

modular_citadel/code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -17,13 +17,13 @@
 	M.adjustStaminaLoss(-5*REM)
 	. = ..()
 
-/datum/reagent/syndicateadrenals/on_mob_add(mob/living/M)
+/datum/reagent/syndicateadrenals/on_mob_metabolize(mob/living/M)
 	. = ..()
 	if(istype(M))
 		M.next_move_modifier *= 0.5
 		to_chat(M, "<span class='notice'>You feel an intense surge of energy rushing through your veins.</span>")
 
-/datum/reagent/syndicateadrenals/on_mob_delete(mob/living/M)
+/datum/reagent/syndicateadrenals/on_mob_end_metabolize(mob/living/M)
 	. = ..()
 	if(istype(M))
 		M.next_move_modifier *= 2

modular_citadel/code/modules/reagents/reagent container/hypovial.dm

@@ -16,6 +16,7 @@
 						"purple hypovial" = "hypovial-p",
 						"black hypovial" = "hypovial-t"
 						)
+	always_reskinnable = TRUE
 
 /obj/item/reagent_containers/glass/bottle/vial/Initialize()
 	. = ..()
@@ -29,17 +30,6 @@
 /obj/item/reagent_containers/glass/bottle/vial/on_reagent_change()
 	update_icon()
 
-/obj/item/reagent_containers/glass/bottle/vial/reskin_obj(mob/M) //Makes the vials completely reskinnable, and renames them - overrides /obj/proc/reskin_obj
-	if(!LAZYLEN(unique_reskin))
-		return
-	var/choice = input(M,"Do you wish to recolour your [src]?","Vial Recolour") as null|anything in unique_reskin
-	if(!QDELETED(src) && choice && !current_skin && !M.incapacitated() && in_range(M,src))
-		if(!unique_reskin[choice])
-			return
-		icon_state = unique_reskin[choice]
-		name = choice
-		to_chat(M, "[src] is now skinned as '[choice].'")
-
 /obj/item/reagent_containers/glass/bottle/vial/update_icon()
 	cut_overlays()
 	if(reagents.total_volume)