Velcroboy ef89695780 Hive five (#435) ...

* The Hive Rebase

* Remove un-merged maps from files

---------

Co-authored-by: Jeff <>

2023-11-11 10:37:11 -06:00

..

Accents

Update word_replacements.yml (#273)

2023-10-23 22:33:03 -05:00

Access

…

Actions

…

AlertLevels

Adjusted shuttle times (#275)

2023-10-23 23:09:31 -05:00

Alerts

…

Atmospherics

…

Body

…

Catalog

Added Head ID cards to lockers (#434)

2023-11-10 19:25:32 -06:00

Chemistry

…

Damage

…

Datasets

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

Decals

…

DeltaV

Laika is Smart Doggo (#430)

2023-11-09 13:01:30 -06:00

Device

…

DeviceLinking

…

Entities

Removes Security Gear from Salvage Corpses (#431)

2023-11-09 19:25:36 -06:00

EntityLists/Tools

…

Flavors

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

GameRules

Set max head revs to 1 (#413)

2023-11-10 16:08:25 +01:00

Guidebook

Reverse Engineering guidebook + fixes (#408)

2023-11-07 13:31:01 -06:00

Hydroponics

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

InventoryTemplates

…

LootTables

…

MachineParts

…

Magic

…

Maps

Hive five (#435)

2023-11-11 10:37:11 -06:00

NPCs

…

Nyanotrasen

Reskin Glimmer Machines (Prober and Drain) (#421)

2023-11-08 22:44:38 +00:00

Objectives

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

Palettes

Rename Science and Cargo ID (#211)

2023-10-22 01:24:48 +02:00

Parallaxes

…

Polymorphs

…

Procedural

…

Reagents

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

Recipes

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

Research

Add the Salvage Expedition board to research (#411)

2023-11-07 07:36:49 -06:00

Roles

Add time requirement for Technical Assistant (#383)

2023-11-02 11:15:06 -05:00

Shaders

…

SimpleStation14

Benches & Sofas (#167)

2023-10-22 18:30:40 -05:00

SoundCollections

Fix custom round end sounds (#429)

2023-11-09 04:22:23 +00:00

Species

Revert "Enable skeletons temporarily for Halloween (#21356)"

2023-10-31 19:15:17 +01:00

Stacks

…

StatusEffects

…

StatusIcon

…

Store

…

Tiles

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

Traits

Make stuttering less common with the trait (#21207)

2023-10-24 18:04:00 +02:00

Voice

…

Wires

…

World

…

XenoArch

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

ai_factions.yml

…

audio.yml

…

bar_signs.yml

…

edge_spreaders.yml

…

explosion.yml

…

fonts.yml

…

game_presets.yml

Disable sandbox and deathmatch (#221)

2023-10-21 23:21:22 +00:00

holidays.yml

…

hud.yml

…

lobbyscreens.yml

…

name_identifier_groups.yml

…

ore.yml

…

radio_channels.yml

…

round_announcements.yml

…

secret_weights.yml

Update secret_weights.yml (#314)

2023-10-25 18:38:06 -05:00

silicon-laws.yml

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

status_effects.yml

…

tags.yml

Revert "Merge master up to 31/10 (#365)" (#375)

2023-11-01 09:11:41 +01:00

themes.yml

…

threats.yml

…

tool_qualities.yml

…

typing_indicator.yml

…

weather.yml

…