Krausus f816b8672d Resolves merge conflicts ...

Conflicts:
	code/game/machinery/computer/communications.dm

2015-08-18 04:14:14 -04:00

..

admin

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

alarm

Alarm system overhaul

2015-08-02 07:13:03 +02:00

assembly

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

atmos_automation

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

awaymissions

Fix incorrect icon state on BSA computer

2015-08-17 00:44:06 +02:00

client

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

clothing

Merge pull request #1716 from Markolie/rndserver

2015-08-12 22:27:53 -04:00

computer3

Merge pull request #1742 from Markolie/ghosties

2015-08-15 15:16:10 -04:00

crafting

Kitchen Overhaul 2: Table Edition

2015-07-25 06:38:09 -04:00

customitems

Kluysfluff indentation

2015-08-11 21:52:40 +02:00

destilery

…

DetectiveWork

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

economy

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

events

Merge pull request #1754 from tigercat2000/log_to_dd

2015-08-16 17:49:00 +02:00

ext_scripts

…

fish

…

flufftext

…

food

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

games

…

garbage collection

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

genetics2

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

holiday

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

hydroponics

Turn dionas into simple animals

2015-08-17 02:19:29 +02:00

icon generation

…

jungle

Replaces typesof with subtypesof where applicable

2015-08-03 11:04:28 -04:00

karma

…

library

…

lighting

Further process tweaks

2015-08-08 09:07:26 -04:00

liquid

…

media

ensure the current song ends when streaming is disabled

2015-07-26 06:23:30 +02:00

mining

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

mob

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

nano

New proc to replace world.log <<, log_to_dd()

2015-08-14 18:18:57 -07:00

ninja

Fixes bad PDA tnote entries and minor PDA bugs

2015-08-14 23:33:38 -04:00

organs

Merge pull request #1768 from Markolie/diona

2015-08-17 21:34:46 -04:00

paperwork

…

pooling

…

power

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

procedural mapping

…

projectiles

Merge pull request #1768 from Markolie/diona

2015-08-17 21:34:46 -04:00

reagents

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

recycling

Resolves merge conflicts

2015-08-18 04:14:14 -04:00

research

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

scripting

Merge pull request #1766 from Markolie/adminbus

2015-08-17 18:10:38 -04:00

security levels

Admin jump overhaul, add watchlist functionality, other admin updates

2015-08-16 23:28:02 +02:00

shieldgen

…

shuttles

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

store

Bluespace artillery computer update, accounts database computer update, ghost machinery interaction update

2015-08-14 06:26:40 +02:00

surgery

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

telesci

Update upgradable machinery New code

2015-07-30 22:19:32 +02:00

tram

…

vehicle

Consolidate ?/FLW links under key_name_admin

2015-08-17 00:13:53 +02:00

virus2

Dismemberment Tweaks

2015-08-09 22:11:37 -04:00