cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-25 13:07:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/Abi79/tgstation13-git

Browse Source 
Conflicts:
	baystation12.dme
	code/defines/obj/vending.dm
	code/game/machinery/vending.dm
	html/changelog.html
	maps/tgstation.2.0.8.dmm
This commit is contained in:
Miniature
2011-12-07 07:53:20 +10:30
parent 5fec6c6319 df04d75c48
commit af301633f6
72 changed files with 750 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/storage/belt.dm
+1
View File
@@ -108,6 +108,7 @@
//storage_slots = 6
can_hold = list(
"/obj/item/weapon/flashbang",
"/obj/item/weapon/pepperspray",
"/obj/item/weapon/handcuffs",
"/obj/item/device/flash",
"/obj/item/clothing/glasses",