diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 75571a70d7..42904383bb 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -250,7 +250,6 @@ data["occupant"]["fireLoss"] = mob_occupant.getFireLoss() data["occupant"]["cloneLoss"] = mob_occupant.getCloneLoss() data["occupant"]["brainLoss"] = mob_occupant.getOrganLoss(ORGAN_SLOT_BRAIN) - data["occupant"]["reagents"] = list() if(mob_occupant.reagents.reagent_list.len) for(var/datum/reagent/R in mob_occupant.reagents.reagent_list) @@ -284,7 +283,7 @@ else blood_type = blood_id data["blood_status"] = "Patient has [blood_type] type blood. [blood_warning]" - data["blood_levels"] = blood_percent - (rand(1,35)) + data["blood_levels"] = blood_percent return data /obj/machinery/sleeper/ui_act(action, params) diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index 2e402da2ba..9899d219bf 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -330,7 +330,7 @@ if(P.icon_state == "pill4") P.desc = "A tablet or capsule, but not just any, a red one, one taken by the ones not scared of knowledge, freedom, uncertainty and the brutal truths of reality." adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "patch") var/obj/item/reagent_containers/pill/patch/P @@ -338,7 +338,7 @@ P = new/obj/item/reagent_containers/pill/patch(drop_location()) P.name = trim("[name] patch") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "bottle") var/obj/item/reagent_containers/glass/bottle/P @@ -346,7 +346,7 @@ P = new/obj/item/reagent_containers/glass/bottle(drop_location()) P.name = trim("[name] bottle") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "condimentPack") var/obj/item/reagent_containers/food/condiment/pack/P @@ -355,7 +355,7 @@ P.originalname = name P.name = trim("[name] pack") P.desc = "A small condiment pack. The label says it contains [name]." - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "condimentBottle") var/obj/item/reagent_containers/food/condiment/P @@ -363,7 +363,7 @@ P = new/obj/item/reagent_containers/food/condiment(drop_location()) P.originalname = name P.name = trim("[name] bottle") - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "hypoVial") var/obj/item/reagent_containers/glass/bottle/vial/small/P @@ -371,7 +371,7 @@ P = new/obj/item/reagent_containers/glass/bottle/vial/small(drop_location()) P.name = trim("[name] hypovial") adjust_item_drop_location(P) - reagents.trans_to(P, vol_each, transfered_by = usr) + reagents.trans_to(P, vol_each) return TRUE if(item_type == "smartDart") var/obj/item/reagent_containers/syringe/dart/P diff --git a/tgui-next/packages/tgui/interfaces/Sleeper.js b/tgui-next/packages/tgui/interfaces/Sleeper.js index 45cd38e6e9..dabf0f355d 100644 --- a/tgui-next/packages/tgui/interfaces/Sleeper.js +++ b/tgui-next/packages/tgui/interfaces/Sleeper.js @@ -2,7 +2,7 @@ import { useBackend } from '../backend'; import { Box, Section, LabeledList, Button, ProgressBar, Flex, AnimatedNumber } from '../components'; import { Fragment } from 'inferno'; -export const StasisSleeper = props => { +export const Sleeper = props => { const { act, data } = useBackend(props); const { @@ -23,7 +23,8 @@ export const StasisSleeper = props => { } return 0; }); - const synthchems = preSortChems.sort((a, b) => { + const preSortSynth = data.synthchems || []; + const synthchems = preSortSynth.sort((a, b) => { const descA = a.name.toLowerCase(); const descB = b.name.toLowerCase(); if (descA < descB) { @@ -154,7 +155,6 @@ export const StasisSleeper = props => {