Incoming 689aecc336 I forgot how children work guys ...

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

2013-12-19 15:07:59 -05:00

..

admin

Feature: Adds summon guns and summon magic as fun secrets for badmins

2013-12-16 23:29:58 -05:00

assembly

Fixes #633. Problem was a null.loc runtime from the chair being disassembled.

2013-10-27 19:37:38 -05: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 branch 'master' of https://github.com/tgstation/-tg-station into tinypricknomore_andgunstuff

2013-12-18 18:27:22 +00: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

Completed the transition to a new proc

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

library

Suggestion implimentation patch!

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

mining

Making astroturf and sandstone now automatically stacks all the produced items.

2013-12-04 18:44:49 -05:00

mob

I forgot how children work guys

2013-12-19 15:07:59 -05: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

I forgot how children work guys

2013-12-19 15:07:59 -05:00

reagents

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

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

recycling

Completed the transition to a new proc

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

research

Merge pull request #1989 from Perakp/dnaDecon

2013-12-17 20:44:16 -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

Updated the labor camp

2013-11-05 14:13:21 -05: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