From e6dca3ffa1e749119c3e92daa546f4a5b9091910 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Tue, 30 Apr 2019 19:34:22 +0200 Subject: [PATCH 1/4] Colored pillbottles --- code/game/objects/items/contraband.dm | 6 ++---- code/game/objects/items/weapons/dice.dm | 1 + .../objects/items/weapons/storage/firstaid.dm | 17 +++++++++++++++++ icons/obj/chemical.dmi | Bin 36555 -> 36638 bytes 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 7ce7b07193d..74d2e3f06b2 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -4,6 +4,7 @@ /obj/item/storage/pill_bottle/happy name = "Happy pills" desc = "Highly illegal drug. When you want to see the rainbow." + wrapper_color = COLOR_PINK /obj/item/storage/pill_bottle/happy/New() ..() @@ -18,6 +19,7 @@ /obj/item/storage/pill_bottle/zoom name = "Zoom pills" desc = "Highly illegal drug. Trade brain for speed." + wrapper_color = COLOR_BLUE /obj/item/storage/pill_bottle/zoom/New() ..() @@ -49,8 +51,6 @@ adulterants-- reagents.add_reagent(pick_list("chemistry_tools.json", "CYBERPUNK_drug_adulterants"), 3) - - /obj/item/storage/pill_bottle/random_drug_bottle name = "pill bottle (???)" desc = "Huh." @@ -59,5 +59,3 @@ ..() for(var/i in 1 to 5) new /obj/item/reagent_containers/food/pill/random_drugs(src) - - diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm index 40fc1bf7d56..cfb52c452c2 100644 --- a/code/game/objects/items/weapons/dice.dm +++ b/code/game/objects/items/weapons/dice.dm @@ -4,6 +4,7 @@ icon = 'icons/obj/dice.dmi' icon_state = "dicebag" can_hold = list(/obj/item/dice) + allow_wrap = FALSE /obj/item/storage/pill_bottle/dice/New() ..() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index fab82df4b4e..62e6baa1187 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -254,10 +254,24 @@ var/applying_meds = FALSE //To Prevent spam clicking and generating runtimes from apply a deleting pill multiple times. var/rapid_intake_message = "unscrews the cap on the pill bottle and begins dumping the entire contents down their throat!" var/rapid_post_instake_message = "downs the entire bottle of pills in one go!" + var/allow_wrap = TRUE + var/wrapper_color = null /obj/item/storage/pill_bottle/New() ..() base_name = name + if(allow_wrap) + apply_wrap() + +/obj/item/storage/pill_bottle/proc/apply_wrap() + if(wrapper_color) + overlays.Cut() + var/image/I = image(icon, "pillbottle_wrap") + I.color = wrapper_color + overlays += I + else + wrapper_color = pick(COLOR_RED, COLOR_BLUE, COLOR_CYAN, COLOR_GRAY, COLOR_GREEN, COLOR_ORANGE, COLOR_PINK, COLOR_RED, COLOR_YELLOW) + apply_wrap() /obj/item/storage/pill_bottle/attack(mob/M, mob/user) if(iscarbon(M) && contents.len) @@ -324,10 +338,12 @@ cant_hold = list() rapid_intake_message = "flips the lid of the Patch Pack open and begins rapidly stamping patches on themselves!" rapid_post_instake_message = "stamps the entire contents of the Patch Pack all over their entire body!" + allow_wrap = FALSE /obj/item/storage/pill_bottle/charcoal name = "Pill bottle (Charcoal)" desc = "Contains pills used to counter toxins." + wrapper_color = COLOR_GREEN New() ..() @@ -342,6 +358,7 @@ /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" desc = "Contains various pills for minor pain relief." + wrapper_color = COLOR_RED /obj/item/storage/pill_bottle/painkillers/New() ..() diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 9c9f6d38e941aa1bf9d7c4a2e02833f31bab65bf..463b40a8970b3a861a8adb420bbc6f63e7711cfb 100644 GIT binary patch delta 16568 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 T)cEKefPNI@RAkGfO@jUhG};%= From d33d018e62919560f6ceaba86e57ccb98fe08ca0 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 30 Jun 2019 16:08:33 +0200 Subject: [PATCH 2/4] Finished colors for other prespawned pillbottles, new colors, finished template for changing wrappers in chemmaster --- code/__DEFINES/misc.dm | 92 +++++++++++++++++-- code/game/objects/items/contraband.dm | 1 + code/game/objects/items/random_items.dm | 1 + .../objects/items/weapons/storage/firstaid.dm | 14 ++- .../crates_lockers/closets/secure/medical.dm | 1 + .../chemistry/machinery/chem_master.dm | 5 + 6 files changed, 99 insertions(+), 15 deletions(-) diff --git a/code/__DEFINES/misc.dm b/code/__DEFINES/misc.dm index dff9426c641..93efd7fb2a0 100644 --- a/code/__DEFINES/misc.dm +++ b/code/__DEFINES/misc.dm @@ -57,16 +57,88 @@ #define MAX_STACK_AMOUNT_GLASS 50 #define MAX_STACK_AMOUNT_RODS 60 -//some colors -#define COLOR_RED "#FF0000" -#define COLOR_GREEN "#00FF00" -#define COLOR_BLUE "#0000FF" -#define COLOR_CYAN "#00FFFF" -#define COLOR_PINK "#FF00FF" -#define COLOR_YELLOW "#FFFF00" -#define COLOR_ORANGE "#FF9900" -#define COLOR_WHITE "#FFFFFF" -#define COLOR_GRAY "#808080" +//Colors +#define COLOR_RED "#FF0000" +#define COLOR_GREEN "#00FF00" +#define COLOR_BLUE "#0000FF" +#define COLOR_CYAN "#00FFFF" +#define COLOR_PINK "#FF00FF" +#define COLOR_YELLOW "#FFFF00" +#define COLOR_ORANGE "#FF9900" +#define COLOR_WHITE "#FFFFFF" +#define COLOR_GRAY "#808080" +#define COLOR_BLACK "#000000" +#define COLOR_NAVY_BLUE "#000080" +#define COLOR_LIGHT_GREEN "#008000" +#define COLOR_DARK_GRAY "#404040" +#define COLOR_MAROON "#800000" +#define COLOR_PURPLE "#800080" +#define COLOR_VIOLET "#9933ff" +#define COLOR_OLIVE "#808000" +#define COLOR_BROWN_ORANGE "#824b28" +#define COLOR_DARK_ORANGE "#b95a00" +#define COLOR_GRAY40 "#666666" +#define COLOR_GRAY20 "#333333" +#define COLOR_GRAY15 "#151515" +#define COLOR_SEDONA "#cc6600" +#define COLOR_DARK_BROWN "#917448" +#define COLOR_DEEP_SKY_BLUE "#00e1ff" +#define COLOR_LIME "#00ff00" +#define COLOR_TEAL "#33cccc" +#define COLOR_PALE_PINK "#bf89ba" +#define COLOR_YELLOW_GRAY "#c9a344" +#define COLOR_PALE_YELLOW "#c1bb7a" +#define COLOR_WARM_YELLOW "#b3863c" +#define COLOR_RED_GRAY "#aa5f61" +#define COLOR_BROWN "#b19664" +#define COLOR_GREEN_GRAY "#8daf6a" +#define COLOR_DARK_GREEN_GRAY "#54654c" +#define COLOR_BLUE_GRAY "#6a97b0" +#define COLOR_DARK_BLUE_GRAY "#3e4855" +#define COLOR_SUN "#ec8b2f" +#define COLOR_PURPLE_GRAY "#a2819e" +#define COLOR_BLUE_LIGHT "#33ccff" +#define COLOR_RED_LIGHT "#ff3333" +#define COLOR_BEIGE "#ceb689" +#define COLOR_BABY_BLUE "#89cff0" +#define COLOR_PALE_GREEN_GRAY "#aed18b" +#define COLOR_PALE_RED_GRAY "#cc9090" +#define COLOR_PALE_PURPLE_GRAY "#bda2ba" +#define COLOR_PALE_BLUE_GRAY "#8bbbd5" +#define COLOR_LUMINOL "#66ffff" +#define COLOR_SILVER "#c0c0c0" +#define COLOR_GRAY80 "#cccccc" +#define COLOR_OFF_WHITE "#eeeeee" +#define COLOR_GOLD "#6d6133" +#define COLOR_NT_RED "#9d2300" +#define COLOR_BOTTLE_GREEN "#1f6b4f" +#define COLOR_PALE_BTL_GREEN "#57967f" +#define COLOR_GUNMETAL "#545c68" +#define COLOR_WALL_GUNMETAL "#353a42" +#define COLOR_STEEL "#a8b0b2" +#define COLOR_MUZZLE_FLASH "#ffffb2" +#define COLOR_CHESTNUT "#996633" +#define COLOR_BEASTY_BROWN "#663300" +#define COLOR_WHEAT "#ffff99" +#define COLOR_CYAN_BLUE "#3366cc" +#define COLOR_LIGHT_CYAN "#66ccff" +#define COLOR_PAKISTAN_GREEN "#006600" +#define COLOR_HULL "#436b8e" +#define COLOR_AMBER "#ffbf00" +#define COLOR_COMMAND_BLUE "#46698c" +#define COLOR_SKY_BLUE "#5ca1cc" +#define COLOR_PALE_ORANGE "#b88a3b" +#define COLOR_CIVIE_GREEN "#b7f27d" +#define COLOR_TITANIUM "#d1e6e3" +#define COLOR_DARK_GUNMETAL "#4c535b" +#define COLOR_BRONZE "#8c7853" +#define COLOR_BRASS "#b99d71" +#define COLOR_INDIGO "#4b0082" +#define COLOR_ALUMINIUM "#bbbbbb" +#define COLOR_CRYSTAL "#00c8a5" +#define COLOR_ASTEROID_ROCK "#735555" +#define COLOR_NULLGLASS "#ff6088" +#define COLOR_DIAMOND "#d8d4ea" //FONTS: // Used by Paper and PhotoCopier (and PaperBin once a year). diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index 74d2e3f06b2..d7060b9895d 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -54,6 +54,7 @@ /obj/item/storage/pill_bottle/random_drug_bottle name = "pill bottle (???)" desc = "Huh." + wrapper_color = COLOR_GRAY /obj/item/storage/pill_bottle/random_drug_bottle/New() ..() diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 587b1d27d14..3ce832cf194 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -123,6 +123,7 @@ /obj/item/storage/pill_bottle/random_meds name = "unlabelled pillbottle" desc = "The sheer recklessness of this bottle's existence astounds you." + wrapper_color = COLOR_GRAY var/labelled = FALSE /obj/item/storage/pill_bottle/random_meds/New() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 62e6baa1187..ae374d0abb9 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -269,9 +269,6 @@ var/image/I = image(icon, "pillbottle_wrap") I.color = wrapper_color overlays += I - else - wrapper_color = pick(COLOR_RED, COLOR_BLUE, COLOR_CYAN, COLOR_GRAY, COLOR_GREEN, COLOR_ORANGE, COLOR_PINK, COLOR_RED, COLOR_YELLOW) - apply_wrap() /obj/item/storage/pill_bottle/attack(mob/M, mob/user) if(iscarbon(M) && contents.len) @@ -288,6 +285,9 @@ else return ..() +/obj/item/storage/pill_bottle/ert + wrapper_color = COLOR_TEAL + /obj/item/storage/pill_bottle/ert/New() ..() new /obj/item/reagent_containers/food/pill/salicylic(src) @@ -333,6 +333,7 @@ /obj/item/storage/pill_bottle/patch_pack name = "Patch Pack" + desc = "It's a container for storing medical patches." icon_state = "patch_pack" can_hold = list(/obj/item/reagent_containers/food/pill/patch) cant_hold = list() @@ -358,7 +359,7 @@ /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" desc = "Contains various pills for minor pain relief." - wrapper_color = COLOR_RED + wrapper_color = LIGHT_COLOR_RED /obj/item/storage/pill_bottle/painkillers/New() ..() @@ -371,8 +372,11 @@ new /obj/item/reagent_containers/food/pill/salicylic(src) new /obj/item/reagent_containers/food/pill/salicylic(src) +/obj/item/storage/pill_bottle/fakedeath + wrapper_color = COLOR_GRAY + /obj/item/storage/pill_bottle/fakedeath/New() ..() new /obj/item/reagent_containers/food/pill/fakedeath(src) new /obj/item/reagent_containers/food/pill/fakedeath(src) - new /obj/item/reagent_containers/food/pill/fakedeath(src) \ No newline at end of file + new /obj/item/reagent_containers/food/pill/fakedeath(src) 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 5e300b0e7a0..5e51f8e966c 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -110,6 +110,7 @@ /obj/item/storage/pill_bottle/psychiatrist name = "psychiatrist's pill bottle" desc = "Contains various pills to calm or sedate patients." + wrapper_color = COLOR_WHITE /obj/item/storage/pill_bottle/psychiatrist/New() ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index e10cd5c9203..fab9fbb2fb2 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -133,6 +133,11 @@ if(loaded_pill_bottle) loaded_pill_bottle.forceMove(loc) loaded_pill_bottle = null + else if(href_list["change_pillbottle"]) + if(loaded_pill_bottle) + loaded_pill_bottle.wrapper_color = COLOR_RED; + loaded_pill_bottle.apply_wrap(); + usr << browse(null, "window=chem_master_iconsel") else if(href_list["close"]) usr << browse(null, "window=chem_master") onclose(usr, "chem_master") From bef3b60b6e43da0e666923cee22b34416cf5a778 Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 30 Jun 2019 16:09:15 +0200 Subject: [PATCH 3/4] Leftovers of last commit --- icons/obj/chemical.dmi | Bin 36638 -> 36616 bytes nano/templates/chem_master.tmpl | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 463b40a8970b3a861a8adb420bbc6f63e7711cfb..f007687d5686fd8d2c0a40fb3a00236fd8462330 100644 GIT binary patch delta 17343 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 D$%m!u delta 17365 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%0AQ?p2^7CQ>1_V`OJ6t*mYPyWJ z9h{mp4Yi^NHG@P@0iwVs$QdOu%Brj{jcAJ!$1||a+K_sLeCL=yeHE5tE5kWY8FSlMbukx9z zMC|jHrZTMvJOwkr@~`AL8)s>w*(0}yKWmeeBDGdHChV4ya-v|sn(m!zqUp&>bxVZc zX~)5QM)N6qC71+H$=zd`Nv6O684DKTDN&4%^InafyhC(rsa-6&6tS1^O3h&-?2w zU8Vd_d@}@7kR15Frrr~Twh^pE7NG2FVyyD`nF`@lS3S|Ye?GJWOon6=p=H~Dl9Ut2 z5Pd6xh_u}impmt=WLG+u%F(I zjIhR{2;;hvhb_0g24fGBI+B|M$wN!-2jK~PQH_;G3DH-DO5f@dYK12@UnRKrf}Dv$ zUk(Qod7Z$=I!dU3zM_qHM2wKvYPh(@(0ke=a`j|@Gs-4U??IEvQvA^F+x-wVPIFbK zU(L@98^)<8FB&$UT*3V)g`JV1VfXd*0sb>ZqhjQIw7quz+Y7t8xwyYa#&CgLIR}bj z4@Cd@@`cASE?7d714)074k(g~1O!X_fisy{K)de2zhu%&gbT49_en@QBk%q83` z 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 W`+~IJ(6iD2pdhCrTPkfF@c#f?wqvyb diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl index 385237727db..a3021fbfd9c 100644 --- a/nano/templates/chem_master.tmpl +++ b/nano/templates/chem_master.tmpl @@ -82,8 +82,23 @@ {{/if}} {{if data.loaded_pill_bottle}} - {{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}} + + + + + +
+ {{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}} + + {{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}} +
{{else}} - {{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}} + + + + +
+ {{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}} +
{{/if}} \ No newline at end of file From de9da045724bc6797d8dc45b261cb74bad90cefb Mon Sep 17 00:00:00 2001 From: Arkatos1 Date: Sun, 30 Jun 2019 19:46:13 +0200 Subject: [PATCH 4/4] Standardized colors, finished change wrapper choosing and modified templates and their sizes --- code/game/objects/items/contraband.dm | 2 +- code/game/objects/items/random_items.dm | 2 +- .../objects/items/weapons/storage/firstaid.dm | 6 ++-- .../crates_lockers/closets/secure/medical.dm | 2 +- .../chemistry/machinery/chem_master.dm | 36 ++++++++++++++++--- nano/templates/chem_master.tmpl | 34 +++++++++--------- 6 files changed, 56 insertions(+), 26 deletions(-) diff --git a/code/game/objects/items/contraband.dm b/code/game/objects/items/contraband.dm index d7060b9895d..77aef9bb71d 100644 --- a/code/game/objects/items/contraband.dm +++ b/code/game/objects/items/contraband.dm @@ -54,7 +54,7 @@ /obj/item/storage/pill_bottle/random_drug_bottle name = "pill bottle (???)" desc = "Huh." - wrapper_color = COLOR_GRAY + allow_wrap = FALSE /obj/item/storage/pill_bottle/random_drug_bottle/New() ..() diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm index 3ce832cf194..e51bac10005 100644 --- a/code/game/objects/items/random_items.dm +++ b/code/game/objects/items/random_items.dm @@ -123,7 +123,7 @@ /obj/item/storage/pill_bottle/random_meds name = "unlabelled pillbottle" desc = "The sheer recklessness of this bottle's existence astounds you." - wrapper_color = COLOR_GRAY + allow_wrap = FALSE var/labelled = FALSE /obj/item/storage/pill_bottle/random_meds/New() diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index ae374d0abb9..8d8cb77e597 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -286,7 +286,7 @@ return ..() /obj/item/storage/pill_bottle/ert - wrapper_color = COLOR_TEAL + wrapper_color = COLOR_MAROON /obj/item/storage/pill_bottle/ert/New() ..() @@ -359,7 +359,7 @@ /obj/item/storage/pill_bottle/painkillers name = "Pill Bottle (Salicylic Acid)" desc = "Contains various pills for minor pain relief." - wrapper_color = LIGHT_COLOR_RED + wrapper_color = COLOR_RED /obj/item/storage/pill_bottle/painkillers/New() ..() @@ -373,7 +373,7 @@ new /obj/item/reagent_containers/food/pill/salicylic(src) /obj/item/storage/pill_bottle/fakedeath - wrapper_color = COLOR_GRAY + allow_wrap = FALSE /obj/item/storage/pill_bottle/fakedeath/New() ..() 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 5e51f8e966c..33496dc8cdf 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -110,7 +110,7 @@ /obj/item/storage/pill_bottle/psychiatrist name = "psychiatrist's pill bottle" desc = "Contains various pills to calm or sedate patients." - wrapper_color = COLOR_WHITE + wrapper_color = COLOR_PALE_BTL_GREEN /obj/item/storage/pill_bottle/psychiatrist/New() ..() diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm index fab9fbb2fb2..c54d5cf528a 100644 --- a/code/modules/reagents/chemistry/machinery/chem_master.dm +++ b/code/modules/reagents/chemistry/machinery/chem_master.dm @@ -135,9 +135,37 @@ loaded_pill_bottle = null else if(href_list["change_pillbottle"]) if(loaded_pill_bottle) - loaded_pill_bottle.wrapper_color = COLOR_RED; + var/list/wrappers = list("Default wrapper", "Red wrapper", "Green wrapper", "Pale green wrapper", "Blue wrapper", "Light blue wrapper", "Teal wrapper", "Yellow wrapper", "Orange wrapper", "Pink wrapper", "Brown wrapper") + var/chosen = input(usr, "Select a pillbottle wrapper", "Pillbottle wrapper", wrappers[1]) as null|anything in wrappers + if(!chosen) + return + var/color + switch(chosen) + if("Default wrapper") + loaded_pill_bottle.cut_overlays() + return + if("Red wrapper") + color = COLOR_RED + if("Green wrapper") + color = COLOR_GREEN + if("Pink wrapper") + color = COLOR_PINK + if("Teal wrapper") + color = COLOR_TEAL + if("Blue wrapper") + color = COLOR_BLUE + if("Brown wrapper") + color = COLOR_MAROON + if("Light blue wrapper") + color = COLOR_CYAN_BLUE + if("Yellow wrapper") + color = COLOR_YELLOW + if("Pale green wrapper") + color = COLOR_PALE_BTL_GREEN + if("Orange wrapper") + color = COLOR_ORANGE + loaded_pill_bottle.wrapper_color = color; loaded_pill_bottle.apply_wrap(); - usr << browse(null, "window=chem_master_iconsel") else if(href_list["close"]) usr << browse(null, "window=chem_master") onclose(usr, "chem_master") @@ -190,7 +218,7 @@ dat += "(Back)" else dat += "Condimaster 3000Condiment infos:

Name:
[href_list["name"]]

Description:
[href_list["desc"]]


(Back)" - usr << browse(dat, "window=chem_master;size=575x400") + usr << browse(dat, "window=chem_master;size=575x500") return else if(href_list["add"]) @@ -393,7 +421,7 @@ ui = SSnanoui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) - ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 400) + ui = new(user, src, ui_key, "chem_master.tmpl", name, 575, 500) ui.open() /obj/machinery/chem_master/ui_data(mob/user, ui_key = "main", datum/topic_state/state = default_state) diff --git a/nano/templates/chem_master.tmpl b/nano/templates/chem_master.tmpl index a3021fbfd9c..1d040d52af7 100644 --- a/nano/templates/chem_master.tmpl +++ b/nano/templates/chem_master.tmpl @@ -80,25 +80,27 @@ {{else}} No beaker loaded
{{/if}} - - {{if data.loaded_pill_bottle}} - - - - - -
- {{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}} - - {{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}} -
- {{else}} +
+ + {{if data.loaded_pill_bottle}} +
- {{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}} + {{:helper.link('Pill Bottle (' + data.loaded_pill_bottle_contents_len + '/' + data.loaded_pill_bottle_storage_slots + ')', 'eject', {'ejectp': 1})}} + + {{:helper.link('Change Wrapper', 'pencil', {'change_pillbottle': 1})}}
- {{/if}} - \ No newline at end of file + {{else}} + + + + +
+ {{:helper.link('No Pill Bottle', 'eject', {}, 'disabled')}} +
+ {{/if}} + +
\ No newline at end of file