Firecage 0cb6814c18 Merge conflict fix

2016-01-17 19:15:30 +02:00

..

admin

Merge conflict fix

2016-01-17 19:15:30 +02:00

assembly

Merge conflict fix

2016-01-17 19:15:30 +02:00

awaymissions

Merge conflict fix

2016-01-17 19:15:30 +02:00

client

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

clothing

Merge conflict fix

2016-01-17 19:15:30 +02:00

crafting

Lizard hats

2015-12-29 13:01:13 -06:00

detectivework

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

emoji

Renames game_options.txt OOC_EMOJIS to EMOJIS

2014-12-17 12:48:41 -05:00

events

Merge conflict fix

2016-01-17 19:15:30 +02:00

flufftext

Repath canisters; make label code create a new can; use es6 function shorthand

2016-01-16 12:13:51 -06:00

food&drinks

Merge conflict fix

2016-01-17 19:15:30 +02:00

games

Merge conflict fix

2016-01-17 19:15:30 +02:00

holiday

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

holodeck

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

html_interface

Fixed 'in' precedence errors.

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

hydroponics

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02: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 conflict fix

2016-01-17 19:15:30 +02:00

mob

Merge conflict fix

2016-01-17 19:15:30 +02:00

ninja

Merge conflict fix

2016-01-17 19:15:30 +02:00

paperwork

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

power

Merge conflict fix

2016-01-17 19:15:30 +02:00

procedural mapping

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

2016-01-13 20:07:21 -06:00

projectiles

Merge conflict fix

2016-01-17 19:15:30 +02:00

reagents

Merge conflict fix

2016-01-17 19:15:30 +02:00

recycling

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

research

Exploit/Runtime protection

2016-01-11 10:18:00 -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

Merge conflict fix

2016-01-17 19:15:30 +02:00

space transition

Shaves off 1568 iterations

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

surgery

Changes relatives paths into absolute paths and makes some if()'s better

2016-01-17 01:36:56 +02:00

telesci

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

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

tgui

Inline style/theme once again; fix titlebar color

2016-01-16 12:13:39 -06:00

tooltip

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00

vehicles

Formalises Path Compatibility

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