phil235 7900f80544 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixAlienStructureProjDodge ...

Conflicts:
	code/game/objects/structures/aliens.dm

2016-04-29 20:58:02 +02:00

..

decals

Merge branch 'master' of https://github.com/tgstation/-tg-station into planes_on_a_snake

2016-04-27 17:03:32 -07:00

effect_system

Blobs can no longer eat the supermatter (#17205)

2016-04-29 20:29:20 +02:00

spawners

Merge pull request #17021 from Core0verload/gluves

2016-04-23 10:44:52 -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

makes atmos_spawn_air() use the new gas string parser

2016-04-04 01:49:09 -06:00

bump_teleporter.dm

…

contraband.dm

praise the good lord, for the game finally compiles

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

forcefields.dm

Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).

2016-02-19 02:34:57 +01:00

gibs.dm

…

glowshroom.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

landmarks.dm

…

manifest.dm

…

mines.dm

makes atmos_spawn_air() use the new gas string parser

2016-04-04 01:49:09 -06:00

misc.dm

Move some stuff from different layers to different planes

2016-04-24 04:03:41 -07:00

overlays.dm

Charger holocarp will now color the trail properly

2016-04-17 19:06:02 -04:00

portals.dm

Replaces holo tape and holo tape projector with holo barrier and holo barrier projector (children of the janitor's holosign creator).

2016-02-19 02:34:57 +01:00

spiders.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

step_triggers.dm

…