SinTwo 4129b95f4e TG_PORT_fix 2 ...

Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/suits/miscellaneous.dm

2015-10-11 00:36:50 -04:00

..

admin

Merge pull request #11257 from Karolis2011/map_capture

2015-10-09 11:35:54 +01: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

TG_Port_2

2015-10-11 00:36:13 -04:00

clothing

TG_PORT_fix 2

2015-10-11 00:36:50 -04:00

customitems

…

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

Updates blob

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

examine

Adds system to describe how protective a piece of clothing is.

2015-09-06 15:52:46 -04:00

ext_scripts

…

flufftext

Adds variables for CentComm, NanoTrasen and the station name.

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

food

…

games

…

genetics

…

ghosttrap

…

holodeck

Updates blob

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

hydroponics

[BOTANY] Seed Fixes

2015-10-11 00:27:49 -04:00

icon generation

…

library

…

lighting

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

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

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04:00

mining

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

mob

Adds socks.

2015-10-11 00:13:33 -04: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 remote-tracking branch 'upstream/dev-freeze' into dev

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

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

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

projectiles

The detective colt can now be reskinned

2015-10-11 00:30:06 -04:00

random_map

Amending some loc setting lines.

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

reagents

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

recycling

fix #10882

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

research

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00

scripting

…

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

…

surgery

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

2015-08-22 03:11:53 +09:30

tables

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge

2015-09-06 18:26:06 -04: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