Jack Edge 5da579b7c4 Merge branch 'master' into random-space ...

Conflicts:
	_maps/asteroidstation.dm

2016-06-20 13:06:08 +01:00

..

decals

Complete Revenant Rewrite (#18522)

2016-06-17 10:58:07 +12:00

effect_system

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

spawners

Minor EfficiencyStation changes (#18157)

2016-06-03 14:47:03 -05:00

alien_acid.dm

Moves alien structure into the proper folder objs/structures/aliens.dm

2016-04-28 22:44:26 +02:00

anomalies.dm

Balances pyro anomaly (#18310)

2016-06-08 19:23:10 +12:00

bump_teleporter.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

contraband.dm

praise the good lord, for the game finally compiles

2016-03-29 19:04:37 -06:00

forcefields.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

gibs.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

glowshroom.dm

Glowshrooms don't grow on lava or water

2016-06-16 19:18:08 +01:00

landmarks.dm

Cleaned maps, ruin verbs

2016-06-12 01:32:59 +01:00

manifest.dm

invisibility = 100 and 101 now use defines.

2016-04-29 01:00:05 +02:00

mines.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

misc.dm

Layers are now defines (#17949)

2016-05-27 22:16:21 +02:00

overlays.dm

Complete Revenant Rewrite (#18522)

2016-06-17 10:58:07 +12:00

portals.dm

More fixes

2016-06-13 12:43:25 +03:00

spiders.dm

stop the pills (#18703)

2016-06-20 12:07:44 +02:00

step_triggers.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01:00

wanted_poster.dm

Removed some old paranoid checks and useless photo creates.

2016-06-01 22:40:35 -04:00