duncathan a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs ...

Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm

2016-04-03 18:22:20 -06:00

..

jetpack.dm

Jetpack nerf revert, new jetpack implant

2016-03-04 14:06:12 +03:00

tank_types.dm

changed plasmaman plasma tank name to somewhat redundant 'plasmaman plasma tank'

2016-03-05 22:11:48 +00:00

tanks.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs

2016-03-10 23:07:21 -06:00

watertank.dm

HUD item slots no longer show item placeholders when there are actual items inside

2016-03-22 08:00:38 +03:00