phil235 2dc956bea0 Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing ...

# Conflicts:
#	code/game/gamemodes/clock_cult/clock_scripture.dm
#	code/game/gamemodes/clock_cult/clock_structures.dm

2016-10-31 19:59:00 +01:00

..

laborcamp

Moving shit around and APC repair bugfix (#20912)

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

lavaland

Merge branch 'master' of https://github.com/tgstation/-tg-station into Color_washing

2016-10-31 19:59:00 +01:00

abandoned_crates.dm

Neck Slots (#21169)

2016-10-26 19:03:41 +13:00

equipment.dm

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +02: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

Plane master handling + new chemical Rotatium (#20707)

2016-10-18 11:41:23 +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_items.dm

adds cargo and engi access to allowed accesses for launching mining aux base (#21048)

2016-10-21 15:14:47 +13: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

Contents_explosion() tweaks (#20934)

2016-10-16 10:01:37 +13:00

shelters.dm

Bluespace shelters use templates

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