GinjaNinja32 d4eb42b38b Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/projectiles/targeting.dm

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

..

admin

Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen

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

alarm

Fixes camera network changes not always being reflected in camera consoles.

2015-02-25 19:50:07 +01:00

assembly

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

awaymissions

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

2015-03-05 08:05:44 +01:00

client

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

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

clothing

Merge pull request #8801 from PsiOmegaDelta/NanoRefactorUmptheen

2015-04-11 04:43:50 +03: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

Fixes #8439.

2015-03-13 23:27:35 +01:00

ext_scripts

…

flufftext

Fixes captain's laser gun

2015-02-25 23:35:20 -05:00

food

Removing unused and now uncompilable distillery code.

2015-02-21 22:37:53 +10:30

games

…

genetics

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

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

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

2015-03-05 08:05:44 +01:00

mining

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

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

mob

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

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

nano

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

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

organs

Some dislocation fixes/adjustments.

2015-04-07 19:50:26 -07:00

overmap

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

2015-03-13 09:31:03 +01:00

paperwork

Small fix after merge

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

power

Merge pull request #8788 from PsiOmegaDelta/PortedSpells

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

projectiles

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

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

random_map

Merge with dev.

2015-02-05 20:24:06 +10:30

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

Changed supermatter engine manual for thermoelectric engine.

2015-02-15 22:16:36 +08:00

surgery

Fixes a monkey runtime and updates head reattachment surgery.

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

vehicles

New bullet types, projectile rewrite

2015-02-06 20:09:32 -05:00

virus2

Added macros for droplimb flags.

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