CHOMPStation2

mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-16 13:13:03 +00:00

Files

Repede ba3584c965 Merge branch 'master' of https://github.com/VOREStation/VOREStation into self

# Conflicts:
#	code/modules/mob/living/carbon/human/species/station/station.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station.dm
#	code/modules/mob/living/silicon/robot/robot_modules/station_vr.dm
#	config/custom_items.txt
#	config/jobwhitelist.txt

2018-08-17 19:13:15 -04:00

ammunition

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

2018-07-17 20:30:33 -04:00

guns

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

2018-08-17 19:13:15 -04:00

projectile

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

2018-06-23 17:53:13 -04:00

targeting

Merge pull request #5439 from Neerti/layer_fixes