From 4dfcd2b455ee715d8cd84e62b19e2038c079cd92 Mon Sep 17 00:00:00 2001 From: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com> Date: Fri, 24 Jul 2020 01:06:51 +0100 Subject: [PATCH] Sleepers properly inject chemicals again. (#9434) --- code/game/machinery/Sleeper.dm | 17 ++++++++++++----- html/changelogs/fixes_sleepers.yml | 6 ++++++ 2 files changed, 18 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/fixes_sleepers.yml diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 282e3cc6974..41a0753e3dc 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -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 diff --git a/html/changelogs/fixes_sleepers.yml b/html/changelogs/fixes_sleepers.yml new file mode 100644 index 00000000000..8523fb3e37f --- /dev/null +++ b/html/changelogs/fixes_sleepers.yml @@ -0,0 +1,6 @@ +author: mikomyazaki + +delete-after: True + +changes: + - bugfix: "Sleepers will properly inject chemicals into their occupants on demand." \ No newline at end of file