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
873b38e0a59c98d7f1e5e5cb58bc3828cb292716
CHOMPStation2/code/modules/projectiles
History
Kelenius 873b38e0a5 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Core.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Other.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
2015-05-04 22:36:35 +03:00
..
ammunition
Attempts to save Yosh's code.
2015-04-25 16:39:09 +02:00
guns
Merge and removal of a wild file
2015-04-29 14:20:44 +03:00
projectile
Merge pull request #8971 from mwerezak/burst-fire
2015-04-28 20:24:03 +02:00
ammunition.dm
sanitize() refactor: first pass (sanitize)
2015-03-22 23:31:19 +03:00
effects.dm
Updates the atom_pool, now datum_pool, to handle any datum object.
2015-04-24 09:59:05 +02:00
gun.dm
Another potential qdel sanity check.
2015-04-30 14:37:52 +02:00
projectile.dm
Fixes #9037.
2015-04-30 09:35:57 +02:00
targeting.dm
Merge pull request #8971 from mwerezak/burst-fire
2015-04-28 20:24:03 +02:00