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

Conflicts:
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/events/ninja.dm
	code/modules/power/cell.dm
	code/modules/power/port_gen.dm
	code/modules/reagents/reagent_dispenser.dm

2014-08-29 04:21:15 -07:00

..

jetpack.dm

Absolute paths for item files.

2014-08-07 23:02:43 +02:00

tank_types.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

tanks.dm

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

2014-08-29 04:21:15 -07:00

watertank.dm

Change examine() from an atom verb to a mob verb

2014-05-01 09:56:39 -07:00