Tastyfish 6a8ea815b2 Merge branch 'master' into buttbots2 ...

Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme

2016-03-31 13:33:46 -04:00

..

laborcamp

Adds tranquillite

2016-03-06 01:49:30 -05:00

surprises

Fixed airless floor being plasteel airless floor

2016-01-23 08:43:03 -05:00

abandonedcrates.dm

oops

2015-06-20 17:43:42 -04:00

alloys.dm

…

coins.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

equipment_locker.dm

Merge branch 'master' into buttbots2

2016-03-31 13:33:46 -04:00

machine_input_output_plates.dm

Initial Commit for -tg- Mining

2015-07-08 16:19:26 -04:00

machine_processing.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

machine_stacking.dm

Initial Commit for -tg- Mining

2015-07-08 16:19:26 -04:00

machine_unloading.dm

Sort of compiles

2015-07-09 15:55:36 -04:00

manufacturing.dm

Bay/-tg- Meteor port

2015-06-21 18:39:39 -07:00

materials.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

mine_areas.dm

Spesspod Mining Laser - Fuck You Git edition

2016-03-10 21:24:21 -05:00

mine_items.dm

Gives Mining Drills and Edge

2016-03-06 04:33:21 -05:00

mine_turfs.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

minerals.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

mining_recipes.dm

…

mint.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

money_bag.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

ore_datum.dm

…

ore.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

satchel_ore_boxdm.dm

Adds tranquillite

2016-03-06 01:49:30 -05:00

security_recipes.dm

…

surprise.dm

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00