deathride58 ccd370328c Merge branch 'master' into upstream-merge-33316

2017-12-11 00:01:02 +00:00

..

admin

Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00

assembly

Update mousetrap.dm

2017-12-06 13:20:33 -05:00

atmospherics

Merge pull request #33390 from duncathan/atmos-defines

2017-12-09 15:53:34 -06:00

awaymissions

Adds a medal for getting to the end of the secret tile dialog. (#33116)

2017-12-08 10:34:35 -06:00

cargo

Adds games vendor resupply crate

2017-12-06 22:53:21 -06:00

chatter

…

client

Merge pull request #4259 from Citadel-Station-13/upstream-merge-33150

2017-12-10 23:04:34 +00:00

clothing

Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE

2017-12-10 15:19:18 -06:00

crafting

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

detectivework

…

emoji

…

error_handler

…

events

Allowed shuttle docking ports to be hidden from some shuttle docking computers

2017-12-10 14:23:08 -06:00

fields

…

flufftext

Brain Traumas

2017-12-06 12:05:20 -06:00

food_and_drinks

Merge pull request #4256 from Citadel-Station-13/upstream-merge-33361

2017-12-10 23:49:41 +00:00

games

…

goonchat

Makes sillicon chat more visible (#33222)

2017-12-06 06:20:27 -06:00

holiday

…

holodeck

…

html_interface

…

hydroponics

Merge pull request #33241 from swindly/suicide

2017-12-09 15:52:53 -06:00

integrated_electronics

Merge pull request #33365 from KomradeSpectre/vox_circuit

2017-12-09 15:53:12 -06:00

jobs

Brain Traumas

2017-12-06 12:05:20 -06:00

language

…

library

Merge branch 'master' into donoritemmodularization

2017-12-04 20:17:02 -05:00

lighting

…

mapping

…

mentor

…

mining

Airlock Construction Update

2017-12-10 15:23:34 -06:00

mob

Merge pull request #4316 from deathride58/iconoverridefix

2017-12-10 17:15:13 -06:00

modular_computers

…

ninja

Merge pull request #32964 from AutomaticFrenzy/patch/joules

2017-12-05 03:23:06 -06:00

NTNet

…

orbit

…

paperwork

Brain Traumas

2017-12-06 12:05:20 -06:00

power

Merge pull request #4292 from Citadel-Station-13/upstream-merge-33376

2017-12-10 03:07:54 +00:00

procedural_mapping

…

projectiles

Merge pull request #33414 from kevinz000/DAMNIT_DEATHRIDE_WHY_WHY_WHY_IM_SALTY_REEEEEEEEEEEEE

2017-12-10 15:19:18 -06:00

reagents

Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00

recycling

…

research

Merge pull request #4278 from Citadel-Station-13/upstream-merge-33370

2017-12-08 19:35:43 +00:00

ruins

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

security_levels

…

server_tools

…

shuttle

Merge pull request #4313 from Citadel-Station-13/upstream-merge-33148

2017-12-10 23:50:20 +00:00

space_transition

[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on

2017-12-03 15:33:29 -06:00

spells

Brain Traumas

2017-12-06 12:05:20 -06:00

station_goals

…

stock_market

…

surgery

Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00

telesci

…

tgui

Brain Traumas

2017-12-06 12:05:20 -06:00

tooltip

Merge pull request #33396 from AnturK/tooltip-fix

2017-12-10 10:26:44 -06:00

uplink

Update uplink_devices.dm

2017-12-10 18:04:11 -05:00

vehicles

Merge branch 'master' into donoritemmodularization

2017-12-04 20:17:02 -05:00

vore

…

VR

Moves some machine sprites into /machines/ folder

2017-12-05 03:24:03 -06:00

zombie

…