diff --git a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
index 3ad88f92c7c..55769c3a2af 100644
--- a/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
+++ b/code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
@@ -12,7 +12,7 @@
var/cleaning = 0
var/patient_laststat = null
var/mob_energy = 30000 //Energy gained from digesting mobs (including PCs)
- var/list/injection_chems = list("dexalin", "bicaridine", "kelotane","anti_toxin", "alkysine", "imidazoline", "spaceacillin", "paracetamol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
+ var/list/injection_chems = list("inaprovaline", "dexalin", "bicaridine", "kelotane","anti_toxin", "alkysine", "imidazoline", "spaceacillin", "paracetamol") //The borg is able to heal every damage type. As a nerf, they use 750 charge per injection.
var/eject_port = "ingestion"
var/list/items_preserved = list()
var/UI_open = 0
@@ -96,24 +96,21 @@
/obj/item/device/dogborg/sleeper/proc/sleeperUI(mob/user)
var/dat
- dat += "
Injector
"
- if(patient && !(patient.stat & DEAD)) //Why inject dead people with innaprov? Dundonuffin in Bay.
- dat += "Inject Inaprovaline"
- else
- dat += "Inject Inaprovaline"
- if(patient && patient.health > min_health)
- for(var/re in injection_chems)
- var/datum/reagent/C = chemical_reagents_list[re]
- if(C)
- dat += "
Inject [C.name]"
- else
- for(var/re in injection_chems)
- var/datum/reagent/C = chemical_reagents_list[re]
- if(C)
- dat += "
Inject [C.name]"
+ if(islist(injection_chems)) //Only display this if we're a drug-dispensing doggo.
+ dat += "Injector
"
+ if(patient)// && patient.health > min_health) //Not necessary, leave the buttons on, but the feedback during injection will give more information.
+ for(var/re in injection_chems)
+ var/datum/reagent/C = chemical_reagents_list[re]
+ if(C)
+ dat += "Inject [C.name]
"
+ else
+ for(var/re in injection_chems)
+ var/datum/reagent/C = chemical_reagents_list[re]
+ if(C)
+ dat += "Inject [C.name]
"
- dat += "Sleeper Status
"
+ dat += "[name] Status
"
dat += "Refresh"
dat += "Eject All"
dat += "Eject port: [eject_port]"
@@ -124,9 +121,10 @@
dat += ""
- if(istype(src, /obj/item/device/dogborg/sleeper/compactor))//garbage counter for trashpup
- if(length(contents) > 0)
- dat += "
Current load [length(contents)] / 25."
+ if(istype(src, /obj/item/device/dogborg/sleeper/compactor) && length(contents))//garbage counter for trashpup
+ var/obj/item/device/dogborg/sleeper/compactor/garbo = src
+ dat += "
Current load: [length(contents)] / [garbo.max_item_count] objects."
+ dat += "
([list2text(contents,", ")])"
//Cleaning and there are still un-preserved items
if(cleaning && length(contents - items_preserved))
@@ -141,7 +139,7 @@
dat += "
[length(items_preserved)] uncleanable object(s)."
if(!patient)
- dat += "[src.name] unoccupied"
+ dat += "[src.name] Unoccupied"
else
dat += "[patient.name] => "
@@ -178,7 +176,7 @@
dat += "
[R.name]:
[round(R.volume, 0.1)] units
"
dat += "
"
- var/datum/browser/popup = new(user, "sleeper", "Sleeper Console", 520, 540) //Set up the popup browser window
+ var/datum/browser/popup = new(user, "sleeper", "[name] Console", 520, 540) //Set up the popup browser window
//popup.set_title_image(user.browse_rsc_icon(icon, icon_state)) //I have no idea what this is, but it feels irrelevant and causes runtimes idk.
popup.set_content(dat)
popup.open()
@@ -468,8 +466,10 @@
patient.AdjustStunned(-4)
patient.AdjustWeakened(-4)
src.drain()
+ /* Don't anymore, causes unwanted drug mixing in bloodstream
if((patient.reagents.get_reagent_amount("inaprovaline") < 5) && (patient.health < patient.maxHealth)) //Stop pumping full HP people full of drugs. Don't heal people you're digesting, meanie.
patient.reagents.add_reagent("inaprovaline", 5)
+ */
return
if(!patient && !cleaning) //We think we're done working.
@@ -484,10 +484,10 @@
icon_state = "sleeperb"
inject_amount = 10
min_health = -100
- injection_chems = null //So they don't have all the same chems as the medihound!
+ injection_chems = list("inaprovaline") //So they don't have all the same chems as the medihound!
/obj/item/device/dogborg/sleeper/compactor //Janihound gut.
- name = "garbage processor"
+ name = "Garbage Processor"
desc = "A mounted garbage compactor unit with fuel processor."
icon = 'icons/mob/dogborg_vr.dmi'
icon_state = "compactor"