deathride58 5ee634aa31 Merge pull request #4099 from Citadel-Station-13/upstream-merge-32626 ...

[MIRROR] Custom docker improvements

2017-11-24 23:01:35 +00:00

..

admin

Merge pull request #4078 from Citadel-Station-13/upstream-merge-32801

2017-11-23 01:04:20 +00:00

assembly

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

atmospherics

manual mirrors

2017-11-21 14:06:28 -05:00

awaymissions

Refactor ladders so that they actually work (#32797)

2017-11-20 02:05:52 -06:00

cargo

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

chatter

…

client

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

clothing

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

crafting

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

detectivework

Update footprints_and_rag.dm

2017-11-20 13:43:48 -05:00

emoji

…

error_handler

…

events

Update _event.dm

2017-11-22 14:29:13 -05:00

fields

…

flufftext

Replaces a bunch of mob loops with hopefully better ones

2017-11-16 16:09:15 -06:00

food_and_drinks

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

games

…

goonchat

reeeeEEEEEEEEEEEEEEE

2017-11-13 22:55:18 -05:00

holiday

Makes false alarm use more explicit in event code.

2017-11-11 14:36:36 -06:00

holodeck

Cleans up unused code

2017-11-20 10:14:32 -06:00

html_interface

…

hydroponics

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

integrated_electronics

[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00

jobs

JSON feedback

2017-11-17 01:44:12 -06:00

language

…

library

Cleans up unused code

2017-11-20 10:14:32 -06:00

lighting

Cleans up unused code

2017-11-20 10:14:32 -06:00

mapping

Fixes some cases where changeturf were called incorrectly (#32584)

2017-11-11 14:32:13 -06:00

mentor

…

mining

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

mob

comma splice and ellipsis grammar fix (#33040)

2017-11-24 15:21:11 -06:00

modular_computers

[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00

ninja

Cleans up unused code

2017-11-20 10:14:32 -06:00

NTNet

[READY]NTnet refactor, assimilates exonet

2017-11-22 15:52:54 -06:00

orbit

Merge pull request #32871 from AnturK/orbitclean

2017-11-19 17:13:08 -06:00

paperwork

Cleans up unused code

2017-11-20 10:14:32 -06:00

power

Merge pull request #32985 from YPOQ/airlockfix

2017-11-24 14:11:39 -06:00

procedural_mapping

…

projectiles

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

reagents

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

recycling

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

research

Update stock_parts.dm

2017-11-23 23:50:25 -05:00

ruins

Refactor chasm paths to be more sane (#32701)

2017-11-22 03:30:49 -06:00

security_levels

Merge branch 'master' into upstream-merge-32188

2017-11-21 19:53:58 +00:00

server_tools

…

shuttle

custom docker improvements (#32626)

2017-11-24 12:59:17 -06:00

space_transition

…

spells

Conjuration spells fix (#32951)

2017-11-21 22:30:05 -06:00

station_goals

…

stock_market

…

surgery

Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188

2017-11-22 18:42:34 -06:00

telesci

…

tgui

Update tgui.dm

2017-11-12 13:18:42 -06:00

tooltip

…

uplink

JSON feedback

2017-11-17 01:44:12 -06:00

vehicles

tweak skateboard crashes, gives brain damage (#32885)

2017-11-20 01:50:24 -06:00

vore

…

VR

…

zombie

…