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

..

effect_system.dm

SSticker

2019-04-30 16:47:47 +01:00

effects_chem_smoke.dm

fixes smoke

2019-03-24 18:44:01 -04:00

effects_explosion.dm

dayum dats defined

2018-10-08 22:48:00 +01:00

effects_foam.dm

Portal fixes - adds oldloc to Crossed()

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

effects_other.dm

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

effects_smoke.dm

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

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

effects_sparks.dm

Refactors Spark Spread Activation

2018-10-17 14:31:07 -04:00

effects_water.dm

…