Erthilo 6443216183 More Vox clothing. Head and eyes this time. ...

Conflicts:
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/species/vox/head.dmi
	icons/mob/species/vox/suit.dmi

2014-06-15 06:51:14 -04:00

..

admin

Reworks shuttles to be more extensible

2014-06-14 04:13:34 -04:00

assembly

HurrDurr

2014-05-30 22:29:11 -04:00

awaymissions

Smoke rework caused endless loops, reverted.

2014-04-08 01:47:56 +02:00

client

Preferences fixes

2014-06-10 03:32:14 -04:00

clothing

More Vox clothing. Head and eyes this time.

2014-06-15 06:51:14 -04:00

customitems

Moar armalis fixes

2014-05-14 23:00:13 -04:00

destilery

…

detectivework

…

DetectiveWork

Revert the new lighting system.

2014-04-07 23:51:35 +02:00

economy

Paperpocolypse changes.

2014-05-29 10:32:19 -04:00

events

Revert "Fix rad alert lighting."

2014-05-26 15:53:30 -04:00

ext_scripts

We use this

2014-05-30 11:22:36 -04:00

flufftext

…

food

Final Nations patch before live testing. This is going to be painful.

2014-05-27 20:09:10 -04:00

genetics

…

genetics2

Add some parts of genetics 2.0

2014-04-30 14:14:24 -04:00

hydroponics

…

icon generation

…

library

Adds the ability to construct, destroy, and take apart bookcases.

2014-04-19 19:13:33 -04:00

liquid

First commit of liquid simulation stuff

2014-05-23 14:31:29 -04:00

maps

…

media

2nd commit of MySQL conversion. So close to the finish line.

2014-06-03 03:31:06 -04:00

mining

Moved engineering, research and mining shuttles to a generalized system with its own directory structure.

2014-06-14 02:01:14 -04:00

mob

Hurrr

2014-06-15 03:58:50 -04:00

nano

Fixes a nano runtime when the oldMob is null during a user_transfer

2014-04-23 11:48:14 -04:00

organs

Fixing biting your own hand off

2014-06-14 23:18:12 -04:00

paperwork

Removes Impedrezene from the Paralysis Pen

2014-06-08 18:30:56 -04:00

power

Fixes #5098

2014-06-01 13:29:18 -04:00

projectiles

Fixes a bunch more hurt -> harm checks

2014-06-14 01:02:29 -04:00

reagents

Fixes a bunch more hurt -> harm checks

2014-06-14 01:02:29 -04:00

recycling

Trying to cut down on attack lock spam

2014-05-24 17:17:38 -04:00

research

Merge pull request #253 from GhostAA12/master

2014-06-14 16:00:45 -04:00

scripting

…

security levels

Mutiny Mode

2014-05-15 01:01:54 -04:00

shuttles

Add the other shuttle controllers back in

2014-06-15 01:54:38 -04:00

store

Can't forget Ian

2014-05-26 05:52:08 -04:00

supermatter

Rebalanced some rigs + SM typo fix

2014-05-10 18:15:25 +02:00

surgery

spelling fixes

2014-05-29 10:32:09 -04:00

vehicles

Cargo train bugfixes

2014-06-14 22:15:31 -04:00

virus2

Runtime fix

2014-06-14 15:55:05 -04:00