CitadelStationBot 6b0e597553 [MIRROR] Fix circuit printer printing finished TEG machinery (#7294) ...

* Merge pull request #38844 from AutomaticFrenzy/patch/circuits

Fix circuit printer printing finished TEG machinery

* Fix circuit printer printing finished TEG machinery

2018-07-02 03:23:49 -07:00

..

admin

Merge pull request #7195 from Citadel-Station-13/upstream-merge-38574

2018-06-24 18:20:17 -05:00

antagonists

Merge pull request #7265 from Citadel-Station-13/upstream-merge-38745

2018-07-01 09:32:39 -05:00

assembly

[MIRROR] fixes anomaly cores being flamable (#7207)

2018-06-20 22:40:54 -07:00

atmospherics

Merge pull request #7277 from Citadel-Station-13/upstream-merge-38656

2018-07-01 09:36:57 -05:00

awaymissions

Adds dance machine, drink dispensers, flavor to beach bum ruin (#38533)

2018-06-18 09:37:48 -05:00

cargo

[READY] better contraband crates (#38321)

2018-06-21 18:52:15 -05:00

chatter

…

client

Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd

2018-06-25 09:18:27 -05:00

clothing

Adds missing armor to accessories (#38800)

2018-07-01 05:41:32 -05:00

crafting

…

detectivework

…

emoji

…

error_handler

…

events

Merge pull request #38683 from AnturK/anomalyfix

2018-06-25 09:18:40 -05:00

fields

…

flufftext

…

food_and_drinks

Fixes closed soda cans transferring (#38668)

2018-06-24 05:17:00 -05:00

games

…

goonchat

Merge pull request #38672 from AutomaticFrenzy/patch/goonchat-motd

2018-06-25 09:18:27 -05:00

holiday

…

holodeck

[MIRROR] Turf grammar omnibus (#7104)

2018-06-13 19:31:29 -07:00

hydroponics

Merge pull request #7034 from Trilbyspaceclone/patch-1

2018-06-26 14:02:39 -04:00

integrated_electronics

Adds a colour picker component for circuits (#38804)

2018-07-01 05:40:43 -05:00

jobs

Fixed cyborgs not getting their names at round start

2018-06-24 13:55:03 -05:00

keybindings

…

language

…

library

Merge pull request #38360 from ShizCalev/key-cleanup

2018-06-11 22:29:27 -05:00

lighting

Merge pull request #38605 from vuonojenmustaturska/tinylight

2018-06-20 09:25:18 -05:00

mapping

Global component signals

2018-06-19 17:18:34 -05:00

mining

Merge pull request #7217 from Citadel-Station-13/upstream-merge-38570

2018-06-24 15:16:35 -05:00

mob

Merge pull request #7264 from Citadel-Station-13/upstream-merge-38646

2018-07-01 09:32:08 -05:00

modular_computers

…

ninja

…

NTNet

…

orbit

…

paperwork

[MIRROR] You can see what other people eat or drink (#7101)

2018-06-13 20:31:38 -07:00

power

Merge pull request #7283 from Citadel-Station-13/upstream-merge-38796

2018-07-01 09:39:43 -05:00

procedural_mapping

…

projectiles

Merge pull request #38708 from AutomaticFrenzy/patch/energy-gun

2018-06-25 14:12:31 -05:00

reagents

Merge pull request #7267 from Citadel-Station-13/upstream-merge-38728

2018-07-01 09:33:36 -05:00

recycling

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

research

[MIRROR] Fix circuit printer printing finished TEG machinery (#7294)

2018-07-02 03:23:49 -07:00

ruins

Merge pull request #38496 from AutomaticFrenzy/patch/mirage-borders

2018-06-16 15:50:27 -05:00

security_levels

…

shuttle

Merge pull request #7282 from Citadel-Station-13/upstream-merge-38779

2018-07-01 09:39:28 -05:00

spells

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

station_goals

Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128

2018-06-09 05:53:25 +00:00

surgery

Merge pull request #38576 from AnturK/runtimeL

2018-06-19 09:19:15 -05:00

tgs

…

tgui

…

tooltip

…

unit_tests

…

uplink

Fixes and adds blast cannons to traitor science uplink items (#38093)

2018-06-21 18:38:46 -05:00

vehicles

…

vending

Merge pull request #38580 from Hyacinth-OR/pinkscarf

2018-06-19 09:49:28 -05:00

VR

…

zombie

…