Razharas 80b592d0b3 Resolving conflicts ...

God hates git
And so do i

2014-01-03 21:12:14 +04:00

..

admin

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

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

assembly

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06: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 #2214 from Aranclanos/IntiFetishNotInMyGame

2014-01-03 04:19:29 -08:00

detectivework

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

events

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06: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

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

library

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

mining

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

mob

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

2014-01-02 10:00:58 -06:00

nano

Fixes Issue #1867

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

paperwork

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

power

Resolving conflicts

2014-01-03 21:12:14 +04:00

projectiles

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

2014-01-02 10:00:58 -06:00

reagents

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

recycling

Merge pull request #2192 from Cheridan/iDidThisByHand

2014-01-02 10:31:46 -08:00

research

Fixed some issues

2014-01-02 09:27:51 +04:00

scripting

NTSL, parrots, and ID consoles hate apostrophes less.

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

security levels

…

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

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

telesci

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00