LetterJay ab27b63cf9 Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

..

admin

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

assembly

Annihilates the colons!

2017-08-15 10:49:55 -05:00

atmospherics

Tweaks atmos canister lights.

2017-08-14 01:25:02 -05:00

awaymissions

…

cargo

Update console.dm

2017-08-14 18:55:25 -05:00

chatter

…

client

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

clothing

Merge pull request #2378 from Citadel-Station-13/upstream-merge-29384

2017-08-15 10:14:35 -05:00

crafting

…

detectivework

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

emoji

…

error_handler

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

events

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

fields

…

flufftext

Update Hallucination.dm

2017-08-14 08:55:45 -05:00

food_and_drinks

…

games

…

goonchat

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

holiday

…

holodeck

…

html_interface

…

hydroponics

Annihilates the colons!

2017-08-15 10:49:55 -05:00

jobs

…

language

…

library

Oocky in icky descriptions

2017-08-08 09:05:58 -05:00

lighting

…

mapping

…

mentor

…

mining

Merge pull request #2313 from Citadel-Station-13/upstream-merge-29779

2017-08-14 18:45:28 -05:00

mob

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

modular_computers

[s] Clean up some inputs

2017-08-14 02:44:24 -05:00

ninja

Annihilates the colons!

2017-08-15 10:49:55 -05:00

orbit

…

paperwork

Annihilates the colons!

2017-08-15 10:49:55 -05:00

power

Merge branch 'master' into upstream-merge-29611

2017-08-15 18:55:12 -05:00

procedural_mapping

Fixes admin mass deleting... not actually mass deleting...

2017-08-13 01:26:39 -05:00

projectiles

Merge pull request #2373 from Citadel-Station-13/upstream-merge-29854

2017-08-14 18:53:38 -05:00

reagents

Annihilates the colons!

2017-08-15 10:49:55 -05:00

recycling

…

research

…

ruins

…

security_levels

…

server_tools

Makes IRC status return round id

2017-08-15 10:01:57 -05:00

shuttle

…

space_transition

…

spells

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

station_goals

…

stock_market

…

surgery

Merge branch 'master' into upstream-merge-29288

2017-08-14 18:35:28 -05:00

telesci

…

tgui

…

tooltip

…

uplink

…

vehicles

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

vore

…

VR

…

zombie

…