diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm index 7a91f120782..abbf384328c 100644 --- a/code/game/objects/items/weapons/storage/boxes.dm +++ b/code/game/objects/items/weapons/storage/boxes.dm @@ -587,11 +587,27 @@ icon_state = "portafreezer" item_state = "medicalpack" max_w_class = 3 - can_hold = list(/obj/item/organ, /obj/item/reagent_containers/food, /obj/item/reagent_containers/glass) max_storage_space = 21 - use_to_pickup = 1 // for picking up broken bulbs, not that most people will try + use_to_pickup = FALSE // for picking up broken bulbs, not that most people will try chewable = FALSE + /obj/item/storage/box/freezer/organcooler + name = "organ cooler" + desc = "A sealed, cooled container to keep organs from decaying." + icon = 'icons/obj/storage.dmi' + icon_state = "organcooler" + item_state = "firstaid-advanced" + max_w_class = ITEMSIZE_NORMAL + w_class = ITEMSIZE_LARGE + can_hold = list( + /obj/item/organ, + /obj/item/reagent_containers/food, + /obj/item/reagent_containers/glass, + /obj/item/gun + ) + use_to_pickup = FALSE + storage_slots = 2 + /obj/item/storage/box/kitchen name = "kitchen supplies" desc = "Contains an assortment of utensils and containers useful in the preparation of food and drinks." @@ -795,4 +811,4 @@ /obj/item/storage/box/encryption_key name = "box" description_antag = "This box contains encryption keys that gives the user a safe channel to chatter in. Access the safe comms with :x." - starts_with = list(/obj/item/device/encryptionkey/rev = 8) \ No newline at end of file + starts_with = list(/obj/item/device/encryptionkey/rev = 8) diff --git a/html/changelogs/organz.yml b/html/changelogs/organz.yml new file mode 100644 index 00000000000..a7d3b8cad2b --- /dev/null +++ b/html/changelogs/organz.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: Pratepresidenten + +# 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: "Added a portable organ cooler" diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi index c2d1e45bbc4..ddf57acee79 100644 Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 993c2cf6ec8..4767448d1ee 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -39585,6 +39585,7 @@ pixel_y = 0 }, /obj/item/storage/box/sharps, +/obj/item/storage/box/freezer/organcooler, /turf/simulated/floor/tiled/white, /area/medical/main_storage) "bqb" = ( @@ -47652,6 +47653,7 @@ "bDR" = ( /obj/structure/table/standard, /obj/item/storage/box/bloodpacks, +/obj/item/storage/box/freezer/organcooler, /turf/simulated/floor/tiled/freezer{ name = "cold storage tiles"; temperature = 278