Joan Lung 228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew ...

Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm

2017-04-25 07:32:06 -04:00

..

ash_walker_den.dm

Removes/Refactors /mob/unEquip (#22918)

2017-01-31 09:28:31 +13:00

necropolis_gate.dm

Replaces /image with /mutable_appearance, where appropriate (#26518)

2017-04-25 12:15:16 +02:00

ruin_mapping_aids.dm

A bunch of Initialize()s now have return values (#26464)

2017-04-25 10:51:40 +02:00

sin_ruins.dm

New() goes in the trash, we've gotta Initialize()

2017-04-19 18:22:26 -04:00