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

Conflicts:
	code/controllers/configuration.dm
	code/modules/admin/topic.dm
	config/example/config.txt

2015-07-12 14:49:31 +02:00

..

admin

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

2015-07-12 14:49:31 +02:00

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Changed steel material name to a define.

2015-05-12 13:08:41 +09:30

awaymissions

…

client

Removes a qdel(client) call.

2015-07-05 21:01:09 +02:00

clothing

Teleportation code now ignores dense objects with the ON_BORDER flag.

2015-07-11 17:30:40 +02:00

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03: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

Updated ashtrays and mineral doors.

2015-05-17 03:02:03 +09:30

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

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Fixes #10054, fixes some mushroom issues.

2015-07-09 04:25:36 +09:30

icon generation

…

library

Renamed knives.

2015-05-16 20:54:34 +09:30

lighting

Fixes another bug

2015-07-04 17:55:41 +02:00

liquid

…

maps

…

materials

Fixes #9740

2015-07-09 03:40:26 +09:30

mining

Compilation fix.

2015-07-11 10:51:03 +02:00

mob

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

nano

Fixes antags being able to see the appearance changer.

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

organs

Tweak/refactor external organ droplimb mechanics

2015-07-10 00:14:35 -04: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

Moved trajectory check to during target assessment

2015-07-11 02:47:47 +12:00

random_map

…

reagents

Fixes #10062 and #10061

2015-07-12 07:04:35 +09:30

recycling

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

2015-07-11 09:51:24 +02: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

Fixes tables not connecting

2015-07-11 23:19:57 +01:00

vehicles

Cargo train vs projectiles

2015-07-11 02:16:17 +12:00

virus2

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

2015-07-10 12:57:46 +02:00