diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm index 2b353f08392..172fd6790e3 100644 --- a/code/game/objects/items/weapons/storage/bags.dm +++ b/code/game/objects/items/weapons/storage/bags.dm @@ -330,3 +330,19 @@ w_class = ITEMSIZE_NORMAL can_hold = list(/obj/item/book, /obj/item/spellbook) + // ----------------------------- + // Chemistry Bag + // ----------------------------- +/obj/item/storage/bag/chemistry + name = "chemistry bag" + icon = 'icons/obj/chemical.dmi' + item_icons = list( + slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi', + slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi', + ) + icon_state = "chembag" + desc = "A bag for storing pills and bottles of medicine." + max_storage_space = 200 + w_class = ITEMSIZE_LARGE + slowdown = 1 + can_hold = list(/obj/item/reagent_containers/pill,/obj/item/reagent_containers/glass/beaker,/obj/item/reagent_containers/glass/bottle) 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 1ada3fe3eb9..a447e5fe03f 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm @@ -217,6 +217,8 @@ new /obj/item/storage/box/syringes(src) new /obj/item/storage/box/beakers(src) new /obj/item/storage/box/beakers(src) + new /obj/item/storage/bag/chemistry(src) + new /obj/item/storage/bag/chemistry(src) /obj/structure/closet/secure_closet/medical_wall name = "first aid closet" diff --git a/html/changelogs/greenjoe12345 - chembag.yml b/html/changelogs/greenjoe12345 - chembag.yml new file mode 100644 index 00000000000..0d4740bbba7 --- /dev/null +++ b/html/changelogs/greenjoe12345 - chembag.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: greenjoe12345 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Ported chem bags from Polaris. work like hydroponics bags, but with medicines! Two in the pharmaacy equipment locker." diff --git a/icons/mob/items/lefthand_medical.dmi b/icons/mob/items/lefthand_medical.dmi index 7894b1b2a63..c7a99a7281f 100644 Binary files a/icons/mob/items/lefthand_medical.dmi and b/icons/mob/items/lefthand_medical.dmi differ diff --git a/icons/mob/items/righthand_medical.dmi b/icons/mob/items/righthand_medical.dmi index 7c4e3e75c93..e0758bd40f0 100644 Binary files a/icons/mob/items/righthand_medical.dmi and b/icons/mob/items/righthand_medical.dmi differ diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi index 9153ff85afd..142ff9e3e0a 100644 Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ