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

Conflicts:
	code/datums/mind.dm
	code/game/gamemodes/antag_spawner.dm
	code/game/gamemodes/objective.dm
	data/mode.txt

2015-12-28 12:40:51 -08:00

..

admin

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

2015-12-28 12:40:51 -08:00

assembly

fixes flashes being stupid on emp.

2015-12-24 06:25:36 -08:00

awaymissions

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

2015-12-28 12:40:51 -08:00

client

Merge pull request #13936 from Shadowlight213/AdminAIToggle2

2015-12-27 22:01:01 -03:00

clothing

Merge pull request #13818 from LanCartwright/nukeopsrenovation

2015-12-20 21:59:17 -03:00

crafting

fixes honkworthy oversight

2015-12-12 15:38:40 -05:00

detectivework

Fixes changing transfer amounts not working for shaker, drinking glass and condiment bottle. And remove it from damp rag and shot glass, since they only have one possible tranfer amount. Fixes the shaker's name being capitalized for no reason (and without an \improper ).

2015-10-22 18:40:32 +02:00

emoji

…

events

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

2015-12-28 12:40:51 -08:00

flufftext

Changed various instances of range() and orange() to ultra_range().

2015-10-19 20:04:14 +01:00

food&drinks

Fixes the loop for real this time

2015-12-24 06:15:58 -06:00

games

Begin rewrite of NanoUI frontend.

2015-12-15 13:07:11 -06:00

holiday

buffs out a few of the bigger holidays celibration periods

2015-07-24 13:21:02 -04:00

holodeck

Merge pull request #13996 from AnturK/fixfixfix

2015-12-26 10:23:21 -03:00

html_interface

Prefix everything with 'nanoui' to avoid conflicts

2015-12-15 13:12:33 -06:00

hydroponics

Removes NOSHIELD

2015-12-20 15:21:58 -06:00

json

Revert "Make JSON.stringify encode numbers properly"

2015-12-27 15:45:48 -06:00

library

Fixes lib machines spamming refreshes when printing

2015-12-23 14:20:42 -08:00

lighting

forgot a line

2015-12-16 03:29:24 -08:00

mining

Lavaland Turfs

2015-12-23 06:33:22 -06:00

mob

Merge pull request #14084 from MrStonedOne/GOOOOOF

2015-12-28 14:35:34 -03:00

nano

Fix NanoUI and \improper for real

2015-12-28 00:18:43 -06:00

ninja

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

2015-12-28 12:40:51 -08:00

paperwork

Line ending apocalypse

2015-12-17 14:12:37 +13:00

power

Merge pull request #13984 from AndrewJacksonThe2nd/teslameme

2015-12-25 14:09:36 -03:00

procedural mapping

Adds two CA mapGenerators

2015-12-17 11:45:27 +01:00

projectiles

changes the desc to be more referencing

2015-12-24 23:39:41 -05:00

reagents

Merge pull request #14057 from markressler/test

2015-12-27 05:05:43 -03:00

recycling

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

research

Adds xeno golems to admin log

2015-12-24 00:45:00 -03:00

security levels

Renames IsAGhost to IsAdminGhost.

2015-12-06 20:21:43 -08:00

shuttle

Line ending apocalypse

2015-12-17 14:12:37 +13:00

space transition

Shaves off 1568 iterations

2015-11-13 10:57:42 +03:00

surgery

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

2015-12-17 20:12:32 -05:00

telesci

Adds in-hand sprites for tracking beacon, pizza box and carp plushie.

2015-11-29 16:43:52 +02:00

tooltip

Updates ToolTips system to V1.1, by Wirewraith

2015-10-22 21:40:16 +01:00