cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze

Browse Source 
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
This commit is contained in:
Chinsky
2013-06-08 05:55:42 +04:00
parent 9a930d0c50 76d1ddaa26
commit e40140be03
12 changed files with 250 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+1
View File
@@ -108,6 +108,7 @@
item_state = "security"//Could likely use a better one.
storage_slots = 7
max_w_class = 3
max_combined_w_class = 21
can_hold = list(
"/obj/item/weapon/grenade/flashbang",
"/obj/item/weapon/reagent_containers/spray/pepper",