mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-23 04:51:32 +01:00
Adds organ cooler (#8081)
* Organ cooler
* Changelog oc
* Sprite updates
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-Authored-By: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-Authored-By: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-Authored-By: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-Authored-By: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
* Fixed derps
* Roundstart tip fixes
* Revert "Fixed derps"
This reverts commit 75473fbb92.
* unfucks
* MAPS!
* Mapunfuckery!
* MAPS FOR REAL THIS TIME
* Update html/changelogs/organz.yml
Co-Authored-By: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
* Removes wrong changelog
Co-authored-by: mikomyazaki <47489928+mikomyazaki@users.noreply.github.com>
This commit is contained in:
committed by
Werner
co-authored by
mikomyazaki
parent
9c6860e8ed
commit
7fbc20b7ec
@@ -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)
|
||||
starts_with = list(/obj/item/device/encryptionkey/rev = 8)
|
||||
|
||||
@@ -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"
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 75 KiB After Width: | Height: | Size: 75 KiB |
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user