juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
7a8326d41e6d0d28bf742e0d304435528a272a24
crystall-punk-14/Resources/Prototypes
History
Ed 7a8326d41e Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream 
# Conflicts:
#	Content.Server/Audio/ContentAudioSystem.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Shuttles/Systems/ShuttleSystem.cs
#	Resources/Locale/en-US/navmap-beacons/station-beacons.ftl
2025-07-08 00:40:30 +03:00
..
_CP14
Birch Furniture by Sable (#1438)
2025-07-07 11:50:38 +03:00
Accents
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Access
Sentry turrets - Part 6: Sentry turret control panels (#35235)
2025-05-26 16:00:50 +03:00
Actions
Added a ConfirmableAction component to ActionRevertPolymorph (#38570)
2025-06-25 20:52:32 +03:00
AlertLevels
…
Alerts
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Anomaly
…
AppearanceCustomization
Station AI customizations (#34501)
2025-05-13 01:50:43 -07:00
Atmospherics
…
Body
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Catalog
Revert "Readds the Hypereutactic Blade for traitors, adds Hypereutatic blade for Nukies (#37182)"
2025-07-07 00:02:16 +02:00
Chemistry
…
Codewords
Split codewords into its own system (#37928)
2025-06-05 19:19:41 -04:00
Damage
Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
2025-06-23 16:37:22 +03:00
Datasets
Scurret naming fixes (#38776)
2025-07-07 00:30:44 +02:00
Decals
Merge remote-tracking branch 'upstream/stable' into ed-23-06-2025-upstream-sync
2025-06-23 16:37:22 +03:00
Device
Xenoborgs part 1 (#36830)
2025-04-23 19:38:10 -07:00
DeviceLinking
Add disposal signalers (#37535)
2025-05-21 22:18:57 -04:00
Entities
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
EntityLists/Tools
…
Flavors
Add corgium (#37951)
2025-06-14 11:07:48 +02:00
GameRules
Thieves can innately pickpocket - thieving gloves rework (#38123)
2025-06-16 15:47:31 -07:00
GhostRoleRaffles
…
Guidebook
Pressure Relief Valve (#36708)
2025-07-03 18:00:34 +02:00
Hydroponics
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-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Loadouts
Revert "HoP's beret (#38601)"
2025-07-07 00:01:55 +02:00
Magic
fix smite use delay (#37940)
2025-05-29 19:41:25 -04:00
Maps
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
NPCs
New Salvage Mob: Basilisk (#37135)
2025-05-12 19:42:51 -04:00
Objectives
Remove SalvageShuttleCircuitboardStealObjective from the objective group (#38428)
2025-06-18 17:39:30 +02:00
Palettes
Scurrets (#38218)
2025-06-20 16:39:08 -07:00
Parallaxes
Scale down 4k parallax textures (#38390)
2025-06-17 18:53:58 +02:00
Polymorphs
fix polymorph errors (#38409)
2025-06-17 16:16:24 -04:00
Procedural
Revert biome rework (#38724)
2025-07-03 20:48:04 +02: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-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Recipes
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Research
Researchable & Printable Hyper Capacity Cells (#37619)
2025-05-19 18:35:08 -04:00
Roles
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Shaders
Fix displacement map rendering in UI (#38042)
2025-06-24 22:47:29 +02:00
Shuttles
…
SoundCollections
Scurrets - Audio Improvements (#38482)
2025-07-03 17:28:44 +02:00
Species
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
2025-05-12 14:25:42 +03:00
Stacks
Fix some crafting menu oddities (#38372)
2025-06-17 02:22:14 -07:00
StatusIcon
Give cluwnes job icons (#37834)
2025-05-27 18:39:52 +02:00
Store
pAI Software Catalog (#36857)
2025-04-23 16:55:35 -07:00
StoryGen
…
Tiles
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Traits
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Voice
Merge remote-tracking branch 'upstream/stable' into ed-08-07-2025-upstream
2025-07-08 00:40:30 +03:00
Wires
Give APCs wirepanels (#38443)
2025-06-19 17:06:11 +02: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
…
bar_signs.yml
…
borg_types.yml
Cyborg Rebalance (#34186)
2025-04-24 19:29:16 -07:00
contraband_severities.yml
…
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
lobby screens update
2025-06-16 12:02:59 +03:00
name_identifier_groups.yml
Station AI Name Identifier (#36801)
2025-04-21 19:54:51 +02:00
ore.yml
New sprites for Coal and Gold ore crabs, new Bananium ore crab and Bananium rock anomaly. (#37787)
2025-05-29 18:16:20 -07: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
…
silicon-laws.yml
Xenoborgs part 1 (#36830)
2025-04-23 19:38:10 -07:00
status_effects.yml
Refactor SeeingRainbows to new status effect system (#38620)
2025-06-27 21:19:04 +03:00
tags.yml
Scurrets get emergency EVA suit access (#38778)
2025-07-06 15:08:56 +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
Add Fancy Speech Bubbles for Diona and Gingerbread (#37742)
2025-05-26 13:51:09 +02:00
weather.yml
…
whitelists.yml
…
wizardsDenWhitelists.yml
…