MrStonedOne 5d86ed49f6 Merge conflic fix

2016-01-03 14:51:14 -08:00

..

admin

Merge conflic fix

2016-01-03 14:51:14 -08:00

assembly

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

awaymissions

Merge pull request #14286 from KorPhaeron/cheribucks_secured

2016-01-03 02:58:22 -03:00

client

Merge conflic fix

2016-01-03 14:51:14 -08:00

clothing

Merge pull request #14151 from SouDescolado/patch-1

2015-12-30 18:12:09 -03:00

crafting

Lizard hats

2015-12-29 13:01:13 -06: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

Moves spawn to weather

2016-01-02 23:21:46 -06:00

flufftext

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

food&drinks

Merge pull request #14219 from KorPhaeron/bottle

2016-01-02 16:14:00 -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

Fixed 'in' precedence errors.

2015-12-29 17:16:09 -07:00

hydroponics

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

json

Revert "Make JSON.stringify encode numbers properly"

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

library

Sneaks in a new book sprite that's totally white colored, no blue dot.

2015-12-29 16:01:14 -05:00

lighting

Entirely area based

2015-12-24 03:50:27 -06:00

mining

Merge conflic fix

2016-01-03 14:51:14 -08:00

mob

Merge conflic fix

2016-01-03 14:51:14 -08:00

ninja

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

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

paperwork

Detectives camera is now a subtype. Changed maps to have the subtype instead of the modified regular camera.

2016-01-03 07:36:12 -05:00

power

Merge conflic fix

2016-01-03 14:51:14 -08:00

procedural mapping

Adds two CA mapGenerators

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

projectiles

Merge conflic fix

2016-01-03 14:51:14 -08:00

reagents

Merge conflic fix

2016-01-03 14:51:14 -08:00

recycling

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

research

Matter bin description grammar fix

2015-12-31 22:52:03 -06:00

ruins

Random Ruins

2015-12-19 06:55:50 -06:00

security levels

Renames IsAGhost to IsAdminGhost.

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

shuttle

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

space transition

Shaves off 1568 iterations

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

surgery

Merge pull request #14159 from somnium13/fix-in-prec

2015-12-30 22:38:13 -03:00

telesci

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

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

tgui

Add window locking system/sanity checks

2016-01-03 10:43:03 -06:00

tooltip

Updates ToolTips system to V1.1, by Wirewraith

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

vehicles

Formalises Path Compatibility

2015-12-28 22:20:33 +00:00