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

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

2015-03-31 13:01:09 -04:00

..

admin

Merge pull request #8583 from Fayrik/CentcomExpansion

2015-03-30 21:35:19 -05:00

assembly

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

awaymissions

Merge remote-tracking branch 'upstream/master' into hardjet

2015-03-27 19:35:10 +00:00

client

Separates ship ambience and area ambience

2015-03-29 14:49:59 -04:00

clothing

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

2015-03-31 13:01:09 -04:00

crafting

Merge pull request #8439 from GunHog/SteelpointsSecCamsAndLights

2015-03-22 16:56:11 +11:00

detectivework

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

emoji

…

events

Merge pull request #8566 from Incoming5643/literal_fun_removal

2015-03-30 01:25:52 +11:00

flufftext

…

food&drinks

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

2015-03-26 02:31:06 +01:00

holiday

Fix-it-Phil

2015-03-29 06:17:25 +11:00

hydroponics

Fixes growing rice stalk being invisible at later stages.

2015-03-29 15:15:49 +02:00

library

Adds a verb_exclaim var. Fixes #8478.

2015-03-22 18:55:59 +01:00

mining

Merge remote-tracking branch 'origin/master' into mining

2015-03-31 18:31:12 +12:00

mob

Merge pull request #8592 from phil235/AlienAttackBlob

2015-03-31 19:11:12 +11:00

nano

…

ninja

Moves ninja shoes into the ninja folder

2015-03-09 23:02:26 +00:00

paperwork

Change select holiday names to #defines

2015-03-25 15:01:06 -07:00

power

Effect pooling

2015-03-24 11:44:49 -07:00

procedural mapping

…

projectiles

Merge remote-tracking branch 'origin/master' into mining

2015-03-31 18:31:12 +12:00

reagents

Merge pull request #8520 from MrPerson/effect_cleanup

2015-03-30 01:21:40 +11:00

recycling

resprites forensic scanner, cargo tagger, and rped

2015-03-22 11:54:26 -05:00

research

Merge remote-tracking branch 'origin/master' into mining

2015-03-31 18:31:12 +12:00

scripting

NTSL Expansion

2015-03-25 16:22:21 -05:00

security levels

…

shuttle

…

surgery

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

2015-03-26 02:31:06 +01:00

telesci

Effect pooling

2015-03-24 11:44:49 -07:00