PsiOmegaDelta e18472c444 Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/datums/ai_laws.dm
	code/modules/hydroponics/spreading/spreading.dm

2015-07-08 08:57:48 +02:00

..

admin

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

2015-07-04 15:19:52 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-06-26 19:22:31 +02:00

clothing

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

2015-06-26 19:22:31 +02:00

customitems

Fixes issues with raider equipping

2015-07-04 16:32:35 -04:00

detectivework

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

economy

Fixes #9847

2015-06-20 22:15:38 +09:30

events

Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465.

2015-06-21 18:08:26 +09:30

examine

…

ext_scripts

(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly

2015-06-28 11:43:53 +01:00

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

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

2015-07-08 08:57:48 +02:00

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Removes the RUST engine.

2015-07-01 15:50:55 +09:30

mining

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

mob

Merge pull request #10014 from mwerezak/raider-gear

2015-07-06 05:48:25 +09:30

nano

Fixes antags being able to see the appearance changer.

2015-06-21 21:12:28 +02:00

organs

Fixes #9913

2015-06-25 23:51:58 +03:00

overmap

…

paperwork

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

2015-06-26 19:22:31 +02:00

power

Removes the RUST engine.

2015-07-01 15:50:55 +09:30

projectiles

Merge pull request #10012 from mwerezak/guntweak

2015-07-05 22:26:05 +02:00

random_map

…

reagents

Merge pull request #9936 from mwerezak/fire

2015-06-26 13:34:21 +02:00

recycling

Fixes disposal bins filling instantly

2015-06-24 22:09:47 -04:00

research

Merge pull request #9992 from Baystation12/master

2015-07-02 19:00:00 +09:30

scripting

…

security levels

…

shieldgen

A deleted shield generator no longer runtime every tick until force-deleted.

2015-07-05 17:33:55 +02:00

shuttles

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

2015-06-26 19:22:31 +02:00

spells

Adds SLOT_EARS to various items

2015-06-21 01:45:43 -04:00

supermatter

Merge pull request #9992 from Baystation12/master

2015-07-02 19:00:00 +09:30

surgery

Fixes #9933

2015-06-25 23:59:12 +03:00

tables

Makes standard tables plastic

2015-06-14 13:38:56 -04:00

vehicles

…

virus2

…