Joan Lung 228df13447 Merge branch 'master' of https://github.com/tgstation/tgstation into initialnew ...

Conflicts:
	code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
	code/modules/station_goals/bsa.dm
	code/modules/vehicles/atv.dm

2017-04-25 07:32:06 -04:00

..

decals

Replaces /image with /mutable_appearance, where appropriate (#26518)

2017-04-25 12:15:16 +02:00

effect_system

Partial sparks boilerplate reduction (#26081)

2017-04-12 19:59:45 +02:00

spawners

No roundstart stuff needed anymore

2017-04-22 22:08:31 +01:00

alien_acid.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

anomalies.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

bump_teleporter.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

contraband.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

countdown.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

effects.dm

Conveyor movement refactor/fix (#26408)

2017-04-21 19:27:37 -03:00

forcefields.dm

Advanced Mimery Kit (#23978)

2017-02-19 00:49:40 +13:00

glowshroom.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

landmarks.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

manifest.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

mines.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

misc.dm

Revert "Revert "Human nightvision""

2017-03-12 19:04:20 -07:00

overlays.dm

New() goes in the trash, we've gotta Initialize()

2017-04-19 18:22:26 -04:00

portals.dm

Global variable wrappers (#25325)

2017-04-06 23:26:13 -06:00

proximity.dm

Fixes proximity_checkers being visible in the right click menu (#26367)

2017-04-20 15:52:14 -03:00

spiders.dm

Ports spider structures to Initialize (#25893)

2017-04-05 22:40:53 -03:00

step_triggers.dm

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03:00

wanted_poster.dm

Posters refactor (#24548)

2017-03-03 11:16:19 +13:00