cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-15 09:03:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1368 from Neerti/4/6/2016_new_inventory_port

Browse Source 
Ports Bay's new inventory system.
This commit is contained in:
EmperorJon
2016-04-16 02:58:07 +01:00
parent e4006bb9da 25c04df5bd
commit 482316ed55
27 changed files with 240 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/inflatable.dm
+2 -1
View File
@@ -40,7 +40,7 @@
/obj/structure/inflatable/bullet_act(var/obj/item/projectile/Proj)
var/proj_damage = Proj.get_structure_damage()
if(!proj_damage) return
health -= proj_damage
..()
if(health <= 0)
@@ -248,6 +248,7 @@
desc = "Contains inflatable walls and doors."
icon_state = "inf_box"
item_state = "syringe_kit"
w_class = 3
max_storage_space = 28
can_hold = list(/obj/item/inflatable)