Hubblenaut 70db186a38 Merge branch 'sprites' into dev ...

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

2015-01-30 16:31:32 +01:00

..

effects

Fix for blood drip overlaying + secret feature

2015-01-15 20:10:32 +10:30

items

Merge branch 'sprites' into dev

2015-01-30 16:31:32 +01:00

random

Code formatting, EOL at EOF fixes, refactoring

2014-12-18 03:11:49 +01:00

structures

Replaces icon proc with image

2015-01-20 16:11:05 +03:00

empulse.dm

…

explosion_recursive.dm

…

explosion.dm

Wireless Wires Bug Removal

2015-01-01 17:20:21 +01:00

items.dm

Infection chance proc improvements

2015-01-22 11:10:57 -05:00

objs.dm

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2014-12-15 08:58:28 +01:00

structures.dm

Fixes #7508

2014-12-24 12:43:36 +10:30

weapons.dm

…