Fox-McCloud 511a8a37b6 Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye

2017-07-11 17:13:47 -04:00

..

admin

Removes Disease one and Virology

2017-07-08 23:10:17 -04:00

alarm

…

arcade

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

assembly

Adds movement intents

2017-06-10 10:12:14 +01:00

atmos_automation

…

awaymissions

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into findnreplace

2017-04-14 18:15:12 +02:00

client

Fixes IPC Heads

2017-06-28 22:35:15 -04:00

clothing

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

countdown

Refactors Syndicate Bombs

2017-06-29 18:10:58 -04:00

crafting

chemical bombs

2017-06-29 20:02:27 -04:00

customitems

Merge pull request #7728 from Xantholne/HoodieFluff

2017-07-10 13:28:42 -07:00

detective_work

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

economy

Merge branch 'master' into findnreplace

2017-03-15 16:02:14 +01:00

error_handler

…

events

Removes Disease one and Virology

2017-07-08 23:10:17 -04:00

examine

…

ext_scripts

…

fancytitle

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

fish

Updates Intents

2017-06-10 09:43:36 +01:00

flufftext

Merges and fixes Conflicts

2017-05-27 20:42:23 -05:00

food_and_drinks

Adds Sweet and Sour Chicken Balls to the Chinese food vending machine. (#7718)

2017-07-08 20:50:46 -04:00

garbage_collection

Adds the garbage controller to the set of rebootable controllers

2017-05-13 17:04:45 -07:00

holiday

…

hydroponics

The Most Non-Edgey PR Ever

2017-07-01 19:48:43 -04:00

karma

Restores the karma verbs tab

2017-05-07 12:24:04 -07:00

library

Uses more QDEL_NULLs

2017-06-15 00:49:00 +01:00

lighting

Lighting performance/profiling tweaks

2017-02-19 23:37:54 -05:00

logic

…

martial_arts

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

mining

Merge pull request #7567 from SamHPurp/re-factors-posters

2017-07-10 18:48:21 -04:00

mob

Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye

2017-07-11 17:13:47 -04:00

modular_computers

Merge pull request #6516 from fludd12/Grey-Rework

2017-06-30 08:29:31 -07:00

nano

Refactors TK to work a bit more consistently

2017-06-22 23:24:37 -07:00

ninja

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

paperwork

Merge pull request #7567 from SamHPurp/re-factors-posters

2017-07-10 18:48:21 -04:00

pda

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

persistence

…

power

Merge remote-tracking branch 'refs/remotes/origin/master' into Intent-defines

2017-06-10 10:16:33 +01:00

procedural_mapping

Mass replace

2016-07-07 19:34:02 -07:00

projectiles

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

reagents

Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye

2017-07-11 17:13:47 -04:00

recycling

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

research

Blood Refactor (#6220)

2017-07-11 16:49:11 -04:00

ruins

…

scripting

Refactors tcomms stuff a little

2017-02-24 18:10:08 -08:00

security_levels

More GC and Performance Fixes (#7248)

2017-05-06 23:48:18 -07:00

shuttle

Merge branch 'master' into bad-karma

2017-06-10 19:16:13 +01:00

space_management

More GC Define Transitions

2017-05-13 04:24:05 -04:00

spacepods

Merge pull request #7554 from SamHPurp/more-qdel-nulls

2017-06-19 21:14:39 -04:00

station_goals

More GC Define Transitions

2017-05-13 04:24:05 -04:00

store

Instruments Refactor and Electric Guitars

2017-07-02 03:52:42 -04:00

surgery

Merge remote-tracking branch 'upstream/master' into disease-controller-bye-bye

2017-07-11 17:13:47 -04:00

telesci

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

tooltip

…

tram

Switches over to the new system

2017-01-17 13:57:07 +01:00

vehicle

RnD autolathe removal + tech level overhaul

2017-06-01 11:34:29 -07:00

vr

Fixes capitalization of the VR module path

2017-04-21 13:50:28 -07:00