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

# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm

2019-04-04 22:04:55 +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

+talisman, -midgitSE, +cluster grenades, -goliathhide, +KAmodkit, +bartenderkit, +chefkit, -bananade

2019-01-10 17:24:55 -08: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

Uplink improvements

2019-03-19 04:35:03 -07:00

vaultspawner.dm

…

windowspawner.dm

Add seed vault and animal hospital

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