Nim d8e360367e Well and new bed, aristocratic cloak (#1228) ...

* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>

2025-05-06 09:47:46 +03:00

..

_CP14

Well and new bed, aristocratic cloak (#1228)

2025-05-06 09:47:46 +03:00

Accents

fix (#896)

2025-02-14 11:51:10 +03:00

Access

Genpop Closets & IDs (#36392)

2025-04-24 16:32:11 +02:00

Actions

Action charges refactor (#33993)

2025-04-18 13:45:48 +10:00

AlertLevels

…

Alerts

double hp and mana alerts (#749)

2025-01-12 23:05:19 +03:00

Anomaly

…

Atmospherics

Add new freezer atmos devices and fix freezer fixgridatmos marker (#34991)

2025-02-12 18:32:18 +11:00

Body

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Catalog

Wizard Teleport Scroll (Teleport Location ECS) (#36424)

2025-04-28 19:42:24 +02:00

Chemistry

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Damage

some hotfixes 2

2025-04-30 19:44:38 +03:00

Datasets

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

Decals

Leaf maze demiplane + crayon update (#901)

2025-02-15 17:49:05 +03:00

Device

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

DeviceLinking

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

Entities

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

EntityLists/Tools

…

Flavors

The Bartender can now make Eggnog (#34065)

2025-04-20 17:27:35 -04:00

GameRules

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

GhostRoleRaffles

…

Guidebook

THE WIZARD (#35406)

2025-02-25 22:34:07 -07:00

Hydroponics

Increase base amount of egg in egg-plant (#36693)

2025-04-18 12:52:12 -07:00

InventoryTemplates

Slots separate (#778)

2025-01-17 22:15:54 +03:00

Loadouts

Added a semi-functional genderfluid pin. (#35854)

2025-04-21 13:46:33 -04:00

LootTables

Remove Vector assets and renames Vector SMG magazines (#34603)

2025-02-05 13:39:26 +01:00

Magic

Staff of Animation Fixes & Recharging (#37021)

2025-04-29 20:40:49 +01:00

Maps

fix

2025-04-30 21:03:50 +03:00

NPCs

Sentry turrets - Part 4: The sentry turret and its primary systems (#35123)

2025-03-29 12:55:58 -05:00

Objectives

[HOTFIX] Fix maroon objective, change the text (#36990)

2025-04-28 11:31:42 +02:00

Palettes

…

Parallaxes

Amber Station - Small Improvements (#36335)

2025-04-14 11:58:21 -07:00

Polymorphs

New Experimental Science T3: Desynchronizer (#35752)

2025-04-16 11:33:39 +10:00

Procedural

Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync

2025-04-15 00:44:29 +03:00

RCD

fix: return deconstruct to the top level option of radial menu (#36486)

2025-04-17 23:50:15 -05:00

Reagents

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Recipes

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Research

New Arsenal T3: Temperature Gun Revitalization (#35447)

2025-04-16 13:58:35 -04:00

Roles

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Shaders

Revert "Feature/shader radial menu" due to shader issue (#36470)

2025-04-13 23:55:27 +02:00

Shuttles

add man-o-war shuttle (#32105)

2024-12-20 14:36:23 +03:00

SoundCollections

3mo xeno archeology (first phase) (#33370)

2025-04-15 10:34:53 +10:00

Species

Fix vox hair (#36816)

2025-04-21 21:24:37 -04:00

Stacks

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

StatusIcon

Zombies can see Initial Infected (#33665)

2024-12-16 14:53:13 +03:00

Store

pAI Software Catalog (#36857)

2025-04-23 16:55:35 -07:00

StoryGen

…

Tiles

Merge remote-tracking branch 'upstream/master' into ed-23-02-2025-upstream

2025-02-23 23:07:55 +03:00

Traits

Merge remote-tracking branch 'upstream/stable' into ed-311-03-2025-upstream-2

2025-03-31 12:41:37 +03:00

Voice

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

Wires

Sentry turrets - Part 4: The sentry turret and its primary systems (#35123)

2025-03-29 12:55:58 -05:00

World

…

XenoArch

XenoArch Rebalancing (#36604)

2025-04-16 00:38:26 +02:00

ai_factions.yml

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

audio.yml

Random content (#815)

2025-01-28 13:04:10 +03:00

bar_signs.yml

ports two barsigns from frontier (#35296)

2025-02-19 20:25:17 +01:00

borg_types.yml

Give salvage borgs a tool module. (#33336)

2025-04-19 16:33:54 -04:00

contraband_severities.yml

Magical contraband type (#35254)

2025-02-18 01:21:49 +01:00

edge_spreaders.yml

…

explosion.yml

Fix explosion visuals (#36644)

2025-04-17 20:12:13 +10:00

floor_trap.yml

…

fonts.yml

…

game_presets.yml

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

holidays.yml

…

hud.yml

…

item_size.yml

…

lobbyscreens.yml

New lobby art (#748)

2025-01-12 22:39:33 +03:00

name_identifier_groups.yml

Station AI Name Identifier (#36801)

2025-04-21 19:54:51 +02:00

ore.yml

Upstream sync (#1035)

2025-03-17 11:54:43 +03:00

radio_channels.yml

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

round_announcements.yml

…

secret_weights.yml

Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2

2025-03-03 23:23:40 +03:00

silicon-laws.yml

Xenoborgs part 1 (#36830)

2025-04-23 19:38:10 -07:00

status_effects.yml

…

tags.yml

Wizard Teleport Scroll (Teleport Location ECS) (#36424)

2025-04-28 19:42:24 +02:00

themes.yml

Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync

2025-04-30 20:31:50 +03:00

threats.yml

…

tool_qualities.yml

…

typing_indicator.yml

New Speech Indicators for species that don't have any. (#36126)

2025-04-19 09:19:04 +10:00

weather.yml

…

whitelists.yml

…

wizardsDenWhitelists.yml

[HOTFIX] Fix MRP whitelist auto denying people with any medium severity notes in 14 days (#34532)

2025-01-21 11:24:50 +01:00