Archie cd18b82983 Merge remote-tracking branch 'upstream/master' into nexties2

2021-01-08 17:50:11 -03:00

..

admin

Admeme rank formatting, maybe? Byond 513 issue?

2021-01-08 17:05:17 -03:00

antagonists

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

assembly

Merge branch, update to current

2021-01-08 07:26:35 -03:00

atmospherics

Merge branch, update to current

2021-01-08 07:26:35 -03:00

awaymissions

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

bsql

…

buildmode

…

cargo

Merge branch, update to current

2021-01-08 07:26:35 -03:00

chatter

…

client

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

clothing

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

crafting

…

detectivework

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

emoji

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

error_handler

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

events

…

fields

…

flufftext

…

food_and_drinks

Merge branch, update to current

2021-01-08 07:26:35 -03:00

games

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

goonchat

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

holiday

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

holodeck

Merge pull request #10238 from Ghommie/Ghommie-cit478

2021-01-06 15:39:13 -03:00

hydroponics

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

integrated_electronics

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

jobs

Ports "Added TRAIT_DISK_VERIFIER, refactors how fake disk checks work slightly

2021-01-04 02:36:28 -03:00

keybindings

Merge pull request #10356 from deathride58/sprintprefs

2021-01-04 01:51:21 -03:00

language

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

library

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

lighting

…

mapping

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

mining

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

mob

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

modular_computers

Fix merge conflicts

2021-01-05 03:41:08 -03:00

ninja

…

NTNet

Merge pull request #10575 from Arturlang/TGUIs_Nexties

2021-01-04 19:47:54 -03:00

oracle_ui

…

paperwork

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

photography

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

pool

…

power

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

procedural_mapping

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

projectiles

Merge pull request #10056 from Ghommie/Ghommie-cit430

2021-01-05 16:51:22 -03:00

reagents

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

recycling

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

research

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

ruins

Merge branch, update to current

2021-01-08 07:26:35 -03:00

security_levels

…

shuttle

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

spells

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

station_goals

Merge pull request #10575 from Arturlang/TGUIs_Nexties

2021-01-04 19:47:54 -03:00

surgery

Revert "Revert "Merge pull request #838 from ArchieBeepBoop/test1""

2021-01-08 17:03:24 -03:00

tgs

…

tgui

Merge pull request #10575 from Arturlang/TGUIs_Nexties

2021-01-04 19:47:54 -03:00

tooltip

…

unit_tests

…

uplink

Merge remote-tracking branch 'upstream/master' into nexties2

2021-01-08 15:20:47 -03:00

vehicles

Merge pull request #9983 from Ghommie/Ghommie-cit408

2021-01-05 01:34:16 -03:00

vending

requiem

2021-01-03 20:10:09 -05:00

VR

…

zombie

…