Atlantis 1da44dc861 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge ...

- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.

2015-05-24 20:23:46 +02:00

..

admin

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

2015-05-22 21:01:26 +02:00

alarm

…

assembly

…

awaymissions

…

client

Adds engineering workboots

2015-05-23 23:00:26 -04:00

clothing

Merge pull request #9451 from PsiOmegaDelta/Tmp

2015-05-24 18:16:08 +03:00

customitems

Allowed accessories to function as custom items using icon_override

2015-05-16 01:37:04 +09:30

detectivework

…

economy

…

events

…

examine

Updated ashtrays and mineral doors.

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

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

Merge with dev.

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

icon generation

…

library

Renamed knives.

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

lighting

…

liquid

…

maps

…

materials

Bit of documentation.

2015-05-20 14:00:14 +09:30

mining

Rebalancing and adjusting divisors for all weapon damage values.

2015-05-17 16:51:55 +09:30

mob

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

2015-05-24 20:23:46 +02:00

nano

Fixes #9447.

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

organs

Ghetto diagnostics!

2015-05-18 06:37:51 +03:00

overmap

…

paperwork

Merge branch 'dev' into ofChemistryAndStuff

2015-05-15 11:28:05 +03:00

power

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

2015-05-24 20:23:46 +02:00

projectiles

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

2015-05-22 08:26:13 +02:00

random_map

…

reagents

Supply shuttle and crate fixes

2015-05-23 16:15:04 +01:00

recycling

Made sorting pipes dispesible

2015-05-16 17:27:39 +03:00

research

Merge with dev.

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

scripting

…

security levels

…

shieldgen

Implements github suggestions

2015-05-23 22:22:38 +02:00

shuttles

…

spells

…

supermatter

…

surgery

Merge with dev.

2015-05-20 13:39:31 +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

…