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

# Conflicts:
#	code/controllers/autotransfer.dm
#	code/datums/supplypacks/contraband.dm
#	code/datums/supplypacks/munitions.dm
#	code/game/objects/items/weapons/teleportation.dm
#	code/modules/mob/living/carbon/human/update_icons.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	code/modules/reagents/reagent_containers/food/snacks.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt
#	icons/mob/vore/taurs_vr.dmi
#	vorestation.dme

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

..

boxes_yw.dm

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

2017-06-12 12:39:07 -04:00

magazines.dm

9mm pistol updates (#4480)

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

magnetic.dm

Reworks cryopod storage

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

rounds.dm

Adds Hunting Rounds

2017-11-19 23:59:17 -05:00