Hubblenaut 3fb52ab4d5 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi

2015-08-11 00:51:18 +02:00

..

admin

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

2015-08-05 09:25:53 +02:00

alarm

…

assembly

…

awaymissions

…

client

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

2015-08-11 00:51:18 +02:00

clothing

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

2015-08-11 00:51:18 +02:00

customitems

Merge pull request #10046 from mwerezak/custom-item-icons

2015-07-09 20:52:38 +03:00

detectivework

…

economy

…

events

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

2015-07-14 08:21:12 +02:00

examine

…

ext_scripts

…

flufftext

…

food

…

games

…

genetics

…

ghosttrap

Fixes <span class='class>, makes Travis check it

2015-07-18 21:13:32 +01:00

holodeck

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

2015-08-06 08:12:38 +02:00

hydroponics

…

icon generation

…

library

…

lighting

Fixes #10409.

2015-08-03 10:15:24 +02:00

liquid

…

maps

…

materials

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

2015-08-08 15:34:51 +02:00

mining

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

2015-08-08 15:34:51 +02:00

mob

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

2015-08-08 15:34:51 +02:00

nano

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

2015-08-05 09:25:53 +02:00

organs

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

2015-07-31 10:00:16 +02:00

overmap

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

2015-07-28 07:59:49 +02:00

paperwork

…

power

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

2015-08-08 15:34:51 +02:00

projectiles

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

2015-08-08 15:34:51 +02:00

random_map

…

reagents

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

2015-07-30 10:49:37 +02:00

recycling

Crematorium Destroy()

2015-08-06 08:39:24 +02:00

research

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

2015-08-08 15:34:51 +02:00

scripting

…

security levels

…

shieldgen

…

shuttles

Merge with dev.

2015-07-15 16:20:39 +09:30

spells

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

2015-07-27 10:20:20 +02:00

supermatter

…

surgery

…

tables

More material renames

2015-08-07 17:10:35 -04:00

vehicles

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

2015-07-11 10:58:49 +02:00

virus2

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

2015-07-11 10:58:49 +02:00

xgm

…