kevinz000 8c71bbe36b Update ark_of_the_clockwork_justicar.dm

2018-06-26 17:44:11 -07:00

..

admin

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

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

antagonists

Update ark_of_the_clockwork_justicar.dm

2018-06-26 17:44:11 -07:00

assembly

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

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

atmospherics

Merge pull request #7224 from Citadel-Station-13/upstream-merge-38650

2018-06-24 16:40:09 -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 #38692 from Jordie0608/blacklistedmakesitsoundlikethebuilddidsomethingbadwhichitdidbadbuildnaughtybuild

2018-06-24 09:16:39 -05:00

clothing

Merge pull request #38580 from Hyacinth-OR/pinkscarf

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

crafting

…

detectivework

…

emoji

…

error_handler

…

events

[MIRROR] Transit space refactor (#7130)

2018-06-18 11:51:02 -07: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 #38684 from AutomaticFrenzy/patch/goonchat-logs

2018-06-24 09:44:31 -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

[READY] Helps data disks stop being unemployed (#38319)

2018-06-19 09:23:33 -05:00

jobs

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

2018-06-09 05:53:25 +00: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 branch 'master' into upstream-merge-38661

2018-06-24 18:13:53 -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

Cleans up supermatter related varedits (#38540)

2018-06-18 09:38:16 -05:00

procedural_mapping

…

projectiles

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

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

reagents

[READY] better contraband crates (#38321)

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

recycling

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

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

research

Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360

2018-06-12 07:41:10 -05:00

ruins

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

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

security_levels

…

shuttle

Makes a thing use its macro (#38556)

2018-06-18 19:16:43 -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

…