cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10792 from VOREStation/Arokha/portamed

Browse Source 
Eris portable freezer, medical briefcase
This commit is contained in:
Aronai Sieyes
2021-07-03 16:26:07 -04:00
committed by Chompstation Bot
parent 654ef75433
commit 30a01c6490
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/objects/items/weapons/storage/boxes.dm
View File

@@ -527,6 +527,9 @@
max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad. max_storage_space = ITEMSIZE_COST_NORMAL * 5 // Formally 21. Odd numbers are bad.
use_to_pickup = 1 // for picking up broken bulbs, not that most people will try use_to_pickup = 1 // for picking up broken bulbs, not that most people will try
/obj/item/weapon/storage/box/freezer/red
icon_state = "portafreezer_red"
/obj/item/weapon/storage/box/freezer/Entered(var/atom/movable/AM) /obj/item/weapon/storage/box/freezer/Entered(var/atom/movable/AM)
if(istype(AM, /obj/item/organ)) if(istype(AM, /obj/item/organ))
var/obj/item/organ/O = AM var/obj/item/organ/O = AM

2
code/modules/projectiles/guns/energy/cell_loaded_vr/nerd.dm
View File

@@ -45,6 +45,7 @@
/obj/item/weapon/storage/secure/briefcase/nerd_pack_med /obj/item/weapon/storage/secure/briefcase/nerd_pack_med
name = "\improper NERD \'Medigun\' kit" name = "\improper NERD \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!" desc = "A storage case for a multi-purpose healing gun. Variety hour!"
icon_state = "medbriefcase"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)
@@ -60,6 +61,7 @@
/obj/item/weapon/storage/secure/briefcase/nerd_pack_cmo /obj/item/weapon/storage/secure/briefcase/nerd_pack_cmo
name = "\improper Advanced NERD \'Medigun\' kit" name = "\improper Advanced NERD \'Medigun\' kit"
desc = "A storage case for a multi-purpose healing gun. Variety hour!" desc = "A storage case for a multi-purpose healing gun. Variety hour!"
icon_state = "medbriefcase"
w_class = ITEMSIZE_NORMAL w_class = ITEMSIZE_NORMAL
max_w_class = ITEMSIZE_NORMAL max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical) can_hold = list(/obj/item/weapon/gun/projectile/cell_loaded/medical,/obj/item/ammo_magazine/cell_mag/medical,/obj/item/ammo_casing/microbattery/medical)

BIN
icons/obj/storage.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 62 KiB

After

Width:  |  Height:  |  Size: 62 KiB