Tigercat2000 42aa800393 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/supplyshuttle.dm
	code/modules/mining/laborcamp/laborshuttle.dm

2015-12-09 10:08:28 -08:00

..

laborcamp

Corrected the capitalization of a large amount of machines and items. This will also cause BYOND to use the correct articles (a/an).

2015-12-07 16:14:26 +01:00

surprises

Brooms, Stick-horses, and Flying Wizards!

2015-05-15 03:52:36 -04:00

abandonedcrates.dm

oops

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

alloys.dm

…

coins.dm

Materials Consistency Fix/Update

2015-09-13 17:49:36 -04:00

equipment_locker.dm

i r a gud pro gammer

2015-12-01 22:48:10 -08:00

machine_input_output_plates.dm

Initial Commit for -tg- Mining

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

machine_processing.dm

Initial Commit for -tg- Mining

2015-07-08 16:19:26 -04: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

Initial Commit for -tg- Mining

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

mine_items.dm

Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT

2015-12-09 10:08:28 -08:00

mine_turfs.dm

Misc. -tg- xeno tweaks

2015-09-05 08:34:08 -07:00

minerals.dm

Replaces typesof with subtypesof where applicable

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

mining_recipes.dm

…

mint.dm

Sort of compiles

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

money_bag.dm

Initial Commit for -tg- Mining

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

ore_datum.dm

…

ore.dm

Fixes up a few Destroys

2015-09-18 04:20:02 -04:00

satchel_ore_boxdm.dm

Initial Commit for -tg- Mining

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

security_recipes.dm

…

surprise.dm

Replaces typesof with subtypesof where applicable

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