Sleepers properly inject chemicals again. (#9434)

This commit is contained in:
mikomyazaki
2020-07-24 01:06:51 +01:00
committed by GitHub
parent e0cfa596a1
commit 4dfcd2b455
2 changed files with 18 additions and 5 deletions

View File

@@ -17,9 +17,15 @@
anchored = TRUE
clicksound = 'sound/machines/buttonbeep.ogg'
clickvol = 30
var/mob/living/carbon/human/occupant = null
var/list/available_chemicals = list(/datum/reagent/inaprovaline = "Inaprovaline", /datum/reagent/soporific = "Soporific", /datum/reagent/paracetamol = "Paracetamol", /datum/reagent/dylovene = "Dylovene", /datum/reagent/dexalin = "Dexalin")
var/list/available_chemicals = list(
/datum/reagent/inaprovaline,
/datum/reagent/soporific,
/datum/reagent/paracetamol,
/datum/reagent/dylovene,
/datum/reagent/dexalin
)
var/obj/item/reagent_containers/glass/beaker = null
var/filtering = 0
var/allow_occupant_types = list(/mob/living/carbon/human)
@@ -106,7 +112,8 @@
for(var/T in available_chemicals)
var/list/reagent = list()
reagent["type"] = T
reagent["name"] = available_chemicals[T]
var/datum/reagent/C = T
reagent["name"] = initial(C.name)
if(occupant)
reagent["amount"] = occupant.reagents.get_reagent_amount(T)
reagents += list(reagent)
@@ -164,8 +171,8 @@
toggle_pump()
if(href_list["chemical"] && href_list["amount"])
if(occupant && occupant.stat != DEAD)
if(href_list["chemical"] in available_chemicals) // Your hacks are bad and you should feel bad
inject_chemical(usr, href_list["chemical"], text2num(href_list["amount"]))
if(text2path(href_list["chemical"]) in available_chemicals)
inject_chemical(usr, text2path(href_list["chemical"]), text2num(href_list["amount"]))
return 1