Mark van Alphen 2ae1fc7ac2 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shuttlechairs ...

# Conflicts:
#	icons/obj/chairs.dmi

2019-08-09 23:41:07 +02:00

..

academy.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

beach.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

blackmarketpackers.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

centcomAway.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

evil_santa.dmm

Mapmerge2-2

2019-03-03 01:02:32 +00:00

example.dmm

Mapmerge2-2

2019-03-03 01:02:32 +00:00

moonoutpost19.dmm

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

2019-08-09 23:41:07 +02:00

spacebattle.dmm

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

2019-08-09 23:41:07 +02:00

spacehotel.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

stationCollision.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00

terrorspiders.dmm

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

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

undergroundoutpost45.dmm

Fix alarms triggering on non-contact levels, spectral blade ghost fix, assigning outfits runtime fix

2019-06-03 17:39:23 +02:00

wildwest.dmm

Add shuttle chairs (and fix newlines on all maps)

2019-06-07 03:39:24 +02:00