Joan Lung f10ac32b69 Merge branch 'master' of https://github.com/tgstation/tgstation into takingbackanemptythreatmorethanyoucouldeverknowtakeitbackwithnoregretsiwasbetteroffwheniwasonyoursideandiwasholdingon ...

Conflicts:
	icons/mob/mob.dmi

2016-09-12 15:10:29 -04:00

..

decals

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02:00

effect_system

Adds explosion helper proc w/ diminishing returns (#20319)

2016-09-11 20:46:26 +12:00

spawners

Carbon Dismemberment , second attempt. (#20461)

2016-09-12 19:33:50 +02: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

Code cleaning; countdown for transformer

2016-06-25 11:40:03 +01:00

bump_teleporter.dm

invisibility = 100 and 101 now use defines.

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

contraband.dm

Code cleaning; countdown for transformer

2016-06-25 11:40:03 +01:00

forcefields.dm

Code cleaning; countdown for transformer

2016-06-25 11:40:03 +01:00

glowshroom.dm

Glowshrooms don't grow on lava or water

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

landmarks.dm

Capture the flag quality of life changes

2016-06-28 23:49:28 +01:00

manifest.dm

Code cleaning; countdown for transformer

2016-06-25 11:40:03 +01:00

mines.dm

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

2016-09-10 20:28:23 +01:00

misc.dm

Layers are now defines (#17949)

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

overlays.dm

may this also die

2016-09-12 10:43:14 -04:00

portals.dm

Containment fields can no longer contain megafauna

2016-08-15 18:02:22 -04:00

spiders.dm

Code cleaning; countdown for transformer

2016-06-25 11:40:03 +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