Chinsky 32534346c7 Merge pull request #8773 from mwerezak/dislocation ...

Adds dislocating joints using a neck grab

2015-04-14 16:35:24 +03:00

..

admin

Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen

2015-04-11 04:43:50 +03:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-04-08 10:55:26 +02:00

clothing

Merge pull request #8829 from Techhead0/voidtank

2015-04-13 13:57:56 +02:00

customitems

…

detectivework

…

economy

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

2015-04-08 10:55:26 +02:00

events

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

2015-04-03 09:33:05 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

holodeck

…

hydroponics

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

2015-04-13 12:49:07 +01:00

icon generation

…

library

…

liquid

…

maps

…

mining

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

2015-04-08 10:55:26 +02:00

mob

Merge pull request #8773 from mwerezak/dislocation

2015-04-14 16:35:24 +03:00

nano

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

2015-04-13 12:49:07 +01:00

organs

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

2015-04-13 17:12:02 -04:00

overmap

…

paperwork

Small fix after merge

2015-04-09 21:07:43 +03:00

power

Removed some cocked up files.

2015-04-13 22:58:32 +09:30

projectiles

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

2015-04-13 12:49:07 +01:00

random_map

…

reagents

Merge pull request #8788 from PsiOmegaDelta/PortedSpells

2015-04-11 02:05:58 +03:00

recycling

…

research

Merge pull request #8753 from Neerti/4-4-2015_borg_module_stuff

2015-04-12 13:16:45 +09:30

scripting

…

security levels

…

shieldgen

…

shuttles

…

spells

Ports /vg/'s spell system for the sake of cult porting.

2015-04-09 20:08:06 +02:00

supermatter

…

surgery

Fixes a monkey runtime and updates head reattachment surgery.

2015-04-04 20:03:54 -07:00

vehicles

…

virus2

…