Lzimann d40760ad71 Fix conflicts

2017-04-07 09:12:36 -03:00

..

admin

Fix conflicts

2017-04-07 09:12:36 -03:00

assembly

Global variable wrappers (#25325)

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

atmospherics

Global variable wrappers (#25325)

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

awaymissions

Global variable wrappers (#25325)

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

cargo

Global variable wrappers (#25325)

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

chatter

…

client

Global variable wrappers (#25325)

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

clothing

Global variable wrappers (#25325)

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

crafting

Global variable wrappers (#25325)

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

detectivework

Replaces the default output with the to_chat wrapper.

2017-03-10 01:32:05 -03: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

Global variable wrappers (#25325)

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

flufftext

Global variable wrappers (#25325)

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

food_and_drinks

Global variable wrappers (#25325)

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

games

Global variable wrappers (#25325)

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

holiday

Global variable wrappers (#25325)

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

holodeck

Fixes grammar on objects landing and bouncing off rims (#25722)

2017-04-01 11:15:13 -04:00

html_interface

Global variable wrappers (#25325)

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

hydroponics

Global variable wrappers (#25325)

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

jobs

Fix conflicts

2017-04-07 09:12:36 -03:00

language

Global variable wrappers (#25325)

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

library

Fix conflicts

2017-04-07 09:12:36 -03:00

lighting

Global variable wrappers (#25325)

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

mapping

Global variable wrappers (#25325)

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

mining

Small fulton fixes (#25922)

2017-04-07 09:03:08 +02:00

mob

Global variable wrappers (#25325)

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

modular_computers

Global variable wrappers (#25325)

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

ninja

Global variable wrappers (#25325)

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

orbit

…

paperwork

Global variable wrappers (#25325)

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

power

Global variable wrappers (#25325)

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

procedural_mapping

Replaces the default output with the to_chat wrapper.

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

projectiles

Global variable wrappers (#25325)

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

reagents

Fix conflicts

2017-04-07 09:12:36 -03:00

recycling

Global variable wrappers (#25325)

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

research

Global variable wrappers (#25325)

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

ruins

Global variable wrappers (#25325)

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

security_levels

Global variable wrappers (#25325)

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

shuttle

Global variable wrappers (#25325)

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

space_transition

Global variable wrappers (#25325)

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

spells

Global variable wrappers (#25325)

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

station_goals

Global variable wrappers (#25325)

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

stock_market

Global variable wrappers (#25325)

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

surgery

Global variable wrappers (#25325)

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

telesci

Global variable wrappers (#25325)

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

tgui

Global variable wrappers (#25325)

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

tooltip

His Grace is a better item and less globally-announced (#23951)

2017-02-16 15:18:45 +01:00

uplink

Global variable wrappers (#25325)

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

vehicles

Global variable wrappers (#25325)

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

VR

Global variable wrappers (#25325)

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

zombie

Global variable wrappers (#25325)

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