deathride58 e0ff75a870 Merge pull request #4673 from Citadel-Station-13/upstream-merge-34077 ...

[MIRROR] Fix incorrect method variable description in throw_impact

2018-01-05 22:13:19 +00:00

..

admin

Merge pull request #4639 from Citadel-Station-13/upstream-merge-34032

2018-01-03 04:57:12 -06:00

assembly

…

atmospherics

Merge branch 'master' into upstream-merge-33621

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

awaymissions

…

cargo

…

chatter

…

client

Merge pull request #34025 from DaxDupont/PDAColor

2018-01-03 21:12:09 -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

…

food_and_drinks

Fix bug with smashing bottles on throw (#34077)

2018-01-05 06:01:44 -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 pull request #34038 from ShizCalev/text-pad

2018-01-03 07:35:17 -06:00

jobs

…

keybindings

…

language

…

library

…

lighting

…

mapping

Fix away missions taking 2+ minutes to load (#34084)

2018-01-05 06:01:52 -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 pull request #4643 from Citadel-Station-13/upstream-merge-34033

2018-01-03 18:54:12 +00:00

modular_computers

Replace explicit z-level checks with defines

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

ninja

…

NTNet

…

orbit

Update orbit.dm

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

paperwork

…

power

Fixes white power cables in DM (#34066)

2018-01-04 20:16:31 -06:00

procedural_mapping

Replace explicit z-level checks with defines

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

projectiles

Show the correct coordinates when a pulse rifle prize is found (#34089)

2018-01-05 06:03:05 -06:00

reagents

You can taste oil (#34046)

2018-01-03 15:06:54 -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

…

vore

…

VR

…

zombie

…