Mechoid bbeb578a7e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1 ...

# Fix Conflicts:
#	code/game/objects/items/weapons/grenades/explosive.dm

2018-08-24 16:05:35 -07:00

..

animate.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

arc.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1

2018-08-23 20:17:49 -07:00

beams.dm

Adds a whole bunch of Exosuit weapons and other miscellaneous parts.

2018-08-23 20:14:56 -07:00

bullets.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1

2018-08-24 16:05:35 -07:00

change.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

energy.dm

More Phase Guns (#5276)

2018-06-17 10:35:03 -07:00

force.dm

More projectiles now ignite things

2018-03-11 15:47:48 -05:00

magnetic.dm

Gun changes (#4185)

2018-02-12 23:12:14 -08:00

pellets.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into Mech_Equipment_Carepackage1

2018-08-24 16:05:35 -07:00

special.dm

Ion Rifle returned to original radius. (#5326)

2018-06-04 15:13:10 -05:00