CHOMPStation2

mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00

Files

Arokha Sieyes 633bc2cc3d Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018

# Conflicts:
#	code/__defines/species_languages.dm
#	code/__defines/subsystems.dm
#	code/controllers/Processes/planet.dm
#	code/game/machinery/cloning.dm
#	code/game/machinery/recharger.dm
#	code/modules/mob/living/carbon/human/emote.dm
#	code/modules/organs/organ_icon.dm
#	code/modules/organs/robolimbs.dm
#	code/modules/paperwork/photography.dm
#	code/modules/projectiles/guns/energy/special.dm
#	code/modules/reagents/Chemistry-Recipes.dm
#	html/changelogs/.all_changelog.yml
#	maps/southern_cross/southern_cross-1.dmm
#	vorestation.dme

2018-07-06 17:20:03 -04:00

ammunition

PoI Stage 0.5

2018-04-25 22:11:30 -07:00

guns

Merge branch 'master' of https://github.com/VOREStation/Polaris into aro-sync07062018

2018-07-06 17:20:03 -04:00

projectile

Merge pull request #3896 from VOREStation/upstream-merge-5276

2018-06-17 16:22:53 -04:00

targeting

Can't aim at invisible things