This commit is contained in:
Fox-McCloud
2016-07-01 19:59:09 -04:00
parent cf1a584995
commit fa240a7c56
3 changed files with 2 additions and 20 deletions
@@ -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, "<span class='notice'>You disable the safeties on the [src].</span>")
safety_override = 1
else
to_chat(user, "<span class='notice'>You re-enable the safeties on the [src].</span>")
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))
-7
View File
@@ -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, "<span class='warning'>The patch is sealed already.</span>")
else
to_chat(user, "<span class='notice'>You press the emag onto the patch. The current from the emag closes the tamper-proof seal.</span>")
instant_application = 1
/obj/item/weapon/reagent_containers/food/pill/patch/afterattack(obj/target, mob/user , proximity)
return // thanks inheritance again