Arokha Sieyes 055c998f82 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync ...

# Conflicts:
#	code/modules/integrated_electronics/subtypes/reagents.dm
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/organs/organ_external.dm
#	code/modules/ventcrawl/ventcrawl.dm
#	html/changelogs/.all_changelog.yml

2017-04-25 15:04:54 -04:00

..

automatic_vr.dm

Contraband Update (#564)

2016-09-18 23:17:55 -04:00

automatic.dm

Actually gets the HI name right

2017-03-24 15:27:55 -05:00

boltaction.dm

Adds a lever-action rifle

2017-04-13 15:36:37 -05:00

dartgun.dm

Changes the way embedding works

2016-10-11 21:29:49 -05:00

pistol_vr.dm

Security non-lethal balance

2017-02-13 15:49:35 +00:00

pistol.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

revolver.dm

Adds a LeMath Revolver

2017-04-05 14:29:24 +01:00

shotgun.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06:00

sniper_vr.dm

Fixes w_class of items to be consistent with Polaris update (#636)

2016-10-09 19:23:10 -04:00

sniper.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00