Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs ...

# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme

2019-05-04 03:16:38 +02:00

..

equipment

Add Ash Walkers, work on Syndicate base

2019-03-31 04:33:39 +02:00

laborcamp

Port the actual Lavaland map (and associated fixes)

2019-03-30 04:12:37 +01:00

lavaland

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-26 23:07:57 +02:00

abandonedcrates.dm

Port over tg ore stack and stack merging

2018-10-09 10:06:03 +08:00

coins.dm

Quick fix for the antagtoken coin

2018-11-24 20:06:17 +01:00

equipment_locker.dm

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

2019-04-24 02:55:32 +02:00

explorer_gear.dm

updates

2019-04-02 20:26:23 +01:00

machine_processing.dm

Updates Components Again

2018-11-02 16:23:46 -04:00

machine_stacking.dm

…

machine_unloading.dm

Port over tg ore stack and stack merging

2018-10-09 10:06:03 +08:00

mine_items.dm

Ash Walker/Gutlunch fixes. Glass containers now do not splash on help intent, for milking.

2019-04-03 17:24:55 +02:00

minebot.dm

Here we go again

2019-05-03 21:47:07 +08:00

mint.dm

Updates Components Again

2018-11-02 16:23:46 -04:00

money_bag.dm

…

ore.dm

General Lavaland fixes, add Hierophant ruin

2019-03-31 01:12:10 +01:00

satchel_ore_boxdm.dm

Here we go again

2019-05-03 21:47:07 +08:00

shelters.dm

…