Kelenius ea12fc664f Merge branch 'dev' into ofResearchAndPrototypes ...

Conflicts:
	code/modules/mob/living/carbon/brain/posibrain.dm

2015-05-25 20:35:46 +03:00

..

admin

Renamed kitchen utensils.

2015-05-16 21:24:36 +09:30

alarm

more lightweight camera caching

2015-05-10 17:06:30 +01:00

assembly

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

awaymissions

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

2015-04-24 17:13:37 +02:00

client

Removed IS_SYNTHETIC and REGENERATES_LIMBS flags.

2015-05-25 14:49:07 +09:30

clothing

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

customitems

Allowed accessories to function as custom items using icon_override

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

detectivework

Merge branch 'dev' into ofChemistryAndStuff

2015-04-28 10:49:26 +03:00

economy

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

2015-05-09 11:13:05 +02:00

events

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

2015-05-12 13:40:47 +02:00

examine

Updated ashtrays and mineral doors.

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

ext_scripts

…

flufftext

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

food

…

games

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

genetics

…

ghosttrap

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

holodeck

New tables, code section. Changelog entry soon.

2015-05-13 19:08:39 +01:00

hydroponics

Adds ghost click to posibrains.

2015-05-25 16:49:22 +09:30

icon generation

…

library

Renamed knives.

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

lighting

fix an issue with destroying light sources that have 0 light_range

2015-05-14 10:58:52 +01:00

liquid

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

maps

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

materials

Updates to properly DA materials

2015-05-23 15:21:11 +03:00

mining

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

mob

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

nano

better nanoui caching + fixes

2015-05-14 22:35:50 +01:00

organs

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

2015-05-25 16:50:04 +09:30

overmap

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

2015-04-24 17:13:37 +02:00

paperwork

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-20 11:50:28 +03:00

power

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

projectiles

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

random_map

Clean server start.

2015-04-18 15:32:25 +02:00

reagents

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-25 20:35:46 +03:00

recycling

Made sorting pipes dispesible

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

research

Merge branch 'dev' into ofResearchAndPrototypes

2015-05-22 19:26:39 +03:00

scripting

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

security levels

…

shieldgen

new object-based lighting system

2015-05-10 20:54:25 +01:00

shuttles

Updates the atom_pool, now datum_pool, to handle any datum object.

2015-04-24 09:59:05 +02:00

spells

new object-based lighting system

2015-05-10 20:54:25 +01:00

supermatter

Removes redundant surgery for brain and eye repair, now covered by organ repair in general.

2015-05-25 14:49:57 +09:30

surgery

Readded preview icon for IPC, added language and blurb.

2015-05-25 14:50:00 +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

Attempting to guarantee immunity to viruses for virus_immune var.

2015-05-25 15:52:51 +09:30