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

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev

Browse Source
This commit is contained in:
Zuhayr
2014-10-17 06:18:49 +10:30
parent b3c2a691f8 0ad3c04f5e
commit abc00094ca
2 changed files with 264 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/items/bodybag.dm
View File

@@ -35,6 +35,8 @@
icon_state = "bodybag_closed" icon_state = "bodybag_closed"
icon_closed = "bodybag_closed" icon_closed = "bodybag_closed"
icon_opened = "bodybag_open" icon_opened = "bodybag_open"
open_sound = 'sound/items/zip.ogg'
close_sound = 'sound/items/zip.ogg'
var/item_path = /obj/item/bodybag var/item_path = /obj/item/bodybag
density = 0 density = 0
storage_capacity = (mob_size * 2) - 1 storage_capacity = (mob_size * 2) - 1
@@ -106,8 +108,6 @@
desc = "A non-reusable plastic bag designed to prevent additional damage to an occupant at the cost of genetic damage." desc = "A non-reusable plastic bag designed to prevent additional damage to an occupant at the cost of genetic damage."
icon = 'icons/obj/cryobag.dmi' icon = 'icons/obj/cryobag.dmi'
item_path = /obj/item/bodybag/cryobag item_path = /obj/item/bodybag/cryobag
open_sound = 'sound/items/zip.ogg'
close_sound = 'sound/items/zip.ogg'
store_misc = 0 store_misc = 0
store_items = 0 store_items = 0
var/used = 0 var/used = 0

521
maps/tgstation2.dmm
View File

File diff suppressed because it is too large Load Diff