cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
aea1eee61535575b133bdfc72c9faeb2da0b5240
CHOMPStation2/code/modules/projectiles
History
Kelshark aea1eee615 Merge branch 'master' of https://github.com/VOREStation/VOREStation 
# Conflicts:
#	code/game/area/Away Mission areas.dm
#	code/modules/mob/living/silicon/robot/dogborg/dog_sleeper_vr.dm
#	config/custom_items.txt
2018-02-21 22:19:24 -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-21 22:19:24 -05:00
projectile
squashed commits - ion pistol refactor and away mission emp nerf
2018-02-11 09:27:40 +00: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
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
2018-02-07 19:30:50 -05:00
projectile.dm
Adds Hunting Rounds
2017-11-19 23:59:17 -05:00