phil235 04018648d1 Merge branch 'master' of https://github.com/tgstation/-tg-station into FixGib ...

Conflicts:
	code/modules/mob/living/death.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2016-04-30 12:30:36 +02:00

..

decals

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05: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

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

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

Makes effect system code more OOP.

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

glowshroom.dm

First commit of this big PR

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

landmarks.dm

invisibility = 100 and 101 now use defines.

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

manifest.dm

invisibility = 100 and 101 now use defines.

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

mines.dm

invisibility = 100 and 101 now use defines.

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

misc.dm

Revert "Move some stuff from different layers to different planes"

2016-04-29 16:07:23 -05:00

overlays.dm

Change gib animation sprites to only loop once.

2016-04-29 20:48:56 +02: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

invisibility = 100 and 101 now use defines.

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