cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2927 from Baystation12/master

Browse Source 
Merging master to BEF
This commit is contained in:
Chinsky
2013-05-31 19:49:13 -07:00
parent 9b500764b9 40fc0f31f4
commit de4f4e4788
20 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/belt.dm
+2 -1
View File
@@ -51,7 +51,8 @@
"/obj/item/device/flashlight",
"/obj/item/weapon/cable_coil",
"/obj/item/device/t_scanner",
"/obj/item/device/analyzer")
"/obj/item/device/analyzer",
"/obj/item/taperoll/engineering")
/obj/item/weapon/storage/belt/utility/full/New()
code/game/objects/items/weapons/storage/firstaid.dm
+1 -1
View File
@@ -103,7 +103,7 @@
icon = 'icons/obj/chemical.dmi'
item_state = "contsolid"
w_class = 2.0
can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice")
can_hold = list("/obj/item/weapon/reagent_containers/pill","/obj/item/weapon/dice","/obj/item/weapon/paper")
allow_quick_gather = 1
use_to_pickup = 1
storage_slots = 14