Miauw 9e40407906 Merge branch 'master' of https://github.com/tgstation/-tg-station into condimentpacks ...

Conflicts:
	code/modules/reagents/reagent_containers/food/condiment.dm

2013-12-22 15:19:23 +01:00

..

admin

Tons of typo fixes and renames Centcomm to Centcom. Manual merge of #1950.

2013-12-13 21:14:23 +00:00

assembly

Some fixes for Linda, now the Move() proc of objects that block air is different. Example below.

2013-12-19 22:13:21 -03:00

awaymissions

Fixes a potential issue with lootspawners who have lootcounts longer than their loot list and lootdoubles not enabled.

2013-12-04 18:10:43 -07:00

client

Added anonus' rainbow ghost icons.

2013-12-05 18:34:24 +00:00

clothing

Merge pull request #2094 from RobRichards1997/19/12/2013-Sec-see-Sec-Sprites

2013-12-21 15:24:14 -08:00

detectivework

Removes several more unused variables

2013-11-24 05:11:15 +08:00

events

Merge pull request #2053 from Aranclanos/NOBODYLIKESNINJAS

2013-12-18 10:10:26 -08:00

flufftext

Modification of .gitignore to include admins.txt. Hopefully.`

2013-10-30 17:56:00 -07:00

food

Renamed psilocybin to mushroom hallucinogen, removed psilocybin/mushroom hallucinogen from huge mushroom slice, removed space drugs from reishi, added anti-toxin to reishi and lowered the amount of sleep toxin in reishi.

2013-11-28 00:15:56 -06:00

hydroponics

Fixes soil being wrenchable

2013-12-19 00:08:48 +04:00

library

Suggestion implimentation patch!

2013-12-12 00:24:51 -05:00

mining

* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.

2013-12-20 22:09:06 +00:00

mob

Merge pull request #2093 from Giacom/small_fixes_and_tweaks

2013-12-21 15:12:01 -08:00

nano

Fixes Issue #1867

2013-11-30 16:42:08 -05:00

paperwork

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

2013-12-18 18:27:22 +00:00

power

Merge pull request #1989 from Perakp/dnaDecon

2013-12-17 20:44:16 -08:00

projectiles

Merge pull request #2054 from Cheridan/Nuke

2013-12-19 13:37:32 -08:00

reagents

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

2013-12-22 15:19:23 +01:00

recycling

This wasnt supposed to be deleted

2013-12-19 00:46:10 +04:00

research

Merge pull request #2062 from Aranclanos/RnDConsole

2013-12-21 13:38:32 -08:00

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

2013-11-30 14:33:02 -05:00

security levels

Communications Console Update

2013-10-15 22:42:20 -06:00

shuttle

* Added ore boxes to the gulag, and added a conveyor belt which goes outside and has a loading machine, which will take the ore from the orebox.

2013-12-20 22:09:06 +00:00

surgery

Completed the transition to a new proc

2013-12-17 22:56:04 +04:00

telesci

* Fixes certain objects not using 3D sounds.

2013-11-21 23:50:53 +00:00