From bf89df7e7b4c106703e9647ee81a434f9987822e Mon Sep 17 00:00:00 2001 From: Thalpy <48600475+ThalpySci@users.noreply.github.com> Date: Tue, 19 Nov 2019 16:03:33 +0000 Subject: [PATCH] Fixing things --- code/game/machinery/Sleeper.dm | 2 +- code/game/machinery/reagent_sleeper.dm | 31 ++++++++++-------- .../reagent_containers/sleeper_buffer.dm | 1 + icons/obj/chemical.dmi | Bin 54207 -> 54889 bytes tgstation.dme | 2 ++ tgui/src/interfaces/reagent_sleeper.ract | 4 +-- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 513fea4360..50fae40a91 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -196,7 +196,7 @@ blood_type = R.name else blood_type = blood_id - data["occupant"]["blood"]["maxBloodVolume"] = BLOOD_VOLUME_NORMAL + data["occupant"]["blood"]["maxBloodVolume"] = (BLOOD_VOLUME_NORMAL*C.blood_ratio) data["occupant"]["blood"]["currentBloodVolume"] = C.blood_volume data["occupant"]["blood"]["dangerBloodVolume"] = BLOOD_VOLUME_SAFE data["occupant"]["blood"]["bloodType"] = blood_type diff --git a/code/game/machinery/reagent_sleeper.dm b/code/game/machinery/reagent_sleeper.dm index 304e413b84..6eecd8d3ba 100644 --- a/code/game/machinery/reagent_sleeper.dm +++ b/code/game/machinery/reagent_sleeper.dm @@ -32,11 +32,12 @@ occupant_typecache = GLOB.typecache_living update_icon() reset_chem_buttons() + RefreshParts() //add_inital_chems() /obj/machinery/reagent_sleeper/Destroy() - var/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc) - buffer.reagents = reagents + var/obj/item/reagent_containers/sleeper_buffer/buffer = new /obj/item/reagent_containers/sleeper_buffer(loc) + reagents.trans_to(buffer.reagents, reagents.total_volume) ..() /obj/machinery/reagent_sleeper/RefreshParts() @@ -55,7 +56,8 @@ reset_chem_buttons() //Total container size 300 - 1200u - reagents.maximum_volume = (300*E) + if(reagents) + reagents.maximum_volume = (300*E) /obj/machinery/reagent_sleeper/update_icon() icon_state = initial(icon_state) @@ -98,7 +100,7 @@ /obj/machinery/reagent_sleeper/attackby(obj/item/I, mob/user, params) if(!istype(I, /obj/item/reagent_containers/sleeper_buffer)) var/obj/item/reagent_containers/sleeper_buffer/SB = I - if((SB.reagents.total_volume + reagents.total_volume) < reagents.max_volume) + if((SB.reagents.total_volume + reagents.total_volume) < reagents.maximum_volume) SB.reagents.trans_to(reagents, SB.reagents.total_volume) visible_message("[user] places the [SB] into the [src].") qdel(SB) @@ -166,7 +168,7 @@ ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "reagent_sleeper", name, 375, 650, master_ui, state) + ui = new(user, src, ui_key, "reagent_sleeper", name, 400, 650, master_ui, state) ui.open() /obj/machinery/reagent_sleeper/ui_data() @@ -178,12 +180,15 @@ data["tot_capacity"] = reagents.maximum_volume data["chems"] = list() - for(var/chem in reagents.reagent_list) - var/datum/reagent/R = GLOB.chemical_reagents_list[chem] - if(R.id in available_chems) - data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(chem))) + for(var/chem in available_chems) + var/datum/reagent/R = reagents.has_reagent(chem.id) + if(R) + data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = R2.volume, "allowed" = chem_allowed(chem))) else - data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(chem))) + R = GLOB.chemical_reagents_list[chem] + data["synthchems"] += list(list("name" = R.name, "id" = R.id, "vol" = 0, "allowed" = chem_allowed(chem))) + for(var/datum/reagent/R in reagents.reagent_list) + data["chems"] += list(list("name" = R.name, "id" = R.id, "vol" = R.volume, "allowed" = chem_allowed(R.id))) data["occupant"] = list() var/mob/living/mob_occupant = occupant @@ -247,12 +252,12 @@ . = TRUE if("inject") var/chem = params["chem"] - var/amount = param["volume"] + var/amount = text2num(params["volume"]) if(!is_operational() || !mob_occupant) return if(mob_occupant.health < min_health && chem != "epinephrine") return - if(inject_chem(chem, usr, volume)) + if(inject_chem(chem, usr, amount)) . = TRUE if(scrambled_chems && prob(5)) to_chat(usr, "Chemical system re-route detected, results may not be as expected!") @@ -271,7 +276,7 @@ //trans to /obj/machinery/reagent_sleeper/proc/inject_chem(chem, mob/user, volume) - if((chem in available_chems) && chem_allowed(chem)) + if(chem_allowed(chem)) reagents.trans_id_to(occupant, chem_buttons[chem], volume)//emag effect kicks in here so that the "intended" chem is used for all checks, for extra FUUU if(user) log_combat(user, occupant, "injected [chem] into", addition = "via [src]") diff --git a/code/modules/reagents/reagent_containers/sleeper_buffer.dm b/code/modules/reagents/reagent_containers/sleeper_buffer.dm index e41bd3f376..5f8e9a817b 100644 --- a/code/modules/reagents/reagent_containers/sleeper_buffer.dm +++ b/code/modules/reagents/reagent_containers/sleeper_buffer.dm @@ -2,6 +2,7 @@ /obj/item/reagent_containers/sleeper_buffer name = "Sleeper buffer container" desc = "A closed container for insertion in the Medical Sleepers." + icon_state = "sleeper_buffer" volume = 1200 reagent_flags = NO_REACT spillable = TRUE diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 701c3a2467e2a494bae61cd4a54851852f2a0e86..74a5164844e6c6783bfd0f79207ec04a35fd0508 100644 GIT binary patch delta 16004 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 NR#H)-Lfq)<{{s7zR8s%| diff --git a/tgstation.dme b/tgstation.dme index 2e0142c49f..8d33c04d8f 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -625,6 +625,7 @@ #include "code\game\machinery\newscaster.dm" #include "code\game\machinery\PDApainter.dm" #include "code\game\machinery\quantum_pad.dm" +#include "code\game\machinery\reagent_sleeper.dm" #include "code\game\machinery\recharger.dm" #include "code\game\machinery\rechargestation.dm" #include "code\game\machinery\recycler.dm" @@ -2620,6 +2621,7 @@ #include "code\modules\reagents\reagent_containers\patch.dm" #include "code\modules\reagents\reagent_containers\pill.dm" #include "code\modules\reagents\reagent_containers\rags.dm" +#include "code\modules\reagents\reagent_containers\sleeper_buffer.dm" #include "code\modules\reagents\reagent_containers\spray.dm" #include "code\modules\reagents\reagent_containers\syringes.dm" #include "code\modules\recycling\conveyor2.dm" diff --git a/tgui/src/interfaces/reagent_sleeper.ract b/tgui/src/interfaces/reagent_sleeper.ract index c560bc06e0..24adcff692 100644 --- a/tgui/src/interfaces/reagent_sleeper.ract +++ b/tgui/src/interfaces/reagent_sleeper.ract @@ -46,7 +46,7 @@ {{#each data.synthchems}} - {{name}}: {{vol}} + {{name}}: {{vol}}u {{#if data.efficiency >= 3}} 1 {{/if}} @@ -57,7 +57,7 @@ Synthesize
{{/each}} {{#each data.chems}} - {{name}}: {{vol}} + {{name}}: {{vol}}u {{#if data.efficiency >= 3}} 1 {{/if}}