cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-29 23:16:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

Browse Source 
# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml
This commit is contained in:
Leshana
2018-05-10 13:48:20 -04:00
parent c0c9ab541f 7075a65df0
commit 33202c5c38
38 changed files with 487 additions and 4230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -450,7 +450,7 @@
item_state_slots = list(slot_r_hand_str = "medicalpack", slot_l_hand_str = "medicalpack")
foldable = null
max_w_class = ITEMSIZE_NORMAL
can_hold = list(/obj/item/organ, /obj/item/weapon/reagent_containers/food, /obj/item/weapon/reagent_containers/glass)
can_hold = list(/obj/item/organ)
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