Menshin cf41dab26f Conflict fixing

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

..

admin

Adds Supermatter logging and tweaks the power gen

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

assembly

Fixes not being able to hear the beeping of infrared beam, timer and proximity sensor in the dark.

2014-11-22 22:56:13 +01:00

awaymissions

Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake

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

client

Fixes assistant jobban bug

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

clothing

Merge branch 'master' into meido

2014-12-25 12:41:29 -03: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 #6476 from Cheridan/nightcrawler

2014-12-21 17:02:48 -08: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

Removes the sugar from donk pockets

2014-12-22 11:50:22 -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 deathtoezmode

2014-12-25 13:12:46 -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

fixed compile errors

2014-12-24 21:03:22 -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