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

..

admin

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

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

assembly

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

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

atmospherics

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

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

awaymissions

Exploit whack-a-mole

2017-04-23 21:16:10 -04:00

cargo

EngiMarket Part Four - Ranged RCD and Rapid Lighting Device (RLD) (#25263)

2017-04-14 09:31:43 +12:00

chatter

…

client

fixes the server (#26489)

2017-04-23 11:22:05 -04:00

clothing

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

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

crafting

Global variable wrappers (#25325)

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

detectivework

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

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

emoji

Global variable wrappers (#25325)

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

error_handler

Global variable wrappers (#25325)

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

events

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

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

flufftext

EngiMarket Part Four - Ranged RCD and Rapid Lighting Device (RLD) (#25263)

2017-04-14 09:31:43 +12:00

food_and_drinks

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

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

games

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

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

holiday

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

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

holodeck

Fixes duplicate copying tag (#26109)

2017-04-12 18:53:41 -06:00

html_interface

Global variable wrappers (#25325)

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

hydroponics

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

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

jobs

Fixes a nullrod runtime (#26360)

2017-04-19 13:06:30 -06:00

language

Adds colours to languages that lack them (#26217)

2017-04-15 10:40:33 -06:00

library

Refactors dbcon into a subsystem (#26134)

2017-04-17 15:18:17 +10:00

lighting

Fixes some areas having no lighting (#26495)

2017-04-23 12:21:56 -04:00

mapping

Makes the map loader immune to sleeps in the shit it creates (#26219)

2017-04-15 11:31:46 -06:00

mining

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

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

mob

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

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

modular_computers

A bunch of Initialize()s now have return values (#26464)

2017-04-25 10:51:40 +02:00

ninja

Global variable wrappers (#25325)

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

orbit

…

paperwork

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

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

power

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

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

procedural_mapping

…

projectiles

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

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

reagents

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

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

recycling

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

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

research

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

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

ruins

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

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

security_levels

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

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

shuttle

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

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

space_transition

Global variable wrappers (#25325)

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

spells

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

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

station_goals

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

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

stock_market

Global variable wrappers (#25325)

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

surgery

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

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

telesci

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

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

tgui

Global variable wrappers (#25325)

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

tooltip

[s] Fixes an exploit allowing admins to read any file (#26107)

2017-04-12 18:54:17 -06:00

uplink

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

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

vehicles

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

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

VR

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

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

zombie

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

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