Aranclanos a4a13681f3 Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa ...

Conflicts:
	code/game/gamemodes/changeling/changeling_powers.dm

2013-12-05 07:01:09 -03:00

..

admin

Reverting a change I never did?

2013-12-01 23:30:22 +01:00

assembly

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

2013-10-27 19:37:38 -05:00

awaymissions

Nuke Op Population Scaling and Content Update

2013-11-03 16:41:57 -06:00

client

- Fixes lastadminrank logging, needed for ban log authentication.

2013-11-17 04:40:58 +01:00

clothing

Forgot to add the flask to the tunic

2013-11-24 17:34:05 +00:00

detectivework

Removes several more unused variables

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

events

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

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

Merge pull request #1922 from TZK13/Mushroom-Adjustments

2013-12-02 12:41:34 -08:00

library

- Adds the framework that allows soft-deleting books from the library.

2013-11-04 23:46:46 +01:00

mining

Re-beautified mining

2013-11-10 00:09:57 -05:00

mob

Merge branch 'master' of https://github.com/Razharas/-tg-station into ImGonnaStingYa

2013-12-05 07:01:09 -03:00

nano

Fixes Issue #1867

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

paperwork

Reformatted the way objects and items structure their description text, added the little object "icon" everyone seems to be using.

2013-11-16 22:15:50 +01:00

power

Merge pull request #1903 from YotaXP/Fix-Borg-APC-Access

2013-11-29 15:09:13 -08:00

projectiles

Sparks won't be spawned in a null location if the holodeck changes the target before their time to spawn. This will stop some runtimes.

2013-11-26 10:25:43 -03:00

reagents

Merge pull request #1922 from TZK13/Mushroom-Adjustments

2013-12-02 12:41:34 -08:00

recycling

* Modified the disposals room to have a crusher and a stacking machine. It will allow the crew to recycle trash items.

2013-11-24 17:54:58 +00:00

research

Makes the clusterbang launcher unlimited use. Reduces the number of projectiles per reload by half, doubles reload energy cost, and raises the cooldown from 60 to 90. Changes the name to something more humorous from SOP-6 to SOB-3. Raised to mineral cost to that more like the HONK blast.

2013-11-26 18:25:38 -07:00

scripting

…

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

Fixes bible spam

2013-11-24 15:24:55 +00:00

telesci

* Fixes certain objects not using 3D sounds.

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