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

..

sheets

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

2019-07-15 20:30:54 +02:00

tiles

Add Beach biodome ruin and other fixes

2019-03-30 22:48:11 +01:00

medical.dm

Add tribal splints

2019-06-07 04:06:12 +02:00

nanopaste.dm

Gives nanopaste overheal

2018-12-03 01:03:47 -05:00

rods.dm

Added Syndicate base and ported over turf decals

2019-03-31 20:26:02 +02:00

stack_recipe.dm

Removes a leading var

2018-08-23 01:38:56 -04:00

stack.dm

Portal fixes - adds oldloc to Crossed()

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

telecrystal.dm

Replaces uplink management by automated sharing

2019-01-03 16:29:31 +00:00