cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-26 10:03:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
c826d3d23786a4e733f6fc34a6e9816fcc69a50d
Polaris/code/modules/projectiles/guns/energy
History
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
..
laser.dm
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00
nuclear.dm
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00
pulse.dm
Adjusts charge costs for gun/energy
2015-05-07 00:13:21 -04:00
special.dm
Makes special wizard projectile staffs only usable by wizards.
2015-06-04 19:42:06 +01:00
stun.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-06-20 20:40:06 +02:00
temperature.dm
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00