cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-29 11:31:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
38c6ba3a071ae079da4cc37ce9dde5a43f67b4a9
Polaris/code/modules/projectiles/guns/projectile/automatic.dm
PsiOmegaDelta 405131a54e Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/projectiles/guns/energy/stun.dm
	code/modules/projectiles/guns/projectile/pistol.dm
	code/modules/projectiles/guns/projectile/revolver.dm
2015-06-20 20:40:06 +02:00

8.3 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink