Archie 50b1f84a8b Sleeping Carp Hallucination + Fixes meteor hallucination

2021-01-12 20:57:37 -03:00

..

admin

Merge pull request #13909 from silicons/twitch_plays

2021-01-10 14:03:51 -03:00

antagonists

no longer shitcode

2021-01-12 00:59:24 -06:00

assembly

Merge branch, update to current

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

atmospherics

Merge pull request #10900 from Putnam3145/port-atmos-fix

2021-01-10 04:21:42 -03:00

awaymissions

Merge pull request #9836 from Ghommie/Ghommie-cit364

2021-01-10 04:21:09 -03:00

bsql

…

buildmode

…

cargo

Merge branch, update to current

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

chatter

…

client

no longer shitcode

2021-01-12 00:59:24 -06:00

clothing

Nukes bluespace thread

2021-01-09 19:40:17 -03:00

crafting

Fix Objectives

2020-12-04 23:10:36 -03:00

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

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

2020-12-18 01:20:57 -03:00

fields

…

flufftext

Sleeping Carp Hallucination + Fixes meteor hallucination

2021-01-12 20:57:37 -03:00

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 #9836 from Ghommie/Ghommie-cit364

2021-01-10 04:21:09 -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

Merge pull request #13909 from silicons/twitch_plays

2021-01-10 14:03:51 -03:00

modular_computers

no longer shitcode

2021-01-12 00:59:24 -06:00

ninja

Ports reagents id removal and typepath usage.

2020-12-09 14:32:36 -03:00

NTNet

Merge pull request #10575 from Arturlang/TGUIs_Nexties

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

oracle_ui

Merge pull request #9556 from Linzolle/paper-fix

2020-12-07 22:57:42 -03:00

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

Fixing personal code

2021-01-11 20:46:10 -08:00

reagents

Fixing personal code

2021-01-11 20:46:10 -08: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 #13909 from silicons/twitch_plays

2021-01-10 14:03:51 -03:00

vending

requiem

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

VR

…

zombie

…