Razharas 4ddf6015d8 Merge pull request #17032 from Robustin/ThisEndsNow ...

Ends the confusing inconsistency of power cable and CONDUCT weapons

2016-04-29 15:34:25 +03:00

..

admin

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

2016-04-26 21:49:51 +02: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 pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

cargo

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

client

Merge pull request #16978 from nullbear/tablecraft-tweak

2016-04-29 15:26:14 +03:00

clothing

Merge pull request #17172 from Robustin/travelmode

2016-04-29 00:17:38 -05:00

crafting

Merge pull request #16978 from nullbear/tablecraft-tweak

2016-04-29 15:26:14 +03: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

Merge pull request #16978 from nullbear/tablecraft-tweak

2016-04-29 15:26:14 +03: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

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05:00

mob

Merge pull request #16778 from Robustin/commitcommoncult

2016-04-29 15:10:16 +03:00

ninja

Second commits.

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

paperwork

Merge pull request #16953 from Core0verload/onehalf

2016-04-29 15:23:50 +03:00

power

Merge pull request #17032 from Robustin/ThisEndsNow

2016-04-29 15:34:25 +03:00

procedural mapping

…

projectiles

Merge pull request #17115 from KorPhaeron/gun_fix

2016-04-27 02:52:22 -05: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

Merge pull request #16953 from Core0verload/onehalf

2016-04-29 15:23:50 +03:00

security levels

Fixes typos and errors I made.

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

shuttle

Merge pull request #16934 from Core0verload/cargo

2016-04-28 23:22:17 -05: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