Hornygranny 72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity ...

Conflicts:
	code/modules/mob/living/living.dm

2014-10-22 13:26:35 -07:00

..

admin

Merge pull request #5240 from paprka/assantag

2014-10-20 20:19:08 -07:00

assembly

Merge pull request #5263 from Aranclanos/electropackrevamp

2014-10-16 08:08:57 -05:00

awaymissions

Makes the gateway unacidable.

2014-10-12 20:43:15 +03:00

client

Merge branch 'undershirts' of https://github.com/paprka/-tg-station into undershirtstake2

2014-10-08 09:48:49 -07:00

clothing

Merge pull request #5372 from paprka/prisonjumpsuit

2014-10-20 20:01:42 -07:00

crafting

moved files and fixed tablecrafting

2014-10-17 10:30:04 -07:00

detectivework

…

events

Merge pull request #5363 from Cheridan/better_noms

2014-10-20 19:24:04 -07:00

flufftext

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

food&drinks

Ian emotes while eating again. Fixed #5147

2014-10-11 14:35:35 +02:00

hydroponics

Returns the missing grassclump icon

2014-10-18 20:58:07 -04:00

library

bookcases no longer opaque

2014-10-04 18:28:30 -07:00

mining

Merge pull request #5318 from phil235/MsgFix2

2014-10-19 21:39:06 -05:00

mob

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity

2014-10-22 13:26:35 -07:00

nano

…

paperwork

changed ishuman to tool user check

2014-10-17 13:08:13 -07:00

power

Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity

2014-10-22 13:26:35 -07:00

projectiles

Merge pull request #5399 from phil235/LaserGunFix

2014-10-22 10:53:49 -07:00

reagents

[nerfingintesifies]

2014-10-11 08:04:35 -07:00

recycling

Merge pull request #5277 from paprka/newshotguns

2014-10-21 09:51:35 -07:00

research

Merge pull request #5216 from phil235/bodybagfix1

2014-10-21 12:15:30 -05: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

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

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

surgery

removing comment.

2014-09-21 22:26:18 +02:00

telesci

Removes telesci comp's update_icon override

2014-10-07 23:16:52 +11:00