crystall-punk-14/Resources/Prototypes at d5fbdbdec036bfd915807124fb69f44b7a7a27dd - crystall-punk-14 - code.moonbunny.cafe

juni/crystall-punk-14

Files

History

Ed d5fbdbdec0 Merge remote-tracking branch 'upstream/stable' into ed-27-05-2025-upstream-sync

# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/Guidebook/Controls/GuideReagentReaction.xaml.cs
#	Content.IntegrationTests/Tests/Chemistry/TryAllReactionsTest.cs
#	Content.Server/Procedural/DungeonJob/DungeonJob.OreDunGen.cs
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/GameRules/meteorswarms.yml
#	Resources/Prototypes/Procedural/dungeon_configs.yml

2025-05-27 12:21:14 +03:00

..

Iceshard nerf (#1324 )

2025-05-27 11:38:03 +03:00

fix (#896 )

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

Genpop Closets & IDs (#36392 )

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

New Weapon: Knuckle Dusters (#33470 )

2025-05-03 00:18:08 -04:00

…

Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream

2025-05-12 14:25:42 +03:00

…

AppearanceCustomization

Station AI customizations (#34501 )

2025-05-13 01:50:43 -07:00

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

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

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

2025-05-27 12:21:14 +03:00

Add gold and silver material crates, balance cargo mat crate prices (#37713 )

2025-05-22 01:42:20 -07:00

Upstream sync (#1035 )

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

some hotfixes 2

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

More wizard names (#36437 )

2025-05-14 23:06:56 +02:00

Leaf maze demiplane + crayon update (#901 )

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

Xenoborgs part 1 (#36830 )

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

Add disposal signalers (#37535 )

2025-05-21 22:18:57 -04:00

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

2025-05-27 12:21:14 +03:00

EntityLists/Tools

…

Vox now can eat trash other other inedible things (#35681 )

2025-05-01 20:16:51 +02:00

New fun meteors (#37327 )

2025-05-20 23:04:27 +10:00

GhostRoleRaffles

…

THE WIZARD (#35406 )

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

Display obvious plant mutations in examine text (#32650 )

2025-04-29 00:45:10 -04:00

InventoryTemplates

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

2025-05-27 12:21:14 +03:00

Properly add rainbow skirt to passenger loadout this time (#37501 )

2025-05-17 18:30:00 -04:00

Force Wall Tweaks (#37525 )

2025-05-19 03:30:46 +02:00

fix

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

New Salvage Mob: Basilisk (#37135 )

2025-05-12 19:42:51 -04:00

New Weapon: Knuckle Dusters (#33470 )

2025-05-03 00:18:08 -04:00

…

Amber Station - Small Improvements (#36335 )

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

New Experimental Science T3: Desynchronizer (#35752 )

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

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

2025-05-27 12:21:14 +03:00

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

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

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

2025-05-27 12:21:14 +03:00

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

2025-05-27 12:21:14 +03:00

Researchable & Printable Hyper Capacity Cells (#37619 )

2025-05-19 18:35:08 -04:00

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

2025-05-27 12:21:14 +03:00

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

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

…

SoundCollections

Screaming for cyborgs (#32329 )

2025-05-21 12:49:56 -07:00

Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream

2025-05-12 14:25:42 +03:00

Localizable craftmenu (#32339 )

2025-05-01 10:21:16 -04:00

…

pAI Software Catalog (#36857 )

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

…

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

2025-05-27 12:21:14 +03:00

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

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

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

2025-05-27 12:21:14 +03:00

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

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

…

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

Cyborg Rebalance (#34186 )

2025-04-24 19:29:16 -07: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

…

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

Blood moon (#1270 )

2025-05-15 17:32:26 +03:00

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

Adding fungal soil (#36245 )

2025-05-20 21:59:51 -07: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

Rat King Chat Indicator (#37184 )

2025-05-22 01:47:04 -04:00

weather.yml

…

whitelists.yml

…

wizardsDenWhitelists.yml

…