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

# Conflicts:
#	_maps/map_files/RandomZLevels/moonoutpost19.dmm
#	_maps/map_files/cyberiad/cyberiad.dmm

2019-04-18 03:15:52 +02:00

..

accessories

Improve slot accessory handling

2019-04-03 22:50:34 +02:00

jobs

Port over Corn and affected's work on Lavaland

2019-04-01 23:41:32 +02:00

chameleon.dm

Spacing

2018-11-20 16:20:31 +00:00

color.dm

global lists global defined

2018-10-02 15:52:46 -05:00

miscellaneous.dm

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

2019-04-11 07:27:51 +02:00

oldstation_uni.dm

pulling a sneaky on Travis

2018-11-03 18:33:07 -08:00

pants.dm

Removed ball gag and assless chaps from code, maps and icons

2018-11-27 23:27:17 +01:00

shorts.dm

…

syndicate.dm

Nuke ops updates

2019-04-07 21:57:22 +02:00