Tigercat2000 356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT ...

Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm

2015-12-03 11:03:01 -08:00

..

laborcamp

tgshuttles unfinished

2015-12-03 10:59:06 -08: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

refactored datum/effect/system because it was a complete mess

2015-11-22 19:43:01 -05: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

tgshuttles unfinished

2015-12-03 10:59:06 -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

beep book goonfabs 4 i fucking hate git etc etc.

2014-08-14 12:27:15 -07:00

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

make bananium smeltable

2014-09-24 15:15:56 +02:00

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

Stun Changes

2014-12-30 12:30:14 -05:00

surprise.dm

Replaces typesof with subtypesof where applicable

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