Lzimann 53677a7f7f Fixes conflicts

2017-04-28 08:37:13 -03:00

..

admin

Fixes conflicts

2017-04-28 08:37:13 -03:00

assembly

Fixes conflicts

2017-04-28 08:37:13 -03:00

atmospherics

Changes some << to to_chat

2017-04-27 04:20:26 +03:00

awaymissions

Refactors roundstart checks slightly (#26131)

2017-04-27 10:05:40 +12:00

cargo

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

chatter

…

client

Fixes conflicts

2017-04-28 08:37:13 -03:00

clothing

Fixes conflicts

2017-04-28 08:37:13 -03:00

crafting

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

detectivework

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

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

emoji

Changes the chat to use asset caches instead of directly sending it in a

2017-04-28 08:24:17 -03:00

error_handler

…

events

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

flufftext

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

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

food_and_drinks

Fixes conflicts

2017-04-28 08:37:13 -03: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

Initialize Refactor (#25981)

2017-04-27 09:02:29 +12:00

html_interface

…

hydroponics

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

jobs

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12: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

Fixes templates/ruins not updating area list

2017-04-24 10:47:45 +02:00

mining

Unorphans the blackbox (#26129)

2017-04-27 10:04:57 +12:00

mob

Fixes conflicts

2017-04-28 08:37:13 -03:00

modular_computers

Merge pull request #26551 from Shadowlight213/headtweak

2017-04-27 08:36:17 -03:00

ninja

Removes a few spawns (#26507)

2017-04-25 16:36:07 -03:00

orbit

…

paperwork

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

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

power

Merge pull request #26612 from ChangelingRain/shuttletimer

2017-04-27 18:54:54 -03:00

procedural_mapping

Removes a few spawns (#26507)

2017-04-25 16:36:07 -03:00

projectiles

Merge pull request #26634 from Core0verload/tochat_master_race

2017-04-28 08:14:09 -03:00

reagents

Fixes conflicts

2017-04-28 08:37:13 -03:00

recycling

Fixes conflicts

2017-04-28 08:37:13 -03:00

research

Merge pull request #26634 from Core0verload/tochat_master_race

2017-04-28 08:14:09 -03:00

ruins

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

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

security_levels

Merge pull request #26386 from ChangelingRain/initialnew

2017-04-27 10:15:10 +12:00

shuttle

Merge pull request #26634 from Core0verload/tochat_master_race

2017-04-28 08:14:09 -03:00

space_transition

…

spells

Changes some << to to_chat

2017-04-27 04:20:26 +03:00

station_goals

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

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

stock_market

…

surgery

Merge pull request #26386 from ChangelingRain/initialnew

2017-04-27 10:15:10 +12:00

telesci

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

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

tgui

…

tooltip

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

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

uplink

Fixes conflicts

2017-04-28 08:37:13 -03: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