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

..

sniper

…

automatic_vr.dm

…

automatic.dm

Ports more two-handed gun sprites from Bay

2018-02-21 01:57:56 -06:00

boltaction.dm

Gun changes (#4185)

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

contender.dm

Gun changes (#4185)

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

dartgun.dm

…

pistol_vr.dm

More guns for the gun box

2018-01-18 18:53:43 -05:00

pistol.dm

Gun changes (#4185)

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

revolver.dm

44 revolvers

2018-03-26 14:33:43 -07:00

semiauto.dm

…

shotgun.dm

PoI Stage 0.5

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

sniper_vr.dm

Adjust VOREStation guns for PolarisSS13/Polaris/#4185

2018-02-17 16:56:30 -05:00

sniper.dm

Gun changes (#4185)

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