cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-29 03:22:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/VOREStation/VOREStation

Browse Source 
# Conflicts:
#	config/custom_items.txt
This commit is contained in:
Kelshark
2017-06-23 15:17:00 -04:00
parent eb97e284f6 9e8f09f061
commit 7b91330ac1
19 changed files with 505 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -142,10 +142,10 @@
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/device/flash(src)
new /obj/item/weapon/melee/baton/loaded(src)
new /obj/item/weapon/gun/projectile/lamia(src)
/*new /obj/item/weapon/gun/projectile/lamia(src)
new /obj/item/ammo_magazine/m44/rubber(src)
new /obj/item/ammo_magazine/m44(src)
new /obj/item/ammo_magazine/m44(src)
new /obj/item/ammo_magazine/m44(src)*/ // NO YOU DO NOT GET A .44 MAGNUM! -Ace
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/cell/device/weapon(src)
new /obj/item/weapon/melee/telebaton(src)