PsiOmega 7bb5b51954 Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event ...

Conflicts:
	code/modules/events/event_manager.dm

2014-11-12 10:18:45 +01:00

..

admin

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

2014-11-08 10:26:45 +01:00

assembly

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

awaymissions

Completes the transfer to the refreshed announcement system.

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

client

More custom loadout jackets + bandana

2014-11-02 22:51:33 -05:00

clothing

Merge pull request #6954 from MagmaRam/coat

2014-11-07 03:45:30 +03:00

customitems

More custom loadout jackets + bandana

2014-11-02 22:51:33 -05:00

destilery

…

detectivework

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

economy

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01:00

events

Merge commit 'ddc1a617d071362add9eb6e4faee2d5da0da8df7' into Event

2014-11-12 10:18:45 +01: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

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

genetics

…

hydroponics

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

icon generation

…

library

Fix for non-cancelable book removal from bookshelves

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

liquid

…

maps

…

mining

Merge pull request #6963 from mwerezak/sliceable

2014-11-08 11:07:34 +03:00

mob

Merge pull request #6965 from PsiOmegaDelta/Supply

2014-11-09 00:02:07 +03: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

Newscaster and photo cleanup

2014-11-06 13:28:17 +01:00

power

AI and Topic fixes.

2014-11-07 11:10:32 +01:00

projectiles

Merge pull request #6942 from PsiOmegaDelta/Hacking

2014-11-07 03:49:38 +03:00

reagents

Merge pull request #6962 from GinjaNinja32/drinks

2014-11-08 11:10:48 +03:00

recycling

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

research

Service personnel get their own radio frequency

2014-11-07 20:54:57 +01:00

scripting

Cleans up radio frequency numbers.

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

security levels

Z-Level Compatibility

2014-10-30 14:29:56 +01: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

All the relevant examine changes.

2014-11-05 12:44:23 +01:00

virus2

All the relevant examine changes.

2014-11-05 12:44:23 +01:00