Chinsky e15d77eba7 Merge branch 'dev' of https://github.com/Zuhayr/Baystation12 into rainbowlood

2013-12-26 11:11:06 +04:00

..

admin

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

2013-12-26 11:10:36 +04:00

assembly

Added "hide" verb to mousetraps, placing them on the same layer as hidden mice.

2013-12-18 02:08:38 +08:00

awaymissions

…

client

NANOUI PDA

2013-12-22 06:18:39 -06:00

clothing

Merge pull request #4096 from fauxki/dev

2013-12-23 04:39:46 -08:00

customitems

…

destilery

…

detectivework

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

economy

…

events

DNA2 fixes cherrypicked from N3X15.

2013-12-23 00:06:56 +10:30

ext_scripts

…

flufftext

…

food

…

genetics

…

icon generation

…

library

…

liquid

…

maps

…

mining

Merge branch 'master' of https://github.com/Zuhayr/Baystation12

2013-12-22 23:13:22 +10:30

mob

Merged binary files, adapted chinsky's blood painting procs to function with arbitrary colours.

2013-12-26 14:48:05 +10:30

nano

NANOUI PDA

2013-12-22 06:18:39 -06:00

organs

Re-balancing for IB, bleed rate is back to usual settings, minor nerf for

2013-12-20 17:01:51 -08:00

paperwork

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

power

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

2013-12-13 19:13:43 +00:00

projectiles

Manual binary merge of head icons.

2013-12-22 23:23:25 +10:30

reagents

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

recycling

Mass updates to paths for blood decals.

2013-12-26 01:56:06 +10:30

research

Merge pull request #4103 from LightningIron/dev

2013-12-23 15:25:17 -08:00

scripting

…

security levels

…

surgery

Manual binary merge of head icons.

2013-12-22 23:23:25 +10:30

telesci

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

2013-12-13 19:13:43 +00:00

virus2

…