cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
45f15930a0954dbf566c29e4d4977449d3299fa5
CHOMPStation2/code/modules/projectiles
History
Neerti 45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
..
ammunition
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge
2015-09-06 18:26:06 -04:00
guns
Makes Deckard's gun usable.
2015-10-14 19:05:14 -04:00
projectile
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
2015-11-06 17:41:18 -05:00
ammunition.dm
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
effects.dm
Projectile visual bug fixes
2015-07-11 00:06:44 +12:00
gun.dm
Merge remote-tracking branch 'upstream/dev' into attack-cleanup2
2015-10-05 19:20:33 -04:00
projectile.dm
Merge pull request #10672 from mwerezak/frag-grenade
2015-09-07 14:12:27 +09:30
targeting.dm
fixes #8391
2015-07-09 13:23:13 -07:00