Ed
e792440c19
Gob hairs ( #1250 )
...
* renorma
* gobhairs
2025-04-30 22:14:13 +03:00
Ed
df4f49b551
Merge pull request #1249 from crystallpunk-14/ed-30-04-2025-upstream-sync
...
Upstream sync
2025-04-30 21:17:50 +03:00
Ed
d09386c990
fix
2025-04-30 21:03:50 +03:00
Ed
518b439c0f
integrate
2025-04-30 20:50:03 +03:00
Ed
ef6d973301
Merge remote-tracking branch 'upstream/stable' into ed-30-04-2025-upstream-sync
...
# Conflicts:
# Content.Client/Parallax/ParallaxControl.cs
# Content.Client/UserInterface/Systems/Storage/Controls/ItemGridPiece.cs
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Server/Chat/Managers/ChatManager.cs
# Content.Server/Fluids/EntitySystems/PuddleSystem.Evaporation.cs
# Content.Server/Labels/Label/LabelSystem.cs
# Content.Shared/Actions/SharedActionsSystem.cs
# Content.Shared/Fluids/Components/EvaporationComponent.cs
# Content.Shared/Labels/EntitySystems/SharedLabelSystem.cs
# README.md
# Resources/Prototypes/Entities/Mobs/Player/admin_ghost.yml
# Resources/Prototypes/Maps/Pools/deathmatch.yml
# Resources/Prototypes/Maps/arenas.yml
2025-04-30 20:31:50 +03:00
Ed
0c8735f6df
some hotfixes 2
2025-04-30 19:44:38 +03:00
Ed
818c7f5aa6
some hotgix
2025-04-30 18:57:13 +03:00
Ed
7f9e11be39
tornado blyat
2025-04-30 18:06:55 +03:00
Ed
9908710dae
Update sewing_table.yml
2025-04-30 18:03:55 +03:00
Ed
2358bc46d6
Torches + Cotton ( #1246 )
...
* torches add, wallmount crystals deletion
* cotton
* Update buy.yml
* craftis
* delete elemental quartz
* energy crystal resprite and rewamp
* fix
* Update misc.yml
* а
* delete rituals
* riat
* Update migration.yml
* Delete CP14ClientRitualSystem.cs
* Update statues.yml
* fix
* Update wallmount_lamp.yml
* fix
2025-04-30 17:28:38 +03:00
Tornado Tech
ad2fc18356
Dimensional ( #1140 )
...
* add: Temporamancy tree with new shadow swap spell
* feat: Increased tempo loadout to 2
* feat: Remove most popups from swap spell
* fix: Swap with no mob entities
* feat: Add CanCast to spell effect
* fix: Handeling cancaled event & swap state
* feat: Add UseCustomCastConditions
* feat: Add swap to magic shadow staff
* feat: Add tempo essence & magic type
* feat: Add Tempo type to all dimension spells
* fix: Magic shadow staff tempo manacost modify
* fix: Spell type local
* feat: Add touhou lore
* fix: Review
* feat: Add target dead block component
* feat: Remove checking access
* feat: Add RequireCanInteract
* feat: Remove essence
* fix: Review
* fuck
* fuck part 2
* Update Content.Shared/_CP14/MagicSpell/CP14SharedMagicSystem.DelayedActions.cs
* Update dimension.png
* minor nitpick
* fix
---------
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-04-30 17:25:10 +03:00
slarticodefast
0e586e3fae
Hotfix: Fix item toggling crashing the client for slimes ( #37054 )
...
fix item toggling crashing the server for slimes
2025-04-30 02:19:07 +02:00
Princess Cheeseballs
84178dd534
Puddle code hotfix 2 ( #37046 )
2025-04-29 21:10:00 +01:00
ActiveMammmoth
a8ff930763
Staff of Animation Fixes & Recharging ( #37021 )
2025-04-29 20:40:49 +01:00
Milon
b9b854e179
ringer bugfixes ( #36936 )
...
AAAAAAAAAA
2025-04-29 19:08:23 +02:00
Ed
b4ea0f69f5
Update tiefling.yml ( #1245 )
2025-04-29 18:11:36 +03:00
Ed
8cc50ea3a4
Update tiefling.yml
2025-04-29 17:20:25 +03:00
Ed
c3b6938388
unicorns
2025-04-29 17:14:05 +03:00
Ed
612ffb90cb
Update ores.yml
2025-04-29 13:10:43 +03:00
keronshb
0a394d4af5
Wizard Teleport Scroll (Teleport Location ECS) ( #36424 )
2025-04-28 19:42:24 +02:00
Myra
f6bae21184
Cherrypick #36955 into staging ( #37002 )
2025-04-28 19:40:56 +02:00
Nemanja
d4e40ae44b
Revert "Add new color turtlenecks in WinterDrobe" ( #36983 )
...
Revert "Add new color turtlenecks in WinterDrobe (#32920 )"
This reverts commit 34cc49c175
2025-04-28 19:38:43 +02:00
github-actions[bot]
391230cd4b
@Militore has signed the CLA in crystallpunk-14/crystall-punk-14#1242
2025-04-28 15:27:14 +00:00
metalgearsloth
fe3fe95dfa
Fix autorecharge
2025-04-28 15:53:40 +02:00
Nemanja
4509821f0e
[HOTFIX] Revert "Updated air scrubber and air vent sprites." ( #36992 )
...
Revert "Updated air scrubber and air vent sprites. (#34223 )"
This reverts commit 3957bbb97d
2025-04-28 11:45:19 +02:00
ScarKy0
14cca7990a
[HOTFIX] Fix maroon objective, change the text ( #36990 )
...
* test
* text
* capital C
* guh
2025-04-28 11:31:42 +02:00
Leon Friedrich
fba07c69a9
Update staging to engine v255.0.0 ( #36916 )
...
Updatee engine to v255.0.0
2025-04-28 12:11:48 +10:00
Ed
991d2fbf74
Update Dev.toml
2025-04-27 17:01:16 +03:00
Viator-MV
39c6544dc9
visionCorrector ( #1230 )
2025-04-27 13:24:52 +03:00
Deserty0
8089be4596
Loc fix ( #1229 )
...
* fun
* Revert "fun"
This reverts commit 419b4e9e8f
2025-04-27 13:11:23 +03:00
Ed
e7e55cdb5e
fix viator
2025-04-26 18:09:44 +03:00
Ed
a1153843a2
Storage durability rebalance + Fuck nails ( #1225 )
...
* fix storage
* bye nails
* Update target.yml
* f
* Update migration.yml
* Update migration.yml
2025-04-26 17:20:52 +03:00
Ed
cff9dc6fcf
Wendigo renamed to Lurker ( #1213 )
...
* Добавлены изменения для создания пулл реквеста
* Update Step.yml
* rename!
* fix
* interrupting toggleable spells
2025-04-26 16:38:54 +03:00
ArZarLordOfMango
07132cdbd8
[Fix]Roof ( #1147 )
...
* roof
* why you dont work...
* fix and locale
* weh check
* Update no-roof-in-tile.ftl
* Update no-roof-in-tile.ftl
* Update roofs.yml
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-04-26 15:23:11 +03:00
Ed
7941be4490
dungeon walls resprite, fix TOSTRING problem from C4viwlle
2025-04-26 13:29:23 +03:00
Ed
1ee7b9b76c
fixes
2025-04-26 13:07:04 +03:00
Viator-MV
834fad0533
fixes ( #1223 )
2025-04-26 12:21:01 +03:00
Ed
8fbcaf496a
some bugfixes
2025-04-25 23:17:06 +03:00
creamybag
72d8767a6d
recoloring ( #1221 )
2025-04-25 18:27:07 +03:00
Tornado Tech
67912d2c44
fix: mistakes in legal.md ( #1220 )
2025-04-25 14:51:55 +03:00
Ed
23e276b886
Update caves.yml
2025-04-25 14:22:05 +03:00
Ed
5484557c6d
demiplane minor rebalance
2025-04-25 14:19:33 +03:00
Ed
a8b1b0ed37
sphere of light redesign
2025-04-25 14:11:36 +03:00
Ed
62cdf9e1c5
Bugfixes + QoL ( #1218 )
...
* fix keyring
* fix #1209
* fix #1116
* fix water, test reenable ambient loop
* recipe categories in workbecnhes
* Update CP14StoreWindow.xaml
* refactor: review
* Update CP14WorkbenchWindow.xaml.cs
* Update SharedCP14MagicEnergySystem.cs
* categorizize all recipes + some UI fix
* Update round_end.yml
---------
Co-authored-by: Tornado Tech <54727692+Tornado-Technology@users.noreply.github.com >
2025-04-25 13:39:20 +03:00
themias
bce195b53e
Fix disposal unit flush animation ( #30677 )
...
* Fix disposal unit flush animation
* Revert "Fix disposal unit flush animation"
This reverts commit a596ecfd5f5368f87ef52cfb27884a8e000185c6.
* control by setting layer visibility rather than overwriting
* restore changes
2025-04-24 18:59:39 -04:00
ScarKy0
56ee29ab41
Turnstiles lower volume + access reader ( #36900 )
...
fixes
2025-04-25 00:14:47 +02:00
Nemanja
abb9e373bd
Fix storage ui hovering over the hotbar ( #36770 )
2025-04-25 00:10:43 +02:00
slarticodefast
2b1161c8a6
Revert "Added warning when attempting to run RUN_THIS on a zip repo download" ( #36899 )
...
Revert "Added warning when attempting to run RUN_THIS on a zip repo download …"
This reverts commit d4c3ff3de4
2025-04-24 23:44:28 +02:00
PJBot
407f0d5433
Automatic changelog update
2025-04-24 21:19:33 +00:00
Nemanja
f9b3d59a53
Fix QSI bringing people into paused maps ( #36834 )
2025-04-24 14:18:26 -07:00
