Leshana 33202c5c38 Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01 ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/giant_spider.dm
#	html/changelogs/.all_changelog.yml

2018-05-10 13:48:20 -04:00

..

ammunition

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

guns

Merge commit '7075a65df022bc0eae0c3fe6ff501b1bce449cdd' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-05-01

2018-05-10 13:48:20 -04:00

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-04-04

2018-04-06 15:40:06 -04:00

targeting

…

ammunition.dm

…

dnalocking.dm

…

effects.dm

Constructs 2.0 - Living Stone (#5040)

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

gun.dm

Fix missing descriptions on guns.

2018-04-27 09:48:43 -04:00

projectile.dm

POLARIS: Beam weapons runtime when you shoot yourself

2018-03-25 17:09:56 -04:00