LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 ...

[MIRROR] Makes the decal component handle updating inventory icons

2018-01-02 19:15:46 -06:00

..

admin

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

2018-01-02 05:16:13 -06:00

assembly

save point - a lot of shit to fix

2017-12-27 07:03:40 -06:00

atmospherics

Merge branch 'master' into upstream-merge-33621

2017-12-30 13:23:39 -06:00

awaymissions

CTF flags are no longer locked to CTF. (#33874)

2017-12-29 00:29:42 -06:00

cargo

…

chatter

…

client

Merge pull request #4540 from Citadel-Station-13/upstream-merge-33835

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

clothing

Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967

2018-01-02 19:15:46 -06:00

crafting

…

detectivework

Update detective_work.dm

2017-12-29 18:39:28 -06:00

emoji

…

error_handler

…

events

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

2018-01-02 05:16:13 -06:00

fields

Adds colour shift to timestop (#33847)

2017-12-29 02:53:37 -06:00

flufftext

Hallucinations no longer show open doors "bolting" (#33859)

2017-12-27 08:26:16 -06:00

food_and_drinks

Merge pull request #33948 from ShizCalev/abstract-frying

2017-12-31 10:01:38 -06:00

games

…

goonchat

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

holiday

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

2017-12-29 01:34:17 -06:00

holodeck

…

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-33783

2017-12-29 06:49:47 -06:00

integrated_electronics

Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00

jobs

…

keybindings

oops

2017-12-27 07:08:26 -06:00

language

…

library

adds world.realtime to soapstone

2017-12-24 15:03:22 -06:00

lighting

…

mapping

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

2018-01-01 14:09:07 -06:00

mentor

…

mining

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

2018-01-01 14:09:07 -06:00

mob

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

2018-01-02 14:58:09 -06:00

modular_computers

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

ninja

[READY]Component Forensics and Item Blood OverlayS!

2017-12-27 15:19:14 -06:00

NTNet

…

orbit

Update orbit.dm

2017-12-29 18:41:57 -06:00

paperwork

more save points

2017-12-29 00:07:36 -06:00

power

Merge pull request #4634 from Citadel-Station-13/upstream-merge-33985

2018-01-02 15:46:35 -06:00

procedural_mapping

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

projectiles

Merge branch 'master' into upstream-merge-32311

2017-12-29 18:38:50 -06:00

reagents

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

2018-01-01 07:00:34 -06:00

recycling

…

research

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

2018-01-01 14:09:07 -06:00

ruins

…

security_levels

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

server_tools

…

shuttle

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

2018-01-02 05:16:13 -06:00

space_transition

also syncs a bunch of shit

2017-12-29 04:12:43 -06:00

spells

Merge pull request #4635 from Citadel-Station-13/upstream-merge-34003

2018-01-02 17:13:31 -06:00

station_goals

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

stock_market

…

surgery

also syncs a bunch of shit

2017-12-29 04:12:43 -06:00

telesci

…

tgui

…

tooltip

…

uplink

Internal radio implant

2017-12-29 02:52:24 -06:00

vehicles

Merge pull request #33306 from coiax/replace-clean-flag-with-component

2017-12-23 08:36:37 -06:00

vore

…

VR

…

zombie

…