CHOMPStation2

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

Files

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

# Conflicts:
#	code/game/machinery/computer/communications.dm
#	code/modules/mob/living/carbon/human/species/station/station_vr.dm
#	config/custom_items.txt
#	icons/misc/title_vr.dmi
#	icons/mob/human_races/r_def_xenochimera.dmi
#	maps/RandomZLevels/fileList.txt
#	vorestation.dme

2017-05-24 13:46:58 -04:00

ammunition

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

2017-04-13 19:43:56 -04:00

guns

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

2017-05-24 13:46:58 -04:00

projectile

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08

2017-05-08 21:07:45 -04:00

targeting

Aiming at someone is now logged