diff --git a/code/_globalvars/lists/reagents.dm b/code/_globalvars/lists/reagents.dm index ca78e4ea14c..23d310be857 100644 --- a/code/_globalvars/lists/reagents.dm +++ b/code/_globalvars/lists/reagents.dm @@ -62,5 +62,5 @@ var/global/list/plant_blocked_chems = list() //filled in /datum/reagents/New() w var/global/list/safe_chem_list = list("antihol", "charcoal", "epinephrine", "insulin", "teporone","silver_sulfadiazine", "salbutamol", "omnizine", "stimulants", "synaptizine", "potass_iodide", "oculine", "mannitol", "styptic_powder", - "methamphetamine", "spaceacillin", "salglu_solution", "sal_acid", "cryoxadone", "blood", "synthflesh", - "hydrocodone", "mitocholide", "rezadone") \ No newline at end of file + "spaceacillin", "salglu_solution", "sal_acid", "cryoxadone", "blood", "synthflesh", "hydrocodone", + "mitocholide", "rezadone") \ No newline at end of file diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 3cafce27363..b0200b22ab2 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -398,7 +398,6 @@ var/pillsprite = "1" var/client/has_sprites = list() var/printing = null - var/safety_override = 0 /obj/machinery/chem_master/New() var/datum/reagents/R = new/datum/reagents(100) @@ -427,14 +426,6 @@ spawn(rand(0, 15)) stat |= NOPOWER -/obj/machinery/chem_master/emag_act(mob/user) - if(!safety_override) - to_chat(user, "You disable the safeties on the [src].") - safety_override = 1 - else - to_chat(user, "You re-enable the safeties on the [src].") - safety_override = 0 - /obj/machinery/chem_master/attackby(var/obj/item/weapon/B as obj, var/mob/user as mob, params) if(istype(B, /obj/item/weapon/reagent_containers/glass) || istype(B, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass)) @@ -771,8 +762,6 @@ return 0 /obj/machinery/chem_master/proc/chemical_safety_check(datum/reagents/R) - if(safety_override) - return 1 var/all_safe = 1 for(var/datum/reagent/A in R.reagent_list) if(!safe_chem_list.Find(A.id)) diff --git a/code/modules/reagents/newchem/patch.dm b/code/modules/reagents/newchem/patch.dm index 43b82ce3fb1..f686d293c24 100644 --- a/code/modules/reagents/newchem/patch.dm +++ b/code/modules/reagents/newchem/patch.dm @@ -10,13 +10,6 @@ apply_method = "apply" transfer_efficiency = 0.5 //patches aren't as effective at getting chemicals into the bloodstream. -/obj/item/weapon/reagent_containers/food/pill/patch/emag_act(mob/user) - if(instant_application) - to_chat(user, "The patch is sealed already.") - else - to_chat(user, "You press the emag onto the patch. The current from the emag closes the tamper-proof seal.") - instant_application = 1 - /obj/item/weapon/reagent_containers/food/pill/patch/afterattack(obj/target, mob/user , proximity) return // thanks inheritance again