Incoming 2fe5f2bb2c Fixes the dumbest conflict I have ever seen

2016-04-29 00:19:26 -04:00

..

admin

View vars will now tell you if something's been previously var edited

2016-04-28 19:38:21 -04:00

assembly

…

atmospherics

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

2016-04-24 21:22:37 +02:00

awaymissions

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

2016-04-26 21:49:51 +02:00

cargo

Die commas die

2016-04-28 21:24:30 +01:00

client

Merge pull request #16914 from MrStonedOne/clientversionconfig

2016-04-27 19:29:11 -04:00

clothing

adds skull helmet.

2016-04-26 13:35:00 -07:00

crafting

Merge pull request #17108 from Bawhoppen/sandbagsz

2016-04-27 20:23:21 -04:00

detectivework

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

emoji

…

events

processor overload requires 20 players

2016-04-26 01:05:15 -06:00

flufftext

…

food&drinks

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

games

First commit of this big PR

2016-04-24 20:26:24 +02:00

holiday

Added animal overlay to drone filters (#17009)

2016-04-24 16:51:16 +01:00

holodeck

First commit of this big PR

2016-04-24 20:26:24 +02:00

html_interface

…

hydroponics

Merge pull request #17157 from Core0verload/botany_nerf_II

2016-04-28 18:21:09 +03:00

jobs

…

library

First commit of this big PR

2016-04-24 20:26:24 +02:00

lighting

…

mining

Adds survival pod windows to the code

2016-04-28 10:57:39 -06:00

mob

Fixes the dumbest conflict I have ever seen

2016-04-29 00:19:26 -04:00

ninja

Second commits.

2016-04-24 20:37:00 +02:00

paperwork

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

2016-04-26 21:49:51 +02:00

power

View vars will now tell you if something's been previously var edited

2016-04-28 19:38:21 -04:00

procedural mapping

…

projectiles

View vars will now tell you if something's been previously var edited

2016-04-28 19:38:21 -04:00

reagents

* Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.

2016-04-28 00:13:15 +02:00

recycling

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

research

* Fixes the holosign_creator's sign counter not going back up when one of its holosign is destroyed.

2016-04-28 00:13:15 +02:00

ruins

Removes ash walker underwear

2016-04-21 03:10:50 -05:00

security levels

Fixes typos and errors I made.

2016-04-25 22:29:17 +02:00

shuttle

Increases cargo shuttle time back to two minutes

2016-04-28 20:11:52 +01:00

space transition

…

spells

Code review

2016-04-24 16:29:17 +01:00

stock_market

…

surgery

…

telesci

Second commits.

2016-04-24 20:37:00 +02:00

tgui

…

tooltip

…

uplink

…

vehicles

Same things but with structures now.

2016-04-24 20:38:33 +02:00