Jordan Brown 2029473a48 Merge pull request #33397 from Xhuis/em_light_fix ...

Fixes emergency lights having infinite power, and replaces their magic number with a define

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

..

admin

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

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

assembly

Merge pull request #33192 from Robustin/SavioroftheUniverse

2017-12-02 09:43:25 -06:00

atmospherics

Merge pull request #4276 from Citadel-Station-13/upstream-merge-33359

2017-12-08 18:46:33 +00: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

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

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

chatter

…

client

Merge pull request #33350 from Cyberboss/FixConfig

2017-12-08 10:33:46 -06:00

clothing

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05: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

Update footprints_and_rag.dm

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

emoji

…

error_handler

…

events

Fixes some broken random events (#33345)

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

fields

…

flufftext

A few investigate_log and message_admin fixes

2017-11-24 22:42:01 -06:00

food_and_drinks

Update drinks.dm

2017-12-08 14:07:33 -05:00

games

…

goonchat

Makes sillicon chat more visible (#33222)

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

holiday

…

holodeck

Cleans up unused code

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

html_interface

…

hydroponics

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

integrated_electronics

Merge pull request #32964 from AutomaticFrenzy/patch/joules

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

jobs

…

language

…

library

Merge branch 'master' into donoritemmodularization

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

lighting

Cleans up unused code

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

mapping

Cleans up some qdel(src)'s in Initialize()

2017-11-26 20:15:18 -06:00

mentor

…

mining

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

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

mob

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

modular_computers

[READY]NTnet refactor, assimilates exonet

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

ninja

Merge pull request #32964 from AutomaticFrenzy/patch/joules

2017-12-05 03:23:06 -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

[READY]Refactors uplinks to a component!

2017-11-22 15:17:03 -06:00

power

Merge pull request #33397 from Xhuis/em_light_fix

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

procedural_mapping

…

projectiles

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

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

reagents

Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into donoritemmodularization

2017-12-08 19:58:41 -05:00

recycling

Merge branch 'master' into upstream-merge-32188

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

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

Merge branch 'master' into upstream-merge-32188

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

server_tools

…

shuttle

Merge pull request #33324 from deathride58/foreignfurryaddswidescreen

2017-12-08 10:35:23 -06: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

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -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

Adds support for non-1:1 screen ratios (Doesn't add widescreen) (#32950)

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

tooltip

…

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

fix zombie reanimation (#33049)

2017-11-24 22:36:30 -06:00