PsiOmega 8e3861141c Merge branch 'dev' into PowerTwo ...

Conflicts:
	code/modules/power/solar.dm

2014-10-24 13:32:36 +02:00

..

admin

Merge pull request #6791 from Zuhayr/dev

2014-10-21 01:13:17 +04:00

assembly

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

awaymissions

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

client

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

2014-10-20 04:52:45 +04:00

clothing

Merge pull request #6791 from Zuhayr/dev

2014-10-21 01:13:17 +04:00

customitems

Fixes #6783, moves spacesuits to a separate file

2014-10-18 22:12:15 -04:00

destilery

…

detectivework

Fixes #6592

2014-10-04 02:11:51 -04:00

economy

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

events

Ion laws

2014-10-23 21:15:56 +02:00

ext_scripts

…

flufftext

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

food

Organ rewrite mapclean attempt.

2014-09-29 06:18:58 +09:30

games

Merge

2014-10-11 13:58:16 -04:00

genetics

…

hydroponics

Hydro tweaks, fixes #6808

2014-10-21 09:10:23 +10:30

icon generation

…

library

Fix for non-cancelable book removal from bookshelves

2014-09-21 16:04:22 +01:00

liquid

…

maps

…

mining

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

mob

AI emotions and status displays

2014-10-23 13:16:17 +02:00

nano

testing fix for nui resources

2014-10-13 20:01:54 +01:00

organs

Fixes #6763

2014-10-18 07:52:27 +10:30

paperwork

Merge

2014-10-11 13:58:16 -04:00

power

Merge branch 'dev' into PowerTwo

2014-10-24 13:32:36 +02:00

projectiles

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

2014-10-24 09:12:02 +10:30

reagents

fixes some annoying punctuation errors.

2014-10-22 15:58:27 -04:00

recycling

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

2014-10-24 09:12:02 +10:30

research

fixes some annoying punctuation errors.

2014-10-22 15:58:27 -04:00

scripting

Cleans up radio frequency numbers.

2014-09-18 13:07:34 +02:00

security levels

Merge

2014-10-11 13:58:16 -04:00

shieldgen

Basically ripped over /tg/'s powernet and cable code into our own codebase.

2014-10-13 17:13:04 +02:00

shuttles

Completes the transfer to the refreshed announcement system.

2014-10-07 13:19:20 +02:00

supermatter

Adds two mwerezak's requests.

2014-09-18 19:23:00 +02:00

surgery

Merge

2014-10-11 13:58:16 -04:00

vehicles

Cables are now stacks

2014-08-25 18:54:35 +04:00

virus2

Merge

2014-10-11 13:58:16 -04:00