Joan Lung 84a6edf527 Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration ...

Conflicts:
	icons/effects/blood.dmi

2016-06-12 08:37:13 -04:00

..

decals

Merge pull request #18481 from phil235/PlantsGunsShit

2016-06-13 00:14:29 +12:00

effect_system

Automatic conversion via Regex

2016-06-11 18:37:48 +01: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

…

gibs.dm

…

glowshroom.dm

Automatic conversion via Regex

2016-06-11 18:37:48 +01: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

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

Merge branch 'master' of https://github.com/tgstation/tgstation into gratuitouspenetration

2016-06-12 08:37:13 -04:00

portals.dm

Adds noteleport variable

2016-06-09 20:33:25 +12:00

spiders.dm

Ghost sword orbits on button click, added URL, POI

2016-05-28 12:23:24 +01: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