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

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise

Browse Source
This commit is contained in:
Markolie
2014-12-13 18:59:25 +01:00
parent 6d3f0e8bf4 c3484c22e1
commit 320f4ee151
32 changed files with 702 additions and 585 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
-17
View File
@@ -152,23 +152,6 @@
new /obj/item/weapon/dnainjector/m2h(src)
new /obj/item/weapon/dnainjector/m2h(src)
/obj/item/weapon/storage/box/blanks
name = "box of birdshot shells"
desc = "It has a picture of a gun and several warning symbols on the front."
m_amt = 41000
New()
..()
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
new /obj/item/ammo_casing/shotgun/birdshot(src)
/obj/item/weapon/storage/box/gauge
name = "box of 12 gauge slugs"
desc = "It has a picture of a gun and several warning symbols on the front."
code/game/objects/items/weapons/storage/uplink_kits.dm
+1 -1
View File
@@ -18,7 +18,7 @@
if("bond")
new /obj/item/weapon/gun/projectile/automatic/pistol(src)
new /obj/item/weapon/silencer(src)
new /obj/item/weapon/suppressor(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/clothing/under/chameleon(src)