Leshana 1d0f5262d8 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07 ...

# Conflicts:
#	code/__defines/subsystems.dm
#	code/controllers/master_controller.dm
#	code/controllers/subsystems/atoms.dm
#	code/game/machinery/Sleeper.dm
#	code/game/machinery/doors/airlock.dm
#	code/game/machinery/vr_console.dm
#	code/game/objects/items/devices/communicator/phone.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/modules/admin/admin_verbs.dm
#	code/modules/mob/living/carbon/carbon.dm
#	code/modules/multiz/movement.dm
#	code/modules/projectiles/gun.dm
#	code/modules/shuttles/shuttle.dm
#	code/modules/shuttles/shuttles_web.dm
#	icons/obj/doors/doormed.dmi
#	maps/southern_cross/items/headset_sc.dm
#	maps/southern_cross/southern_cross-3.dmm
#	vorestation.dme

2018-02-07 19:30:50 -05:00

..

sniper

Adds Collapsible AM rifle. Createes new uplink entry (#3644)

2017-07-28 16:06:20 -05:00

automatic_vr.dm

Updated VOREStation specific files for the ammo path reorganization.

2017-06-02 12:18:13 -04:00

automatic.dm

Comments out the automatic firemode code (#4748)

2018-02-07 09:59:42 -08:00

boltaction.dm

Removes the mosin-nagant, moves the sprites

2017-11-22 01:14:14 -06:00

contender.dm

Fixes things

2017-06-20 14:12:36 +01:00

dartgun.dm

More merging updates

2017-09-19 23:58:40 -04:00

pistol_vr.dm

More guns for the gun box

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

pistol.dm

9mm pistol updates (#4480)

2018-01-14 14:45:15 -06:00

revolver.dm

fixed a thing

2017-11-07 21:40:00 +11:00

semiauto.dm

Grammar error

2017-09-01 04:46:44 -04:00

shotgun.dm

More merging updates

2017-09-19 23:58:40 -04:00

sniper_vr.dm

sleepy commit

2017-07-04 06:38:32 -04:00

sniper.dm

Sniper Changes and Fixes

2017-08-09 21:04:58 -04:00