Mark van Alphen 14e8022daf Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into portalfix ...

# Conflicts:
#	code/game/objects/effects/step_triggers.dm

2019-08-09 23:38:49 +02:00

..

belt-placer.dm

crazylemon tweaks

2018-06-26 22:18:27 +01:00

conveyor2.dm

Portal fixes - adds oldloc to Crossed()

2019-07-15 20:16:17 +02:00

disposal-construction.dm

Fixed it

2018-09-26 17:05:48 +02:00

disposal.dm

Merge pull request #11591 from Citinited/fuck-you-disposals

2019-06-28 21:04:24 +08:00

sortingmachinery.dm

Adds new inhand sprites

2019-05-06 16:08:38 +02:00