cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 11:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into pAI-Drone-Port

Browse Source
This commit is contained in:
DZD
2015-01-09 17:47:05 -05:00
parent 7239fc2c40 7e37b4d151
commit fba0657487
90 changed files with 7808 additions and 41390 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/blueprints.dm
-2
View File
@@ -208,8 +208,6 @@ move an amendment</a> to the drawing.</p>
return BORDER_2NDTILE
if (locate(/obj/structure/falsewall) in T2)
return BORDER_2NDTILE
if (locate(/obj/structure/falserwall) in T2)
return BORDER_2NDTILE
return BORDER_NONE
code/game/objects/items/weapons/storage/belt.dm
+20 -1
View File
@@ -177,4 +177,23 @@
"/obj/item/weapon/reagent_containers/spray",
"/obj/item/weapon/soap",
"/obj/item/weapon/holosign_creator"
)
)
/obj/item/weapon/storage/belt/bandolier
name = "bandolier"
desc = "A bandolier for holding shotgun ammunition."
icon_state = "bandolier"
item_state = "bandolier"
storage_slots = 6
can_hold = list(
"/obj/item/ammo_casing/shotgun"
)
/obj/item/weapon/storage/belt/bandolier/full/New()
..()
new /obj/item/ammo_casing/shotgun/beanbag(src)
new /obj/item/ammo_casing/shotgun/beanbag(src)
new /obj/item/ammo_casing/shotgun/beanbag(src)
new /obj/item/ammo_casing/shotgun/beanbag(src)
new /obj/item/ammo_casing/shotgun/beanbag(src)
new /obj/item/ammo_casing/shotgun/beanbag(src)