Unknown 1e45296d31 Conflict Resolution

2019-03-27 10:58:53 -04:00

..

animate.dm

Resolves compile errors with the exception of map errors.

2019-01-12 21:09:29 -05:00

arc.dm

Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding

2019-03-26 13:21:08 -04:00

beams_vr.dm

…

beams.dm

Guns sounds refactor and improvements

2019-03-27 10:42:18 -04:00

blob.dm

Makes Blobs more useful.

2018-09-16 22:12:17 -07:00

bullets_vr.dm

…

bullets.dm

Guns sounds refactor and improvements

2019-03-27 10:42:18 -04:00

change.dm

Merges AI Branch into Master

2018-12-01 00:06:38 -05:00

energy_vr.dm

…

energy.dm

Guns sounds refactor and improvements

2019-03-27 10:42:18 -04:00

force.dm

…

hook.dm

Guns sounds refactor and improvements

2019-03-27 10:42:18 -04:00

magnetic.dm

Event / Future PoI / Other weaponry & tools.

2019-03-27 02:34:28 -04: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

Conflict Resolution

2019-03-27 10:58:53 -04:00