Lin f2e0e5c247 Merge pull request #12814 from Citadel-Station-13/silicons-patch-35 ...

fixes gateways switching to active power use when thy should not be using power at all

2020-07-19 11:10:51 -05:00

..

admin

Merge pull request #12229 from Arturlang/TGUI-3.0

2020-07-16 17:28:42 -07:00

antagonists

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

arousal

…

assembly

…

asset_cache

…

atmospherics

Merge branch 'master' into TGUI-3.0

2020-07-16 15:59:37 +03:00

awaymissions

Merge pull request #12814 from Citadel-Station-13/silicons-patch-35

2020-07-19 11:10:51 -05:00

bsql

…

buildmode

…

cargo

…

chatter

…

client

Merge pull request #12229 from Arturlang/TGUI-3.0

2020-07-16 17:28:42 -07:00

clothing

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

detectivework

…

economy

…

emoji

…

error_handler

…

events

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

fields

…

flufftext

…

food_and_drinks

Merge pull request #12679 from silicons/unarmed_parry

2020-07-18 17:02:02 -05:00

games

…

goonchat

…

holiday

…

holodeck

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

hydroponics

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

instruments

…

integrated_electronics

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

jobs

give me my snails

2020-07-14 20:26:31 +01:00

keybindings

quirky uh oh

2020-07-15 14:47:59 -07:00

language

…

library

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

lighting

https://github.com/tgstation/tgstation/pull/52255

2020-07-16 20:05:37 +08:00

mapping

…

mining

Merge pull request #12679 from silicons/unarmed_parry

2020-07-18 17:02:02 -05:00

mob

Merge pull request #12679 from silicons/unarmed_parry

2020-07-18 17:02:02 -05:00

modular_computers

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

movespeed

https://github.com/tgstation/tgstation/pull/52255

2020-07-16 20:05:37 +08:00

newscaster

…

ninja

…

NTNet

…

paperwork

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

photography

…

pool

…

power

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

procedural_mapping

…

projectiles

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

reagents

Merge pull request #12679 from silicons/unarmed_parry

2020-07-18 17:02:02 -05:00

recycling

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

research

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

ruins

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

security_levels

…

shuttle

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

spells

Merge remote-tracking branch 'citadel/master' into unarmed_parry

2020-07-16 19:39:46 -07:00

station_goals

…

surgery

…

tgs

…

tgui

Merge pull request #12780 from BlackMajor/borgo

2020-07-17 17:08:23 -07:00

tooltip

…

unit_tests

…

uplink

Merge pull request #12762 from zeroisthebiggay/a

2020-07-17 17:11:02 -07:00

vehicles

…

vending

Merge pull request #12776 from timothyteakettle/snail-shells

2020-07-17 17:07:46 -07:00

vore

…

VR

…

zombie

…