Perakp 48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector ...

Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

2014-11-29 09:37:40 +02:00

..

energy

Bluespace wormhole projector

2014-10-26 15:06:30 +02:00

magic

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

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

projectile

Fixes the detetive revolver so when modified it can't blow up when shooting with an empty chamber. Adding a firing sound when the malfunction happens.

2014-11-13 14:48:30 +01: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

last minute changes to gun for massive realism

2014-11-03 23:47:20 -08:00