LetterJay cc9101aedf Merge pull request #1669 from Citadel-Station-13/upstream-merge-28552 ...

[MIRROR] Bonfires light up in lavaland atmos

2017-06-19 20:48:21 -05:00

..

admin

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

assembly

Ports Goonchat

2017-06-08 16:27:56 -05:00

atmospherics

Merge pull request #1639 from Citadel-Station-13/upstream-merge-28503

2017-06-17 10:06:14 -05:00

awaymissions

Fixes basic spiderlings becoming ice spiders

2017-06-10 12:22:48 -05:00

cargo

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

chatter

…

client

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

clothing

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

crafting

Merge pull request #1445 from Citadel-Station-13/upstream-merge-28115

2017-06-10 09:01:25 -05:00

detectivework

…

emoji

Ports Goonchat

2017-06-08 16:27:56 -05:00

error_handler

…

events

Merge pull request #1534 from Citadel-Station-13/SelectiveMirrorSync

2017-06-14 06:41:01 -05:00

fields

Fixes projectile fields blocking clicks

2017-06-06 07:15:12 -05:00

flufftext

Fixes a to_chat runtime, adds macro for sending images (#1591)

2017-06-17 13:26:42 -07:00

food_and_drinks

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

games

…

goonchat

cleanup and commits

2017-06-19 12:35:05 -05:00

holiday

…

holodeck

…

html_interface

…

hydroponics

Bonfires light up in lavaland atmos

2017-06-19 08:53:41 -05:00

jobs

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

language

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-27528

2017-05-28 21:49:30 -05:00

library

…

lighting

Fix some things assuming lighting corners existed (#1642)

2017-06-17 13:17:21 -07:00

mapping

upstream-merge-27951

2017-06-11 02:11:34 -05:00

mentor

…

mining

Dufflebag => Dufflebag

2017-06-19 16:42:05 -05:00

mob

Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965

2017-06-19 17:25:18 -05:00

modular_computers

upstream-merge-27951

2017-06-11 02:11:34 -05:00

ninja

up to upstream-merge-27868

2017-06-11 00:04:00 -05:00

orbit

…

paperwork

Fixes various bugs with photos and photo copying.

2017-06-17 07:37:31 -05:00

power

Merge pull request #1632 from Citadel-Station-13/upstream-merge-28466

2017-06-17 10:03:54 -05:00

procedural_mapping

Fixes badmin repair mapgen module for real this time (#1604)

2017-06-17 13:29:10 -07:00

projectiles

Merge pull request #1455 from Citadel-Station-13/upstream-merge-28125

2017-06-14 08:53:52 -05:00

reagents

Merge branch 'master' into upstream-merge-26965

2017-06-19 15:39:01 -05:00

recycling

Ports Goonchat

2017-06-08 16:27:56 -05:00

research

Merge pull request #1670 from Citadel-Station-13/upstream-merge-28549

2017-06-19 20:47:56 -05:00

ruins

Merge branch 'master' into upstream-merge-28046

2017-06-14 13:10:37 -05:00

security_levels

…

server_tools

Fixes ExportService running even when not using TGS3

2017-06-15 21:01:05 -05:00

shuttle

Refactors the latejoin list

2017-06-04 15:08:35 -05:00

space_transition

…

spells

upstream-merge-27951

2017-06-11 02:11:34 -05:00

station_goals

Fixes bsa not showing up (#1396)

2017-06-04 09:03:30 -07:00

stock_market

Ports Goonchat

2017-06-08 16:27:56 -05:00

surgery

Vomit fix

2017-06-16 15:19:26 -05:00

telesci

…

tgui

…

tooltip

…

uplink

Merge pull request #1490 from Citadel-Station-13/upstream-merge-26965

2017-06-19 17:25:18 -05:00

vehicles

[MIRROR] refactors how vehicles use offsets + multiseat (#1128)

2017-05-28 15:13:04 -07:00

vore

…

VR

…

zombie

Reduces the size of the zombie revival flavor text (Fixes #28568)

2017-06-19 19:53:44 -05:00