PsiOmega 6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/game/objects/items/weapons/material/shards.dm

2015-08-30 10:23:14 +02:00

..

admin

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

2015-08-28 11:18:57 +02:00

alarm

…

assembly

…

awaymissions

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

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

client

Adds variables for CentComm, NanoTrasen and the station name.

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

clothing

Adds if(check_slot) check.

2015-08-25 16:39:54 -04:00

customitems

…

detectivework

More computer overlay changes.

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

economy

Adds variables for CentComm, NanoTrasen and the station name.

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

events

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

2015-08-28 11:27:20 +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

…

ghosttrap

…

holodeck

Adds variables for CentComm, NanoTrasen and the station name.

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

hydroponics

Refactoring hardsuit click checking.

2015-08-23 02:14:55 +09:30

icon generation

…

library

…

lighting

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

2015-08-18 11:59:50 -07:00

liquid

…

maps

…

materials

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

2015-08-22 03:57:12 +09:30

mining

…

mob

Fixes Yongauni#155

2015-08-30 11:45:54 +09:30

nano

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

2015-08-27 09:01:50 +02:00

organs

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

2015-08-27 09:01:50 +02:00

overmap

More computer overlay changes.

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

paperwork

Merge pull request #10694 from PsiOmegaDelta/150817-SynthAccess

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

power

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

2015-08-27 09:01:50 +02:00

projectiles

Merge pull request #9891 from Zuhayr/dev

2015-08-21 14:23:57 -04: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-08-25 08:20:13 +02:00

recycling

Conveyors, signs, door buttons and crematoriums will now rotate correctly with client.dir

2015-08-18 15:48:55 +01:00

research

Adds variables for CentComm, NanoTrasen and the station name.

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

scripting

…

security levels

…

shieldgen

…

shuttles

Adds variables for CentComm, NanoTrasen and the station name.

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

spells

…

supermatter

…

surgery

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

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

tables

improve defines in table code

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

vehicles

…

virus2

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

2015-08-30 10:23:14 +02:00

xgm

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

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