Cheridan 957f987b5d Merge branch 'master' of https://github.com/tgstation/-tg-station into dragnet ...

Conflicts:
	icons/effects/effects.dmi
	icons/obj/items.dmi

2015-06-22 22:57:53 -05:00

..

admin

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

assembly

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

awaymissions

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

client

Removes a couple of debug messages from adminpm.

2015-06-20 21:30:14 -06:00

clothing

Merge pull request #10031 from Ikarrus/gangfashion

2015-06-20 18:06:19 +02:00

crafting

Adds feedback gathering for a hell of a lot more things.

2015-06-09 21:52:46 -07:00

detectivework

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

emoji

…

events

fixed the changelog FOR REAL THIS TIME, also fixed bad coding

2015-06-22 21:30:50 -05:00

flufftext

Pray pray pray

2015-06-18 18:07:57 +01:00

food&drinks

Pray pray pray

2015-06-18 18:07:57 +01:00

holiday

Fixes #9257

2015-05-05 18:50:30 +02:00

hydroponics

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

library

Pray pray pray

2015-06-18 18:07:57 +01:00

lighting

Changes how destroying turfs works

2015-05-29 18:43:34 -05:00

mining

Merge pull request #9956 from Jordie0608/whocodesthecodemen

2015-06-20 00:53:30 -05:00

mob

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

2015-06-22 22:57:53 -05:00

nano

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

ninja

Merge pull request #10033 from optimumtact/reeeeeeee_hitby_messages

2015-06-20 00:19:03 -05:00

paperwork

Pray pray pray

2015-06-18 18:07:57 +01:00

power

Merge pull request #9466 from Fayrik/TheNanoing

2015-06-22 14:24:20 +02:00

procedural mapping

Updates paths

2015-06-03 22:52:39 +02:00

projectiles

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

2015-06-22 22:57:53 -05:00

reagents

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

recycling

Merge pull request #9980 from LaharlMontogmmery/ContentTransfer

2015-06-21 00:09:19 +01:00

research

Merge pull request #9971 from KorPhaeron/newfloors

2015-06-23 03:43:28 +01:00

scripting

Updates more paths, for example obj/stuff to /obj/stuff

2015-05-31 17:48:33 +02:00

security levels

more spans

2015-04-24 20:52:00 +03:00

shuttle

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

2015-06-16 17:24:20 +10:00

surgery

Merge pull request #8876 from xxalpha/fixfixfix

2015-06-21 22:12:17 +03:00

telesci

Pray pray pray

2015-06-18 18:07:57 +01:00