Joan Lung 4e0a3deb73 github is being kind of weird about these conflicts

2016-10-12 10:00:45 -04:00

..

laborcamp

Moving shit around and APC repair bugfix (#20912)

2016-10-12 09:48:47 +02:00

lavaland

Ash flora can now spawn in small patches

2016-10-11 10:04:32 -04:00

abandoned_crates.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

equipment.dm

Replaces yet more istypes with helpers (#20806)

2016-10-10 17:48:35 +13:00

fulton.dm

Replaces a bunch of istypes with their proper macros (#20739)

2016-09-30 20:21:08 +02: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

Changes obj/effect/blob,spider,swarmer,energy_net,spacevines to be ob/structures instead, since you can hit and destroy them.

2016-09-27 19:58:27 +02:00

machine_stacking.dm

…

machine_unloading.dm

…

machine_vending.dm

Miners can buy KA AoE damage mods from the vendor for a premium (#20430)

2016-09-17 16:25:35 +12:00

mine_areas.dm

Random dirtiness refactor and turf grammar standardization (#20551)

2016-09-25 10:52:42 +13:00

mine_items.dm

Moving shit around and APC repair bugfix (#20912)

2016-10-12 09:48:47 +02:00

minebot.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

mint.dm

Shitcode compression (#19068)

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

money_bag.dm

Obj damaging system, acid damage, and fire damage refactor (WIP) (#20793)

2016-10-10 11:14:59 +13:00

ores_coins.dm

You can now collect ore by walking over it with satchel equipped (#20735)

2016-10-12 15:30:39 +13:00

satchel_ore_boxdm.dm

properly uniques list display

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

shelters.dm

…