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

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

Browse Source 
# Conflicts:
#	.gitignore
#	vorestation.dme
This commit is contained in:
Kelshark
2017-02-18 09:40:18 -05:00
parent 7d97537d95 ca6366fe70
commit 8df7fcd10a
117 changed files with 3371 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/guns/projectile/pistol_vr.dm Normal file
View File

@@ -0,0 +1,2 @@
/obj/item/weapon/gun/projectile/sec/flash
name = ".45 pistol"