mwerezak 549270c73c Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color ...

Conflicts:
	code/game/machinery/washing_machine.dm
	code/modules/mob/living/carbon/human/update_icons.dm

2015-04-26 14:53:01 -04:00

..

effects

Adds Destroys.

2015-04-24 17:11:14 +02:00

items

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

random

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

structures

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

buckling.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

empulse.dm

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

explosion_recursive.dm

…

explosion.dm

Wireless Wires Bug Removal

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

items.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into item-color

2015-04-26 14:53:01 -04:00

objs.dm

Refactors NanoUI interaction (again)

2015-04-10 11:19:38 +02:00

structures.dm

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

2015-04-24 17:13:37 +02:00

weapons.dm

…