PsiOmegaDelta 299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm

2015-10-16 13:02:59 +02:00

..

admin

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

2015-10-16 13:02:59 +02:00

alarm

…

assembly

Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.

2015-09-03 09:38:15 +02:00

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

2015-08-24 17:45:10 +09:30

blob

Fixes a minor blob issue, adds mecha attack message

2015-10-07 10:49:24 +03:00

client

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

2015-10-16 13:02:59 +02:00

clothing

Overhauls humanoid vision handling.

2015-10-05 08:48:47 +02:00

customitems

Small tweaks to get rolldowns to work properly.

2015-08-09 17:01:07 +09:30

detectivework

More computer overlay changes.

2015-08-20 08:38:43 +02:00

economy

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

2015-09-12 13:10:29 +02:00

events

Blobs locations are now more random.

2015-10-13 18:49:55 +02:00

examine

…

ext_scripts

…

flufftext

Adds variables for CentComm, NanoTrasen and the station name.

2015-08-22 02:10:11 +09:30

food

…

games

…

genetics

Fix gender issues, some typos from various files

2015-08-11 13:41:40 +03:00

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

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

2015-10-11 17:37:01 +02:00

hydroponics

Merge pull request #11288 from PsiOmegaDelta/151310-RandomBlob

2015-10-14 03:24:28 +03:00

icon generation

…

library

Merge pull request #10279 from Kearel/LibraryModifications

2015-08-13 17:47:16 +03:00

lighting

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

2015-09-18 08:51:10 +02:00

liquid

…

maps

…

materials

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

2015-10-14 08:41:38 +02:00

mining

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

2015-09-11 08:54:03 +02:00

mob

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

2015-10-16 13:02:59 +02:00

multiz

Turf initialization tweaking.

2015-09-27 13:18:18 +02:00

nano

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

2015-09-29 11:52:48 +02:00

organs

Merge pull request #11230 from PsiOmegaDelta/xenomorphs

2015-10-13 08:31:27 +10:30

overmap

More computer overlay changes.

2015-08-20 08:38:43 +02:00

paperwork

Updates blob

2015-10-05 18:10:16 +03:00

power

Updates blob

2015-10-05 18:10:16 +03:00

projectiles

Merge pull request #11219 from PsiOmegaDelta/150929-HumanoidVision

2015-10-15 19:15:28 +03:00

random_map

Amending some loc setting lines.

2015-08-25 12:40:09 +09:30

reagents

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

2015-10-16 13:02:59 +02:00

recycling

fix #10882

2015-09-16 14:34:20 +03:00

research

Updates mechfab

2015-10-08 16:03:32 -04:00

scripting

Updates files as necessary to adhere to the new standard.

2015-07-27 09:32:51 +02:00

security levels

…

shieldgen

Updates blob

2015-10-05 18:10:16 +03:00

shuttles

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-21 20:27:48 +02:00

spells

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

2015-09-27 13:48:33 +02:00

supermatter

Structures now take damage properly from projectile clouds

2015-08-15 19:08:45 -04:00

surgery

Merge pull request #11230 from PsiOmegaDelta/xenomorphs

2015-10-13 08:31:27 +10:30

tables

improve defines in table code

2015-08-28 00:12:18 +01:00

vehicles

Updates blob

2015-10-05 18:10:16 +03:00

virus2

Makes internal radiation sources also use apply_effect(), by utilizing the ability to ignore radiation protection.

2015-09-26 09:19:58 +02:00

xgm

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

2015-08-25 08:12:39 +02:00