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

..

ammunition

Adds smart magazine, magazine functionality

2018-08-21 17:10:40 -05:00

guns

Merge pull request #5501 from Anewbe/magazine_things

2018-08-24 14:35:55 -07:00

projectile

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

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

targeting

Fixes some layering issues with trees, outdoor turf edges, and the targeting indicator.

2018-07-24 13:30:09 -04:00

ammunition.dm

Adds smart magazine, magazine functionality

2018-08-21 17:10:40 -05:00

dnalocking.dm

Centralizes weight class definitions

2016-09-22 00:51:51 -04:00

effects.dm

Constructs 2.0 - Living Stone (#5040)

2018-04-04 23:45:00 -07:00

gun.dm

Adds smart magazine, magazine functionality

2018-08-21 17:10:40 -05:00

projectile.dm

btw i use arc

2018-08-02 15:11:09 -04:00