From f27bdf1dc49b85dbaa3d7cc03fc2e387ee83ca7d Mon Sep 17 00:00:00 2001 From: lukevale Date: Thu, 17 Dec 2020 12:06:36 -0600 Subject: [PATCH] Beakres Adds in beakers. Fully working. As long as I didn't fuck up any pathing that is. --- .../reagents/reagent_containers/glass_vr.dm | 7 +++++++ icons/obj/chemical_vr.dmi | Bin 3149 -> 3307 bytes icons/obj/reagentfillings.dmi | Bin 2720 -> 2859 bytes 3 files changed, 7 insertions(+) diff --git a/code/modules/reagents/reagent_containers/glass_vr.dm b/code/modules/reagents/reagent_containers/glass_vr.dm index 09e6ce559a..79c19b8288 100644 --- a/code/modules/reagents/reagent_containers/glass_vr.dm +++ b/code/modules/reagents/reagent_containers/glass_vr.dm @@ -48,3 +48,10 @@ /obj/item/weapon/reagent_containers/glass/beaker/vial/hyronalin name = "vial (hyronalin)" prefill = list("hyronalin" = 30) + +/obj/item/weapon/reagent_containers/glass/beaker/measuring_cup + name = "measuring cup" + desc = "A measuring cup." + icon = 'icons/obj/chemical_vr.dmi' + icon_state = "measure_cup" + item_state = "measure_cup" \ No newline at end of file diff --git a/icons/obj/chemical_vr.dmi b/icons/obj/chemical_vr.dmi index 973be492af55795e897f0aae7e1829a87c8bde67..ce49f9d4e87ebb5f33e63d198e38b4d5678bfaef 100644 GIT binary patch delta 3165 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 DQ}hZe delta 2984 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 Kaj!WNcJ+U8Uwa7v