paprka 615f3f3488 Merge branch 'master' of https://github.com/tgstation/-tg-station into getshockednerd ...

Conflicts:
	code/modules/mob/living/damage_procs.dm
	code/modules/projectiles/projectile.dm

2014-12-26 16:14:19 -08:00

..

admin

Merge pull request #6387 from Incoming5643/goodbye_my_children

2014-12-26 16:29:36 -06: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 pull request #6526 from paprka/secondchef

2014-12-25 15:30:00 -06:00

client

Fixes assistant jobban bug

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

clothing

Merge pull request #6530 from paprka/consistentbs

2014-12-25 21:26:22 -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 #6387 from Incoming5643/goodbye_my_children

2014-12-26 16:29:36 -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 getshockednerd

2014-12-26 16:14:19 -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

Nerfs the supermatter explosion back to 3, 7, 14

2014-12-25 19:47:36 -03:00

projectiles

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

2014-12-26 16:14:19 -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

Ports the rapid pipe dispenser (RPD) from /vg/

2014-12-25 22:06:39 -03: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