diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index d174f424099..0eb06e9c904 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -537,7 +537,7 @@ /obj/item/reagent_containers/pill/antitox = 6, /obj/item/reagent_containers/pill/cetahydramine = 6, /obj/item/reagent_containers/pill/perconol = 6, - /obj/item/reagent_containers/food/drinks/medcup = 4, + /obj/item/reagent_containers/glass/beaker/medcup = 4, /obj/item/storage/pill_bottle = 4, /obj/item/reagent_containers/spray/sterilizine = 2 ) diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 6a9a7c6d6ca..9e252594de2 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -531,7 +531,7 @@ var/list/asset_datums = list() /datum/asset/spritesheet/chem_master name = "chemmaster" - var/list/bottle_sprites = list("bottle-1", "bottle-2", "bottle-3", "bottle-4") + var/list/bottle_sprites = list("bottle-1", "bottle-2", "bottle-3", "bottle-4", "bottle-5", "bottle-6") var/max_pill_sprite = 20 /datum/asset/spritesheet/chem_master/register() diff --git a/code/modules/mob/living/silicon/robot/items/gripper.dm b/code/modules/mob/living/silicon/robot/items/gripper.dm index b8c6f62e186..b8ed2b59872 100644 --- a/code/modules/mob/living/silicon/robot/items/gripper.dm +++ b/code/modules/mob/living/silicon/robot/items/gripper.dm @@ -283,7 +283,6 @@ /obj/item/stack/material/phoron, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/food/drinks/sillycup, - /obj/item/reagent_containers/food/drinks/medcup, /obj/item/smallDelivery, /obj/item/gift, /obj/item/reagent_containers/chem_disp_cartridge diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index 092ae5d82dc..f45ea2cefb6 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -1,5 +1,5 @@ // Update asset_cache.dm if you change these. -#define BOTTLE_SPRITES list("bottle-1", "bottle-2", "bottle-3", "bottle-4") //list of available bottle sprites +#define BOTTLE_SPRITES list("bottle-1", "bottle-2", "bottle-3", "bottle-4", "bottle-5", "bottle-6") //list of available bottle sprites ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/code/modules/reagents/reagent_containers/food/drinks.dm b/code/modules/reagents/reagent_containers/food/drinks.dm index f09e6bce3d2..75092602061 100644 --- a/code/modules/reagents/reagent_containers/food/drinks.dm +++ b/code/modules/reagents/reagent_containers/food/drinks.dm @@ -321,28 +321,6 @@ If you add a drink with no empty icon sprite, ensure it is flagged as NO_EMPTY_I else icon_state = "water_cup_e" -/obj/item/reagent_containers/food/drinks/medcup - name = "medicine cup" - desc = "A plastic medicine cup. Like a shot glass for medicine." - icon = 'icons/obj/chemical.dmi' - icon_state = "medcup" - filling_states = "25;50;75;100" - drop_sound = 'sound/items/drop/drinkglass.ogg' - pickup_sound = 'sound/items/pickup/drinkglass.ogg' - possible_transfer_amounts = null - volume = 15 - -/obj/item/reagent_containers/food/drinks/medcup/on_reagent_change() - update_icon() - -/obj/item/reagent_containers/food/drinks/medcup/pickup(mob/user) - ..() - update_icon() - -/obj/item/reagent_containers/food/drinks/medcup/dropped(mob/user) - ..() - update_icon() - //////////////////////////JUICES AND STUFF /////////////////////// /obj/item/reagent_containers/food/drinks/carton diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm index 5a1f16a53ab..0458a997c98 100644 --- a/code/modules/reagents/reagent_containers/glass.dm +++ b/code/modules/reagents/reagent_containers/glass.dm @@ -100,8 +100,8 @@ desc = "A beaker." icon = 'icons/obj/chemical.dmi' item_icons = list( - slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi', - slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi', + slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi', ) icon_state = "beaker" item_state = "beaker" @@ -117,7 +117,7 @@ desc += " Can hold up to [volume] units." /obj/item/reagent_containers/glass/beaker/self_feed_message(var/mob/user) - to_chat(user, "You drink from \the [src].") + to_chat(user, SPAN_NOTICE("You drink from \the [src].")) /obj/item/reagent_containers/glass/beaker/on_reagent_change() update_icon() @@ -161,7 +161,6 @@ volume = 120 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120) - flags = OPENCONTAINER fragile = 6 // a bit sturdier /obj/item/reagent_containers/glass/beaker/noreact @@ -184,7 +183,6 @@ volume = 300 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25,30,60,120,300) - flags = OPENCONTAINER fragile = 0 /obj/item/reagent_containers/glass/beaker/vial @@ -196,9 +194,23 @@ volume = 30 amount_per_transfer_from_this = 10 possible_transfer_amounts = list(5,10,15,25) - flags = OPENCONTAINER fragile = 1 // very fragile +/obj/item/reagent_containers/glass/beaker/medcup + name = "medicine cup" + desc = "A glass medicine cup. Like a shot glass for medicine." + icon_state = "medcup" + filling_states = "25;50;75;100" + center_of_mass = list("x" = 15,"y" = 9) + matter = list(MATERIAL_GLASS = 250) + volume = 15 + amount_per_transfer_from_this = 5 + possible_transfer_amounts = null + fragile = 1 + +/obj/item/reagent_containers/glass/beaker/medcup/attack_self() // No lid for the medcup + return + /obj/item/reagent_containers/glass/beaker/cryoxadone/reagents_to_add = list(/decl/reagent/cryoxadone = 30) /obj/item/reagent_containers/glass/beaker/sulphuric/reagents_to_add = list(/decl/reagent/acid = 60) diff --git a/code/modules/reagents/reagent_containers/glass/bottle.dm b/code/modules/reagents/reagent_containers/glass/bottle.dm index 4b89615429a..59d32b4c531 100644 --- a/code/modules/reagents/reagent_containers/glass/bottle.dm +++ b/code/modules/reagents/reagent_containers/glass/bottle.dm @@ -6,8 +6,8 @@ desc = "A small bottle." icon = 'icons/obj/chemical.dmi' item_icons = list( - slot_l_hand_str = 'icons/mob/items/stacks/lefthand_medical.dmi', - slot_r_hand_str = 'icons/mob/items/stacks/righthand_medical.dmi', + slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi', ) icon_state = null item_state = "bottle" @@ -35,7 +35,7 @@ /obj/item/reagent_containers/glass/bottle/Initialize() . = ..() if(!icon_state) - icon_state = "bottle-[rand(1,4)]" + icon_state = "bottle-[rand(1,6)]" update_icon() diff --git a/html/changelogs/beakers_chembottles_sprites.yml b/html/changelogs/beakers_chembottles_sprites.yml new file mode 100644 index 00000000000..3548973377a --- /dev/null +++ b/html/changelogs/beakers_chembottles_sprites.yml @@ -0,0 +1,11 @@ +author: Vrow + +delete-after: True + +changes: + - imagedel: "Deleted Eris-style chem bottles, medcup, beakers, cryostasis beaker, and bluespace beaker." + - tweak: "Tweaked the Eris-style vial sprite and palette to be more consistent with the new sprites." + - imageadd: "Resprites the chem bottles, medcup, beakers, cryostasis beaker, and bluespace beaker into something more fitting to Aurora. With a new lid style as well." + - rscadd: "Added two new types of chem bottles: a mini and a triangular one." + - refactor: "Re-paths the medcup from .../food/drinks to .../glass/beaker/medcup." + - bugfix: "Fixed beaker and bottle in-hands not showing properly." \ No newline at end of file diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index c0ead82cb60..6a3c17c4ec8 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi index bb6cffb7cb2..89ada7809c5 100644 Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ