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

..

bombspawner.dm

The Great Conflictening 2.0: Removes /obj/item/device

2018-04-25 23:07:35 -04:00

gibspawner.dm

Clears up some relative pathing part 1

2018-10-10 23:39:34 +08:00

lootdrop.dm

Chameleon overhaul

2019-05-01 20:59:41 +02:00

random_barrier.dm

Fixes maploading so that the cyberiad and space hotel load cleanly again

2018-07-24 20:58:38 -07:00

random_spawners.dm

Chameleon overhaul

2019-05-01 20:59:41 +02:00

vaultspawner.dm

…

windowspawner.dm

Add seed vault and animal hospital

2019-03-31 23:49:18 +02:00