CitadelStationBot cb9c2b6124 [MIRROR] battery rig fix (#5282) ...

* battery rig fix (#35254)

* fix

* oops

* Auto stash before rebase of "tgstation/master"

* remove double notification

* battery rig fix

2018-02-04 23:17:54 -06:00

..

admin

modules

2018-01-31 06:56:28 -06:00

antagonists

cult lol xd

2018-01-31 08:07:22 -06:00

assembly

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

atmospherics

modules

2018-01-31 06:56:28 -06:00

awaymissions

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

cargo

sync with master

2018-01-31 07:02:55 -06:00

chatter

…

client

[MIRROR] Raises the cid check disconnect time out (#5272)

2018-02-04 23:05:22 -06:00

clothing

Removes Fun

2018-02-01 21:39:30 -06:00

crafting

modules

2018-01-31 06:56:28 -06:00

detectivework

…

emoji

…

error_handler

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

events

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

fields

…

flufftext

[Ready] Rebalances Chameleon Kits for lowpop (#34972)

2018-01-27 23:21:06 -06:00

food_and_drinks

[MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)

2018-02-04 22:07:17 -06:00

games

…

goonchat

Darkens chatbox a lil to go along with the UI's dark theme (#5250)

2018-02-04 22:27:38 -06:00

holiday

[MIRROR] Future proofs Easter calculations (#5247)

2018-02-04 22:22:56 -06:00

holodeck

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

html_interface

…

hydroponics

[MIRROR] Tomatoes and other foods found to have girl parts; removed from vegetable piles (#5226)

2018-02-04 22:07:17 -06:00

integrated_electronics

modules

2018-01-31 06:56:28 -06:00

jobs

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

keybindings

modules

2018-01-31 06:56:28 -06:00

language

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

library

modules

2018-01-31 06:56:28 -06:00

lighting

Merge pull request #34982 from vuonojenmustaturska/lightingdeopt

2018-01-28 10:34:04 -06:00

mapping

modules

2018-01-31 06:56:28 -06:00

mentor

…

mining

[MIRROR] Fixes spelling error in explorer_gear.dm (#5239)

2018-02-04 22:19:36 -06:00

mob

[MIRROR] Fixes a couple of typos and ports one New to Initialize (#5233)

2018-02-04 22:11:07 -06:00

modular_computers

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

ninja

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

NTNet

…

orbit

…

paperwork

modules

2018-01-31 06:56:28 -06:00

power

[MIRROR] battery rig fix (#5282)

2018-02-04 23:17:54 -06:00

procedural_mapping

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

projectiles

modules

2018-01-31 06:56:28 -06:00

reagents

modules

2018-01-31 06:56:28 -06:00

recycling

[MIRROR] Adds sprites for conveyor belt constructs (#5276)

2018-02-04 23:12:47 -06:00

research

[MIRROR] Fixes mecha grav catapult not being available in techwebs (#5281)

2018-02-04 23:17:16 -06:00

ruins

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

security_levels

[READY] Adds night shifts (#4281)

2018-02-04 21:28:41 -06:00

server_tools

…

shuttle

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

spells

modules

2018-01-31 06:56:28 -06:00

station_goals

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

stock_market

…

surgery

modules

2018-01-31 06:56:28 -06:00

telesci

…

tgui

Datum var cleanup (#34314)

2018-01-21 21:39:46 -06:00

tooltip

…

unit_tests

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00

uplink

modules

2018-01-31 06:56:28 -06:00

vehicles

…

vore

I swear every player on this server is a complete idiot

2018-02-04 08:16:54 -06:00

VR

…

zombie

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00