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

Conflicts:
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/human_organs.dm

2015-04-13 17:12:02 -04: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

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

2015-03-31 01:37:55 -04:00

detectivework

sanitize() refactor: second pass(other sanitize functions)

2015-03-23 01:38:09 +03:00

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

Fixes #8696

2015-03-31 20:30:06 -04:00

hydroponics

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

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

icon generation

…

library

sanitize() refactor: fourth pass

2015-04-03 00:40:57 +03:00

liquid

…

maps

…

mining

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

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

mob

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

2015-04-13 17:12:02 -04: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

sanitize() refactor: first pass (sanitize)

2015-03-22 23:31:19 +03:00

research

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

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

scripting

…

security levels

Allows admins to more easily set security levels.

2015-03-31 14:32:28 +02:00

shieldgen

…

shuttles

Adds refresh button, fixes arrivals docking frequency.

2015-04-02 00:26:45 -04:00

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

Added macros for droplimb flags.

2015-03-31 11:42:45 +10:30