paprka 5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser ...

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

2014-12-26 09:09:24 -08:00

..

admin

Adds Supermatter logging and tweaks the power gen

2014-12-19 18:19:48 -03:00

assembly

Assembly holder is no longer secured or unsecured. Screwdrive now disassemble it and attack_self to interact with its parts.

2014-12-24 01:50:19 +01:00

awaymissions

Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser

2014-12-26 09:09:24 -08:00

client

Fixes assistant jobban bug

2014-11-27 16:51:15 -03:00

clothing

Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser

2014-12-26 09:09:24 -08:00

crafting

fixed compile errors

2014-12-24 21:03:22 -08:00

detectivework

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

events

Merge pull request #6545 from tkdrg/runtimes-killed-santa

2014-12-25 16:20:45 -06:00

flufftext

Standardizes attack messages to always show the attacker first (when there is an attacker).

2014-11-24 01:49:34 +01:00

food&drinks

renames chef to cook

2014-12-22 17:02:06 -08:00

holiday

Spookoween should be mucho bettero now

2014-11-04 19:11:23 +01:00

hydroponics

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

library

Fixes monkeys being able to read books

2014-12-14 13:06:33 -05:00

mining

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

mob

Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser

2014-12-26 09:09:24 -08:00

nano

Giacom Fixes

2014-08-06 20:22:36 +02:00

paperwork

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00

power

Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake

2014-12-24 19:48:24 -08:00

projectiles

Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya

2014-12-25 13:51:43 -08:00

reagents

Fixes not being able to remove used slime extract from the slime extract smartfridge in xenobio.

2014-12-15 01:30:18 +01:00

recycling

Ok now explosions shall work properly

2014-12-05 23:21:48 +03:00

research

Conflict fixing

2014-12-25 22:34:40 +01:00

scripting

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

security levels

Merge branch 'master' of https://github.com/tgstation/-tg-station into Msg1Fix

2014-10-05 13:48:11 +02:00

shuttle

moves emag effects from attackby() into atom proc emag_act()

2014-11-20 17:49:06 -08:00

surgery

Making nutrition level values into defines.

2014-12-13 17:15:35 +01:00

telesci

Fixes a lot of "the the" in messages.

2014-12-16 22:59:55 +01:00