Zuhayr ba6d684e96 Adds [dock_name] entry used by shuttles. ...

Conflicts:
	code/controllers/emergency_shuttle_controller.dm
	code/global.dm
	code/modules/shuttles/shuttle_emergency.dm

2016-01-14 08:33:22 +01:00

..

acting

…

admin

Logging tweaks.

2016-01-08 15:22:43 +01:00

alarm

Modular Computer Multitasking + Fixes

2016-01-08 01:34:30 +01:00

assembly

…

awaymissions

…

blob

Prevents blob from growing over asteroid walls

2015-12-18 07:59:49 +01:00

client

Merge pull request #11933 from comma/mirrormirror

2016-01-08 22:09:22 +00:00

clothing

Merge pull request #11873 from PsiOmegaDelta/160102-Yona

2016-01-12 10:28:30 -05:00

customitems

…

detectivework

…

economy

Species economy modifier now defaults to human if missing.

2016-01-04 09:38:31 +01:00

events

Merge pull request #11957 from PsiOmegaDelta/160110-ProcessedEvents

2016-01-11 17:15:07 +00:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

should realistically fix merge conflicts

2016-01-06 15:12:05 -06:00

genetics

…

ghosttrap

The binary channel will now be listed using the user's primary language key, instead of :

2015-12-28 20:37:05 +01:00

holodeck

…

hydroponics

Logging tweaks.

2016-01-08 15:22:43 +01:00

icon generation

…

library

Logging tweaks.

2016-01-08 15:22:43 +01:00

lighting

…

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2

2015-12-29 20:25:34 +01:00

mining

Makes the mining asteroid airless again.

2015-12-30 00:13:12 -05:00

mob

Merge pull request #11873 from PsiOmegaDelta/160102-Yona

2016-01-12 10:28:30 -05:00

modular_computers

Modular computer fixes

2016-01-12 23:57:36 +01:00

multiz

…

nano

Power monitor tweaks

2016-01-09 06:28:32 +01:00

organs

Now only removing one stump per replacement.

2016-01-08 19:41:48 +03:00

overmap

…

paperwork

Removes suicide code.

2015-12-14 15:57:56 +01:00

power

SMESs will no longer turn themselves off when they run out of power

2016-01-12 16:35:17 +01:00

projectiles

Merge pull request #11739 from PsiOmegaDelta/151214-ObserveThis

2016-01-01 23:58:29 -05:00

random_map

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-13 10:47:33 +01:00

reagents

Attempting to fix perma-wet-floors bugs.

2016-01-12 08:59:59 +01:00

recycling

Merge pull request #11513 from Karolis2011/Constructable_Cargo

2015-12-19 09:18:45 +03:00

research

Fixes incorrectly set entry for steel in Circuit Imprinter

2016-01-11 06:44:28 +01:00

scripting

…

security levels

…

shieldgen

…

shuttles

Adds [dock_name] entry used by shuttles.

2016-01-14 08:33:22 +01:00

spells

Fixes #11681

2015-12-20 20:05:07 +03:00

supermatter

Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-12-20 11:55:53 +01:00

surgery

Merge pull request #11935 from comma/wounds

2016-01-11 17:37:25 +01:00

tables

Scheduler, observation, and New() tweaks.

2015-12-27 17:44:53 +01:00

vehicles

…

virus2

Removes suicide code.

2015-12-14 15:57:56 +01:00

wireless

…

xgm

…