diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index ad2d474eb6..24ba099e8f 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -177,6 +177,7 @@ w_class = ITEMSIZE_SMALL can_hold = list(/obj/item/weapon/reagent_containers/pill,/obj/item/weapon/dice,/obj/item/weapon/paper) allow_quick_gather = 1 + allow_quick_empty = 1 use_to_pickup = 1 use_sound = null max_storage_space = ITEMSIZE_COST_TINY * 14 @@ -186,138 +187,166 @@ name = "bottle of Dylovene pills" desc = "Contains pills used to counter toxins." - New() - ..() - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) - new /obj/item/weapon/reagent_containers/pill/antitox( src ) +/obj/item/weapon/storage/pill_bottle/antitox/New() //25u each + ..() + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) + new /obj/item/weapon/reagent_containers/pill/antitox(src) /obj/item/weapon/storage/pill_bottle/bicaridine name = "bottle of Bicaridine pills" desc = "Contains pills used to stabilize the severely injured." /obj/item/weapon/storage/pill_bottle/bicaridine/New() - ..() - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) - new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + ..() + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) + new /obj/item/weapon/reagent_containers/pill/bicaridine(src) /obj/item/weapon/storage/pill_bottle/dexalin_plus name = "bottle of Dexalin Plus pills" desc = "Contains pills used to treat extreme cases of oxygen deprivation." /obj/item/weapon/storage/pill_bottle/dexalin_plus/New() - ..() - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) - new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + ..() + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) + new /obj/item/weapon/reagent_containers/pill/dexalin_plus(src) /obj/item/weapon/storage/pill_bottle/dermaline name = "bottle of Dermaline pills" desc = "Contains pills used to treat burn wounds." /obj/item/weapon/storage/pill_bottle/dermaline/New() - ..() - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) - new /obj/item/weapon/reagent_containers/pill/dermaline(src) + ..() + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) + new /obj/item/weapon/reagent_containers/pill/dermaline(src) /obj/item/weapon/storage/pill_bottle/dylovene name = "bottle of Dylovene pills" desc = "Contains pills used to treat toxic substances in the blood." -/obj/item/weapon/storage/pill_bottle/dylovene/New() - ..() - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) - new /obj/item/weapon/reagent_containers/pill/dylovene(src) +/obj/item/weapon/storage/pill_bottle/dylovene/New() //15u each + ..() + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) + new /obj/item/weapon/reagent_containers/pill/dylovene(src) /obj/item/weapon/storage/pill_bottle/inaprovaline name = "bottle of Inaprovaline pills" desc = "Contains pills used to stabilize patients." - New() - ..() - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) - new /obj/item/weapon/reagent_containers/pill/inaprovaline( src ) +/obj/item/weapon/storage/pill_bottle/inaprovaline/New() + ..() + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) + new /obj/item/weapon/reagent_containers/pill/inaprovaline(src) /obj/item/weapon/storage/pill_bottle/kelotane name = "bottle of kelotane pills" desc = "Contains pills used to treat burns." - New() - ..() - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) - new /obj/item/weapon/reagent_containers/pill/kelotane( src ) +/obj/item/weapon/storage/pill_bottle/kelotane/New() + ..() + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) + new /obj/item/weapon/reagent_containers/pill/kelotane(src) /obj/item/weapon/storage/pill_bottle/spaceacillin name = "bottle of Spaceacillin pills" desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space." /obj/item/weapon/storage/pill_bottle/spaceacillin/New() - ..() - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) - new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + ..() + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) + new /obj/item/weapon/reagent_containers/pill/spaceacillin(src) /obj/item/weapon/storage/pill_bottle/tramadol name = "bottle of Tramadol pills" desc = "Contains pills used to relieve pain." - New() - ..() - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) - new /obj/item/weapon/reagent_containers/pill/tramadol( src ) +/obj/item/weapon/storage/pill_bottle/tramadol/New() + ..() + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) + new /obj/item/weapon/reagent_containers/pill/tramadol(src) /obj/item/weapon/storage/pill_bottle/citalopram name = "bottle of Citalopram pills" desc = "Contains pills used to stabilize a patient's mood." - New() - ..() - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) - new /obj/item/weapon/reagent_containers/pill/citalopram( src ) +/obj/item/weapon/storage/pill_bottle/citalopram/New() + ..() + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + new /obj/item/weapon/reagent_containers/pill/citalopram(src) + +/obj/item/weapon/storage/pill_bottle/carbon + name = "bottle of Carbon pills" + desc = "Contains pills used to neutralise chemicals in the stomach." + +/obj/item/weapon/storage/pill_bottle/carbon/New() + ..() + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + new /obj/item/weapon/reagent_containers/pill/carbon(src) + +/obj/item/weapon/storage/pill_bottle/iron + name = "bottle of Iron pills" + desc = "Contains pills used to aid in blood regeneration." + +/obj/item/weapon/storage/pill_bottle/iron/New() + ..() + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) + new /obj/item/weapon/reagent_containers/pill/iron(src) \ No newline at end of file diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm index a3ca9a4601..a58986b8a6 100644 --- a/code/game/objects/items/weapons/storage/storage.dm +++ b/code/game/objects/items/weapons/storage/storage.dm @@ -311,24 +311,24 @@ return 0 //Means the item is already in the storage item if(storage_slots != null && contents.len >= storage_slots) if(!stop_messages) - usr << "[src] is full, make some space." + to_chat(usr, "[src] is full, make some space.") return 0 //Storage item is full if(can_hold.len && !is_type_in_list(W, can_hold)) if(!stop_messages) if (istype(W, /obj/item/weapon/hand_labeler)) return 0 - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") return 0 if(cant_hold.len && is_type_in_list(W, cant_hold)) if(!stop_messages) - usr << "[src] cannot hold [W]." + to_chat(usr, "[src] cannot hold [W].") return 0 if (max_w_class != null && W.w_class > max_w_class) if(!stop_messages) - usr << "[W] is too long for \the [src]." + to_chat(usr, "[W] is too long for \the [src].") return 0 var/total_storage_space = W.get_storage_cost() @@ -337,12 +337,12 @@ if(total_storage_space > max_storage_space) if(!stop_messages) - usr << "[src] is too full, make some space." + to_chat(usr, "[src] is too full, make some space.") return 0 if(W.w_class >= src.w_class && (istype(W, /obj/item/weapon/storage))) if(!stop_messages) - usr << "[src] cannot hold [W] as it's a storage item of the same size." + to_chat(usr, "[src] cannot hold [W] as it's a storage item of the same size.") return 0 //To prevent the stacking of same sized storage items. return 1 @@ -366,7 +366,7 @@ if(!prevent_warning) for(var/mob/M in viewers(usr, null)) if (M == usr) - usr << "You put \the [W] into [src]." + to_chat(usr, "You put \the [W] into [src].") else if (M in range(1)) //If someone is standing close enough, they can tell what it is... M.show_message("\The [usr] puts [W] into [src].") else if (W && W.w_class >= 3) //Otherwise they can only see large or normal items from a distance... @@ -515,7 +515,7 @@ set name = "Empty Contents" set category = "Object" - if((!ishuman(usr) && (src.loc != usr)) || usr.stat || usr.restrained()) + if(((!(ishuman(usr) || isrobot(usr))) && (src.loc != usr)) || usr.stat || usr.restrained()) return var/turf/T = get_turf(src) @@ -591,11 +591,9 @@ ..() /obj/item/weapon/storage/attack_self(mob/user as mob) - //Clicking on itself will empty it, if it has the verb to do that. - if(user.get_active_hand() == src) - if(src.verbs.Find(/obj/item/weapon/storage/verb/quick_empty)) - src.quick_empty() - return 1 + if((user.get_active_hand() == src) || (isrobot(user)) && allow_quick_empty) + src.quick_empty() + return 1 // Is this return even needed? //Returns the storage depth of an atom. This is the number of storage items the atom is contained in before reaching toplevel (the area). //Returns -1 if the atom was not found on container. diff --git a/code/game/objects/random/random.dm b/code/game/objects/random/random.dm index d23f18e9bb..60c55cfc71 100644 --- a/code/game/objects/random/random.dm +++ b/code/game/objects/random/random.dm @@ -139,20 +139,31 @@ /obj/random/medical/item_to_spawn() return pick(prob(21);/obj/random/medical/lite, - prob(4);/obj/item/bodybag, - prob(4);/obj/item/weapon/storage/pill_bottle/tramadol, - prob(1);/obj/item/weapon/storage/pill_bottle/spaceacillin, + prob(5);/obj/random/medical/pillbottle, prob(1);/obj/item/weapon/storage/pill_bottle/tramadol, - prob(1);/obj/item/weapon/storage/pill_bottle/dermaline, - prob(1);/obj/item/weapon/storage/pill_bottle/dexalin_plus, - prob(1);/obj/item/weapon/storage/pill_bottle/bicaridine, - prob(6);/obj/item/weapon/reagent_containers/syringe/antitoxin, - prob(1);/obj/item/weapon/reagent_containers/syringe/antiviral, - prob(6);/obj/item/weapon/reagent_containers/syringe/inaprovaline, + prob(1);/obj/item/weapon/storage/pill_bottle/antitox, + prob(1);/obj/item/weapon/storage/pill_bottle/carbon, + prob(3);/obj/item/bodybag/cryobag, + prob(5);/obj/item/weapon/reagent_containers/syringe/antitoxin, + prob(3);/obj/item/weapon/reagent_containers/syringe/antiviral, + prob(5);/obj/item/weapon/reagent_containers/syringe/inaprovaline, prob(1);/obj/item/weapon/reagent_containers/hypospray, prob(1);/obj/item/weapon/storage/box/freezer, prob(2);/obj/item/stack/nanopaste) +/obj/random/medical/pillbottle + name = "Random Pill Bottle" + desc = "This is a random pill bottle." + icon = 'icons/obj/chemical.dmi' + icon_state = "pill_canister" + +/obj/random/medical/pillbottle/item_to_spawn() + return pick(prob(1);/obj/item/weapon/storage/pill_bottle/spaceacillin, + prob(1);/obj/item/weapon/storage/pill_bottle/dermaline, + prob(1);/obj/item/weapon/storage/pill_bottle/dexalin_plus, + prob(1);/obj/item/weapon/storage/pill_bottle/bicaridine, + prob(1);/obj/item/weapon/storage/pill_bottle/iron) + /obj/random/medical/lite name = "Random Medicine" desc = "This is a random simple medical item." @@ -167,7 +178,7 @@ prob(2);/obj/item/stack/medical/advanced/ointment, prob(1);/obj/item/stack/medical/splint, prob(4);/obj/item/device/healthanalyzer, - prob(1);/obj/item/bodybag/cryobag, + prob(1);/obj/item/bodybag, prob(3);/obj/item/weapon/reagent_containers/hypospray/autoinjector, prob(2);/obj/item/weapon/storage/pill_bottle/kelotane, prob(2);/obj/item/weapon/storage/pill_bottle/antitox) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm index 9e5f0b7815..ba806cc33b 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -312,3 +312,13 @@ icon_state = icon_closed else icon_state = icon_opened + +/obj/structure/closet/secure_closet/medical_wall/pills + name = "pill cabinet" + + New() + ..() + new /obj/item/weapon/storage/pill_bottle/tramadol(src) + new /obj/item/weapon/storage/pill_bottle/antitox(src) + new /obj/item/weapon/storage/pill_bottle/carbon(src) + new /obj/random/medical/pillbottle(src) \ No newline at end of file diff --git a/code/modules/mob/living/silicon/robot/drone/drone_items.dm b/code/modules/mob/living/silicon/robot/drone/drone_items.dm index 1f0170733e..200488b2fa 100644 --- a/code/modules/mob/living/silicon/robot/drone/drone_items.dm +++ b/code/modules/mob/living/silicon/robot/drone/drone_items.dm @@ -193,7 +193,7 @@ wrapped = null return - src.loc << "You drop \the [wrapped]." + to_chat(src.loc, "You drop \the [wrapped].") wrapped.loc = get_turf(src) wrapped = null //update_icon() @@ -202,11 +202,14 @@ if(wrapped) //The force of the wrapped obj gets set to zero during the attack() and afterattack(). force_holder = wrapped.force wrapped.force = 0.0 - wrapped.attack(M,user) - M.attackby(wrapped, user) //attackby reportedly gets procced by being clicked on, at least according to Anewbe. - if(QDELETED(wrapped) || wrapped.loc != src.loc) + if(QDELETED(wrapped) || wrapped.loc != src.loc) //qdel check here so it doesn't duplicate/spawn ghost items wrapped = null - return 1 + else + wrapped.attack(M,user) + M.attackby(wrapped, user) //attackby reportedly gets procced by being clicked on, at least according to Anewbe. + if(QDELETED(wrapped) || wrapped.loc != src.loc) + wrapped = null + return 1 return 0 /obj/item/weapon/gripper/afterattack(var/atom/target, var/mob/living/user, proximity, params) @@ -256,12 +259,12 @@ //We can grab the item, finally. if(grab) - user << "You collect \the [I]." + to_chat(user, "You collect \the [I].") I.loc = src wrapped = I return else - user << "Your gripper cannot hold \the [target]." + to_chat(user, "Your gripper cannot hold \the [target].") else if(istype(target,/obj/machinery/power/apc)) var/obj/machinery/power/apc/A = target @@ -342,15 +345,15 @@ if(!istype(D)) return - D << "You begin decompiling [M]." + to_chat(D, "You begin decompiling [M].") if(!do_after(D,50)) - D << "You need to remain still while decompiling such a large object." + to_chat(D, "You need to remain still while decompiling such a large object.") return if(!M || !D) return - D << "You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself." + to_chat(D, "You carefully and thoroughly decompile [M], storing as much of its resources as you can within yourself.") qdel(M) new/obj/effect/decal/cleanable/blood/oil(get_turf(src)) @@ -423,16 +426,16 @@ grabbed_something = 1 if(grabbed_something) - user << "You deploy your decompiler and clear out the contents of \the [T]." + to_chat(user, "You deploy your decompiler and clear out the contents of \the [T].") else - user << "Nothing on \the [T] is useful to you." + to_chat(user, "Nothing on \the [T] is useful to you.") return //PRETTIER TOOL LIST. /mob/living/silicon/robot/drone/installed_modules() if(weapon_lock) - src << "Weapon lock active, unable to use modules! Count:[weaponlock_time]" + to_chat(src, "Weapon lock active, unable to use modules! Count:[weaponlock_time]") return if(!module) diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm index bc83d8c9cf..da834d06c3 100644 --- a/code/modules/reagents/reagent_containers/pill.dm +++ b/code/modules/reagents/reagent_containers/pill.dm @@ -24,29 +24,29 @@ if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(!H.check_has_mouth()) - user << "Where do you intend to put \the [src]? You don't have a mouth!" + to_chat(user, "Where do you intend to put \the [src]? You don't have a mouth!") return var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - user << "\The [blocked] is in the way!" + to_chat(user, "\The [blocked] is in the way!") return - M << "You swallow \the [src]." - M.drop_from_inventory(src) //icon update - if(reagents.total_volume) - reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) - qdel(src) - return 1 + to_chat(M, "You swallow \the [src].") + M.drop_from_inventory(src) //icon update + if(reagents.total_volume) + reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) + qdel(src) + return 1 else if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M if(!H.check_has_mouth()) - user << "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!" + to_chat(user, "Where do you intend to put \the [src]? \The [H] doesn't have a mouth!") return var/obj/item/blocked = H.check_mouth_coverage() if(blocked) - user << "\The [blocked] is in the way!" + to_chat(user, "\The [blocked] is in the way!") return user.visible_message("[user] attempts to force [M] to swallow \the [src].") @@ -63,7 +63,7 @@ user.attack_log += text("\[[time_stamp()]\] Fed [name] to [key_name(M)] Reagents: [contained]") msg_admin_attack("[key_name_admin(user)] fed [key_name_admin(M)] with [name] Reagents: [contained] (INTENT: [uppertext(user.a_intent)]) (JMP)") - if(reagents.total_volume) + if(reagents && reagents.total_volume) reagents.trans_to_mob(M, reagents.total_volume, CHEM_INGEST) qdel(src) @@ -76,9 +76,9 @@ if(target.is_open_container() && target.reagents) if(!target.reagents.total_volume) - user << "[target] is empty. Can't dissolve \the [src]." + to_chat(user, "[target] is empty. Can't dissolve \the [src].") return - user << "You dissolve \the [src] in [target]." + to_chat(user, "You dissolve \the [src] in [target].") user.attack_log += text("\[[time_stamp()]\] Spiked \a [target] with a pill. Reagents: [reagentlist()]") msg_admin_attack("[user.name] ([user.ckey]) spiked \a [target] with a pill. Reagents: [reagentlist()] (INTENT: [uppertext(user.a_intent)]) (JMP)") @@ -98,7 +98,7 @@ //Pills /obj/item/weapon/reagent_containers/pill/antitox name = "Anti-toxins pill" - desc = "Neutralizes many common toxins." + desc = "Neutralizes many common toxins. Contains 25 units of Dylovene." icon_state = "pill17" /obj/item/weapon/reagent_containers/pill/antitox/New() @@ -108,7 +108,7 @@ /obj/item/weapon/reagent_containers/pill/tox name = "Toxins pill" - desc = "Highly toxic." + desc = "Highly toxic." //this is cooler without "contains 50u toxin" icon_state = "pill5" /obj/item/weapon/reagent_containers/pill/tox/New() @@ -118,7 +118,7 @@ /obj/item/weapon/reagent_containers/pill/cyanide name = "Cyanide pill" - desc = "Don't swallow this." + desc = "Don't swallow this." //this is cooler without "contains 50u cyanide" icon_state = "pill5" /obj/item/weapon/reagent_containers/pill/cyanide/New() @@ -128,7 +128,7 @@ /obj/item/weapon/reagent_containers/pill/adminordrazine name = "Adminordrazine pill" - desc = "It's magic. We don't have to explain it." + desc = "It's magic. We don't have to explain it." //it's space magic you don't need the quantity icon_state = "pill16" /obj/item/weapon/reagent_containers/pill/adminordrazine/New() @@ -137,7 +137,7 @@ /obj/item/weapon/reagent_containers/pill/stox name = "Sleeping pill" - desc = "Commonly used to treat insomnia." + desc = "Commonly used to treat insomnia. Contains 15 units of Soporific." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/stox/New() @@ -147,7 +147,7 @@ /obj/item/weapon/reagent_containers/pill/kelotane name = "Kelotane pill" - desc = "Used to treat burns." + desc = "Used to treat burns. Contains 15 units of Kelotane." icon_state = "pill11" /obj/item/weapon/reagent_containers/pill/kelotane/New() @@ -157,7 +157,7 @@ /obj/item/weapon/reagent_containers/pill/paracetamol name = "Paracetamol pill" - desc = "Tylenol! A painkiller for the ages. Chewables!" + desc = "Paracetamol! A painkiller for the ages. Chewables! Contains 15 units of Paracetamol." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/paracetamol/New() @@ -167,7 +167,7 @@ /obj/item/weapon/reagent_containers/pill/tramadol name = "Tramadol pill" - desc = "A simple painkiller." + desc = "A simple painkiller. Contains 15 units of Tramadol." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/tramadol/New() @@ -177,7 +177,7 @@ /obj/item/weapon/reagent_containers/pill/methylphenidate name = "Methylphenidate pill" - desc = "Improves the ability to concentrate." + desc = "Improves the ability to concentrate. Contains 15 units of Methylphenidate." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/methylphenidate/New() @@ -187,7 +187,7 @@ /obj/item/weapon/reagent_containers/pill/citalopram name = "Citalopram pill" - desc = "Mild anti-depressant." + desc = "Mild anti-depressant. Contains 15 units of Citalopram." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/citalopram/New() @@ -195,19 +195,9 @@ reagents.add_reagent("citalopram", 15) -/obj/item/weapon/reagent_containers/pill/inaprovaline - name = "Inaprovaline pill" - desc = "Used to stabilize patients." - icon_state = "pill20" - -/obj/item/weapon/reagent_containers/pill/inaprovaline/New() - ..() - reagents.add_reagent("inaprovaline", 30) - - /obj/item/weapon/reagent_containers/pill/dexalin name = "Dexalin pill" - desc = "Used to treat oxygen deprivation." + desc = "Used to treat oxygen deprivation. Contains 15 units of Dexalin." icon_state = "pill16" /obj/item/weapon/reagent_containers/pill/dexalin/New() @@ -217,7 +207,7 @@ /obj/item/weapon/reagent_containers/pill/dexalin_plus name = "Dexalin Plus pill" - desc = "Used to treat extreme oxygen deprivation." + desc = "Used to treat extreme oxygen deprivation. Contains 15 units of Dexalin Plus." icon_state = "pill8" /obj/item/weapon/reagent_containers/pill/dexalin_plus/New() @@ -227,7 +217,7 @@ /obj/item/weapon/reagent_containers/pill/dermaline name = "Dermaline pill" - desc = "Used to treat burn wounds." + desc = "Used to treat burn wounds. Contains 15 units of Dermaline." icon_state = "pill12" /obj/item/weapon/reagent_containers/pill/dermaline/New() @@ -237,7 +227,7 @@ /obj/item/weapon/reagent_containers/pill/dylovene name = "Dylovene pill" - desc = "A broad-spectrum anti-toxin." + desc = "A broad-spectrum anti-toxin. Contains 15 units of Dylovene." icon_state = "pill13" /obj/item/weapon/reagent_containers/pill/dylovene/New() @@ -247,7 +237,7 @@ /obj/item/weapon/reagent_containers/pill/inaprovaline name = "Inaprovaline pill" - desc = "Used to stabilize patients." + desc = "Used to stabilize patients. Contains 30 units of Inaprovaline." icon_state = "pill20" /obj/item/weapon/reagent_containers/pill/inaprovaline/New() @@ -257,7 +247,7 @@ /obj/item/weapon/reagent_containers/pill/bicaridine name = "Bicaridine pill" - desc = "Used to treat physical injuries." + desc = "Used to treat physical injuries. Contains 20 units of Bicaridine." icon_state = "pill18" /obj/item/weapon/reagent_containers/pill/bicaridine/New() @@ -265,9 +255,39 @@ reagents.add_reagent("bicaridine", 20) +/obj/item/weapon/reagent_containers/pill/spaceacillin + name = "Spaceacillin pill" + desc = "A theta-lactam antibiotic. Effective against many diseases likely to be encountered in space. Contains 15 units of Spaceacillin." + icon_state = "pill19" + +/obj/item/weapon/reagent_containers/pill/spaceacillin/New() + ..() + reagents.add_reagent("spaceacillin", 15) + + +/obj/item/weapon/reagent_containers/pill/carbon + name = "Carbon pill" + desc = "Used to neutralise chemicals in the stomach. Contains 15 units of Carbon." + icon_state = "pill7" + +/obj/item/weapon/reagent_containers/pill/carbon/New() + ..() + reagents.add_reagent("carbon", 15) + + +/obj/item/weapon/reagent_containers/pill/iron + name = "Iron pill" + desc = "Used to aid in blood regeneration after bleeding. Contains 15 units of Iron." + icon_state = "pill4" + +/obj/item/weapon/reagent_containers/pill/iron/New() + ..() + reagents.add_reagent("iron", 15) + +//Not-quite-medicine /obj/item/weapon/reagent_containers/pill/happy name = "Happy pill" - desc = "Happy happy joy joy!" + desc = "Happy happy joy joy!" //we're not giving quantities for shady maint drugs icon_state = "pill18" /obj/item/weapon/reagent_containers/pill/happy/New() @@ -287,16 +307,6 @@ reagents.add_reagent("synaptizine", 5) reagents.add_reagent("hyperzine", 5) - -/obj/item/weapon/reagent_containers/pill/spaceacillin - name = "Spaceacillin pill" - desc = "Contains antiviral agents." - icon_state = "pill19" - -/obj/item/weapon/reagent_containers/pill/spaceacillin/New() - ..() - reagents.add_reagent("spaceacillin", 15) - /obj/item/weapon/reagent_containers/pill/diet name = "diet pill" desc = "Guaranteed to get you slim!" diff --git a/maps/northern_star/polaris-1.dmm b/maps/northern_star/polaris-1.dmm index 554df93be7..3b84b3988b 100644 --- a/maps/northern_star/polaris-1.dmm +++ b/maps/northern_star/polaris-1.dmm @@ -3120,7 +3120,7 @@ "bhZ" = (/obj/machinery/atmospherics/unary/vent_pump/on{dir = 4},/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/obj/structure/disposalpipe/segment,/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bia" = (/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) "bib" = (/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/item/weapon/reagent_containers/blood/empty,/obj/structure/table/standard,/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/medical/surgery_hallway) -"bic" = (/obj/structure/table/standard,/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_y = -32},/obj/effect/floor_decal/corner/pink/full,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/turf/simulated/floor/tiled/white,/area/medical/exam_room) +"bic" = (/obj/structure/table/standard,/obj/effect/floor_decal/corner/pink/full,/obj/machinery/firealarm{dir = 8; pixel_x = -24},/obj/structure/closet/secure_closet/medical_wall/pills{pixel_y = -32},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bid" = (/obj/effect/floor_decal/corner/pink{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bie" = (/obj/structure/bed/padded,/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/structure/cable/green{d1 = 2; d2 = 4; icon_state = "2-4"},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "bif" = (/obj/machinery/power/apc{dir = 4; name = "east bump"; pixel_x = 24},/obj/effect/floor_decal/corner/pink{dir = 6},/obj/structure/cable/green{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/tiled/white,/area/medical/exam_room) @@ -3906,7 +3906,7 @@ "bxf" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/o2{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/o2{pixel_x = 0; pixel_y = 0},/obj/structure/cable/green{d1 = 2; d2 = 8; icon_state = "2-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 10},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxg" = (/obj/structure/table/standard,/obj/item/weapon/storage/firstaid/fire{pixel_x = 5; pixel_y = 5},/obj/item/weapon/storage/firstaid/fire{pixel_x = 0; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) "bxh" = (/obj/structure/bed/chair/wheelchair,/obj/machinery/camera/network/medbay{c_tag = "MED - Equipment Storage"; dir = 8},/obj/effect/floor_decal/corner/paleblue,/turf/simulated/floor/tiled/white,/area/medical/medbay_primary_storage) -"bxi" = (/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_x = -32; pixel_y = 0},/obj/structure/table/glass,/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"bxi" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/medical_wall/pills{pixel_x = -32},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bxj" = (/obj/effect/floor_decal/corner/paleblue{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bxk" = (/obj/machinery/sleeper{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "bxl" = (/obj/machinery/sleep_console,/turf/simulated/floor/tiled/white,/area/medical/sleeper) @@ -4677,7 +4677,7 @@ "bLW" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bLX" = (/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bLY" = (/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) -"bLZ" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = -32},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Port"; dir = 4},/obj/structure/table/standard,/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/item/weapon/storage/box/bodybags{pixel_x = -1; pixel_y = -2},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bLZ" = (/obj/structure/reagent_dispensers/acid{density = 0; pixel_x = -32},/obj/structure/cable/green{d1 = 1; d2 = 4; icon_state = "1-4"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 5},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 5},/obj/machinery/camera/network/research{c_tag = "SCI - Robotics Port"; dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/table/standard,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/weapon/storage/box/bodybags{pixel_x = -1; pixel_y = -2},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMa" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/structure/disposalpipe/segment,/turf/simulated/floor/tiled,/area/assembly/robotics) "bMb" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,/obj/machinery/atmospherics/pipe/manifold/hidden/supply{dir = 1},/obj/effect/floor_decal/industrial/warning{dir = 1},/turf/simulated/floor/tiled,/area/assembly/robotics) "bMc" = (/obj/structure/cable/green{d1 = 4; d2 = 8; icon_state = "4-8"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 4},/obj/effect/floor_decal/industrial/warning{dir = 1},/obj/machinery/mecha_part_fabricator,/turf/simulated/floor/tiled,/area/assembly/robotics) @@ -4888,7 +4888,7 @@ "bPZ" = (/obj/machinery/computer/mecha,/obj/effect/floor_decal/corner/purple{dir = 10},/obj/machinery/ai_status_display{pixel_y = -32},/obj/machinery/camera/network/research{c_tag = "SCI - RD's Office"; dir = 1},/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bQa" = (/obj/effect/floor_decal/corner/purple/full{dir = 4},/obj/machinery/alarm{dir = 1; pixel_y = -22},/mob/living/simple_animal/slime/rainbow/kendrick,/turf/simulated/floor/tiled/white,/area/rnd/rdoffice) "bQb" = (/obj/structure/table/rack,/obj/item/weapon/rig/hazmat/equipped,/obj/structure/extinguisher_cabinet{pixel_x = 25; pixel_y = 0},/obj/machinery/firealarm{dir = 1; pixel_y = -24},/turf/simulated/floor/tiled/dark,/area/rnd/rdoffice) -"bQc" = (/obj/structure/table/standard,/obj/item/device/mmi,/obj/item/device/mmi,/obj/item/device/mmi,/obj/structure/extinguisher_cabinet{pixel_x = -27},/turf/simulated/floor/tiled,/area/assembly/robotics) +"bQc" = (/obj/structure/sink{icon_state = "sink"; dir = 8; pixel_x = -12; pixel_y = 2},/turf/simulated/floor/tiled,/area/assembly/robotics) "bQd" = (/obj/structure/table/standard,/obj/machinery/cell_charger,/obj/item/device/radio/intercom{dir = 4; name = "Station Intercom (General)"; pixel_x = 21},/obj/effect/floor_decal/corner/pink{dir = 4},/turf/simulated/floor/tiled,/area/assembly/robotics) "bQe" = (/obj/structure/disposalpipe/segment{dir = 4; icon_state = "pipe-c"},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) "bQf" = (/obj/effect/floor_decal/industrial/loading{dir = 4},/obj/structure/disposalpipe/segment{dir = 4},/turf/simulated/floor/tiled,/area/hallway/primary/central_four) diff --git a/maps/southern_cross/southern_cross-1.dmm b/maps/southern_cross/southern_cross-1.dmm index 6fa854c089..36b5e0364c 100644 --- a/maps/southern_cross/southern_cross-1.dmm +++ b/maps/southern_cross/southern_cross-1.dmm @@ -6672,7 +6672,7 @@ "cyp" = (/obj/machinery/hologram/holopad,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/pink/border{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/medbay_emt_bay) "cyq" = (/obj/structure/table/steel,/obj/item/device/multitool,/obj/item/weapon/deck/cards,/obj/machinery/camera/network/medbay{c_tag = "MED - EMT Bay"; dir = 8},/obj/machinery/light{dir = 4; icon_state = "tube1"; pixel_x = 0},/turf/simulated/floor/tiled/dark,/area/medical/medbay_emt_bay) "cyr" = (/turf/simulated/wall,/area/medical/medbay_emt_bay) -"cys" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_x = -32; pixel_y = 0},/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/pink/border{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/exam_room) +"cys" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/pink/border{dir = 8},/obj/structure/closet/secure_closet/medical_wall/pills{pixel_x = -32},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "cyt" = (/obj/structure/bed/chair/office/light{dir = 8},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "cyu" = (/obj/structure/bed/padded,/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 8},/obj/machinery/camera/network/medbay{c_tag = "MED - Examination Room"; dir = 8},/obj/structure/extinguisher_cabinet{pixel_x = 28; pixel_y = 0},/obj/effect/floor_decal/borderfloorwhite{dir = 4},/obj/effect/floor_decal/corner/pink/border{dir = 4},/turf/simulated/floor/tiled/white,/area/medical/exam_room) "cyv" = (/obj/machinery/vending/coffee,/obj/effect/floor_decal/corner/paleblue/diagonal{dir = 4},/obj/machinery/light{dir = 8; icon_state = "tube1"; pixel_y = 0},/turf/simulated/floor/tiled/white,/area/medical/reception) @@ -7598,7 +7598,7 @@ "cQf" = (/obj/structure/closet/secure_closet/medical1,/obj/item/device/radio/intercom/department/medbay{dir = 1; pixel_x = 0; pixel_y = -21},/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/obj/effect/floor_decal/industrial/warning{icon_state = "warning"; dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "cQg" = (/obj/machinery/iv_drip,/obj/machinery/firealarm{dir = 1; pixel_y = -24},/obj/machinery/light,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/medical/sleeper) "cQh" = (/obj/structure/table/glass,/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = 2; pixel_y = 2},/obj/item/weapon/reagent_containers/spray/cleaner{pixel_x = -2; pixel_y = -2},/obj/item/device/radio/intercom{name = "Station Intercom (General)"; pixel_y = -21},/obj/machinery/camera/network/medbay{c_tag = "MED - Acute"; dir = 1},/obj/item/device/defib_kit/loaded,/obj/item/device/defib_kit/loaded,/obj/effect/floor_decal/borderfloorwhite,/obj/effect/floor_decal/corner/paleblue/border,/turf/simulated/floor/tiled/white,/area/medical/sleeper) -"cQi" = (/obj/structure/table/glass,/obj/structure/closet/secure_closet/medical_wall{name = "Pill Cabinet"; pixel_x = 32; pixel_y = 0},/obj/item/weapon/reagent_containers/syringe/antiviral,/obj/item/weapon/storage/pill_bottle/antitox,/obj/item/weapon/storage/pill_bottle/tramadol,/obj/effect/floor_decal/borderfloorwhite{dir = 6},/obj/effect/floor_decal/corner/paleblue/border{dir = 6},/turf/simulated/floor/tiled/white,/area/medical/sleeper) +"cQi" = (/obj/structure/table/glass,/obj/effect/floor_decal/borderfloorwhite{dir = 6},/obj/effect/floor_decal/corner/paleblue/border{dir = 6},/obj/structure/closet/secure_closet/medical_wall/pills{pixel_x = 32},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "cQj" = (/obj/structure/table/glass,/obj/item/roller,/obj/item/roller{pixel_y = 8},/obj/machinery/light,/obj/effect/floor_decal/borderfloorwhite{dir = 8},/obj/effect/floor_decal/corner/pink/border{dir = 8},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "cQk" = (/obj/structure/cable/green{d1 = 1; d2 = 2; icon_state = "1-2"},/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,/obj/machinery/atmospherics/pipe/simple/hidden/supply,/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 8},/obj/effect/floor_decal/steeldecal/steel_decals4{dir = 5},/turf/simulated/floor/tiled/white,/area/medical/sleeper) "cQl" = (/obj/machinery/atmospherics/unary/vent_scrubber/on{dir = 1},/obj/machinery/camera/network/medbay{c_tag = "MED - Diagnostics"; dir = 1},/obj/effect/floor_decal/borderfloorwhite/corner2,/obj/effect/floor_decal/borderfloorwhite/corner2{dir = 9},/obj/effect/floor_decal/corner/pink/bordercorner2,/obj/effect/floor_decal/corner/pink/bordercorner2{dir = 9},/turf/simulated/floor/tiled/white,/area/medical/sleeper)