mwerezak 6b85a13de7 Merge remote-tracking branch 'upstream/dev' into chem-kinetics ...

Conflicts:
	code/modules/reagents/Chemistry-Recipes.dm

2015-05-30 17:25:57 -04:00

..

admin

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

2015-05-22 21:01:26 +02:00

alarm

…

assembly

Merge branch 'dev' into ofResearchAndPrototypes

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

awaymissions

…

client

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

2015-05-26 08:35:32 +02:00

clothing

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

2015-05-30 16:11:57 +02:00

customitems

Allowed accessories to function as custom items using icon_override

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

detectivework

…

economy

…

events

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

2015-05-30 15:59:54 +02:00

examine

Updated ashtrays and mineral doors.

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

ext_scripts

…

flufftext

…

food

…

games

…

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

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

2015-05-30 16:11:57 +02:00

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

…

maps

…

materials

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

2015-05-30 16:11:57 +02:00

mining

Merge branch 'dev' into ofResearchAndPrototypes

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

mob

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

2015-05-30 16:11:57 +02:00

nano

Merge pull request #9554 from GinjaNinja32/nano_template

2015-05-30 02:16:32 +09:30

organs

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

2015-05-30 16:11:57 +02:00

overmap

…

paperwork

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

2015-05-30 16:11:57 +02:00

power

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

2015-05-30 16:11:57 +02:00

projectiles

Merge branch 'dev' into ofResearchAndPrototypes

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

random_map

…

reagents

Merge remote-tracking branch 'upstream/dev' into chem-kinetics

2015-05-30 17:25:57 -04:00

recycling

Made sorting pipes dispesible

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

research

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

2015-05-30 16:11:57 +02:00

scripting

…

security levels

…

shieldgen

Implements github suggestions

2015-05-23 22:22:38 +02:00

shuttles

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

2015-05-30 15:59:54 +02:00

spells

new object-based lighting system

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

supermatter

Merge pull request #9408 from mwerezak/sm-eject

2015-05-28 11:35:39 +09:30

surgery

Readded preview icon for IPC, added language and blurb.

2015-05-25 14:50:00 +09:30

tables

Fixes IV stands blocking bullets

2015-05-26 23:05:38 -04:00

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