Kelshark 8df7fcd10a Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	.gitignore
#	vorestation.dme

2017-02-18 09:40:18 -05:00

..

automatic_vr.dm

Contraband Update (#564)

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

automatic_yw.dm

wolfbrigade m8

2016-12-28 21:06:34 -05:00

automatic.dm

Polaris Sync October 9th (#633)

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

boltaction.dm

Surgical tools will no longer cause damage on help intent

2017-01-21 18:34:05 -06: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_yw.dm

guns and other things

2016-12-17 14:09:44 -05:00

pistol.dm

Polaris Sync October 9th (#633)

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

revolver_yw.dm

p

2016-12-18 04:13:47 +01:00

revolver.dm

Response to feedback.

2016-06-03 01:57:13 -04: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