PsiOmega 62185bc0a8 Merge remote-tracking branch 'upstream/dev-freeze' into dev

2015-05-26 08:35:32 +02:00

..

admin

…

alarm

…

assembly

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

awaymissions

…

client

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

2015-05-26 08:35:32 +02:00

clothing

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

2015-05-26 08:35:32 +02:00

customitems

…

detectivework

…

economy

…

events

…

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

holodeck

…

hydroponics

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

icon generation

…

library

…

lighting

…

liquid

…

maps

…

materials

Updates to properly DA materials

2015-05-23 15:21:11 +03:00

mining

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

mob

Removed several unneeded icons from inhands, split holder icons into their own file.

2015-05-26 14:05:21 +09:30

nano

Fixes #9447.

2015-05-24 11:33:54 +02:00

organs

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

2015-05-25 16:50:04 +09:30

overmap

…

paperwork

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

power

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

projectiles

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

random_map

…

reagents

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

2015-05-26 08:35:32 +02:00

recycling

…

research

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

…

supermatter

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30

surgery

Readded preview icon for IPC, added language and blurb.

2015-05-25 14:50:00 +09:30

tables

Merge with dev.

2015-05-20 13:39:31 +09:30

vehicles

Merge pull request #9390 from mwerezak/attack-animation

2015-05-21 06:52:30 +02:00

virus2

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30