Cuboos 0bb7d2a5a5 Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1 ...

Conflicts:
	code/game/objects/items/weapons/defib.dm
	config/admins.txt

2014-12-15 18:12:14 -08:00

..

energy

Merge remote-tracking branch 'remotes/upstream/master' into CuboosSoundS1E1

2014-12-15 18:12:14 -08:00

magic

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

projectile

trims some unnecessary code

2014-12-10 22:56:52 -08:00

energy.dm

Fixes the lasergun icon never being empty.

2014-10-21 15:36:18 +02:00

magic.dm

Fix wands losing a charge even when no shot was actually fired (#4588).

2014-08-27 19:54:46 +02:00

projectile.dm

changes to the uplink and further c90 updates

2014-12-07 19:39:24 -08:00