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
0e3bc3b8609ae1ab131741efa0d8094e3890a151
CHOMPStation2/code/modules/projectiles
History
Kelenius 3bdb5ff9ea Merge branch 'dev' into ofResearchAndPrototypes 
Conflicts:
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheet_types.dm
	code/game/objects/items/weapons/kitchen.dm
	code/modules/hydroponics/trays/tray_tools.dm
	code/modules/research/circuitprinter.dm
	code/modules/research/protolathe.dm
	code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
..
ammunition
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00
guns
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-22 19:26:39 +03:00
projectile
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-12 13:40:47 +02:00
ammunition.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-16 22:38:01 +02: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
Merge branch 'dev' into ofResearchAndPrototypes
2015-05-20 11:50:28 +03:00
projectile.dm
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-16 22:38:01 +02:00
targeting.dm
Merge pull request #8971 from mwerezak/burst-fire
2015-04-28 20:24:03 +02:00