NikNakFlak fab4bcfeab Merge remote-tracking branch 'upstream/master' into makelife ...

Conflicts:
	code/modules/hydroponics/grown/citrus.dm

2016-08-23 17:08:36 -07:00

..

laborcamp

Adds the tele-gulag [ready for review/merge] (#18644)

2016-07-01 13:28:58 +12:00

lavaland

Replaces the fireball book in the dragon chest with a book of sacred flame, a new spell.

2016-08-22 17:44:14 -07:00

abandoned_crates.dm

whoops

2016-08-22 15:25:25 -07:00

equipment.dm

Adds "Proto-Kinetic Crusher", a melee mining weapon (#19891)

2016-08-17 14:29:16 +02:00

fulton.dm

Changes to the fulton pack (#19944)

2016-08-18 23:07:33 -05:00

machine_input_output_plates.dm

…

machine_processing.dm

Makes shuttles superficially buildable (#18974)

2016-07-14 21:25:49 +12:00

machine_redemption.dm

Makes shuttles superficially buildable (#18974)

2016-07-14 21:25:49 +12:00

machine_stacking.dm

…

machine_unloading.dm

…

machine_vending.dm

Kinetic Accelerator Mods (#19942)

2016-08-19 21:04:25 +12:00

mine_areas.dm

…

mine_items.dm

Aux Mining Base Tweaks (#20015)

2016-08-23 17:25:01 +12:00

mine_turfs.dm

Blackbox

2016-08-15 20:25:38 -05:00

minebot.dm

Minebots are less suicidal

2016-08-12 19:46:38 -05:00

mint.dm

Shitcode compression (#19068)

2016-07-04 14:03:55 +12:00

money_bag.dm

…

ores_coins.dm

Makes shuttles superficially buildable (#18974)

2016-07-14 21:25:49 +12:00

satchel_ore_boxdm.dm

properly uniques list display

2016-08-13 15:41:57 +10:00

shelters.dm

Bluespace shelters use templates

2016-06-07 02:11:35 +01:00