Kelshark 9bb51e45e4 Merge branch 'master' of https://github.com/VOREStation/VOREStation ...

# Conflicts:
#	code/game/machinery/vending.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/vore/eating/bellymodes_vr.dm
#	config/custom_items.txt
#	icons/obj/mining.dmi

2018-02-24 22:51:59 -05:00

..

ammunition

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

2018-01-24 19:52:12 -05:00

guns

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

2018-02-24 22:51:59 -05:00

projectile

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

2018-02-17 00:35:29 -05:00

targeting

Can't aim at invisible things

2017-10-23 12:11:11 -05:00

ammunition.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

dnalocking.dm

…

effects.dm

…

gun.dm

POLARIS: Fix mode_name on guns always being null

2018-02-22 20:03:54 -05:00

projectile.dm

Gun changes (#4185)

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