Ed
2c5daec98c
leaf wall ( #900 )
2025-02-14 23:14:27 +03:00
Ed
6a3ea22543
Update comoss_d.yml
2025-02-14 17:51:23 +03:00
Ed
a2fa880820
bugg ice shards and add it to loadouts ( #899 )
2025-02-14 16:19:33 +03:00
Ed
c038c021f8
Bank returns ( #898 )
...
* cursed
* update
2025-02-14 14:09:04 +03:00
Ed
fdf2c53c5c
Update TagResource.cs
2025-02-14 11:57:49 +03:00
Nim
249cad63ee
fix ( #896 )
2025-02-14 11:51:10 +03:00
Ed
909dc36158
Spells content ( #897 )
...
* modifiers
* counter spell, and 2 new spell scrolls
* Update magical_acceleration.yml
* Update T0_counter_spell.yml
2025-02-14 11:50:57 +03:00
Ed
04aa7504fb
Update SharedEntityStorageComponent.cs
2025-02-13 23:38:00 +03:00
Ed
66a4cbd498
Update Factoria.yml
2025-02-13 22:13:07 +03:00
Viator-MV
4caef5ac74
Factoria added ( #893 )
...
* Add files via upload
* Create Factoria.yml
* Update factoria.yml
variantize
* fix
* Update Factoria.yml
* Update Factoria.yml
* fix gravity and atmos
* guards spawnpoints
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-02-13 18:48:26 +03:00
Ed
af83322c90
Glass showcase ( #891 )
...
* glass showcase
* fixes
* Update closets.yml
* Update closets.yml
2025-02-13 18:12:17 +03:00
github-actions[bot]
c27438306d
@Viator-MV has signed the CLA in crystallpunk-14/crystall-punk-14#893
2025-02-13 14:58:48 +00:00
creamybag
90813074f4
Neckerchief ( #892 )
...
* neckerchief
* neckerchief№2
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-13 17:24:05 +03:00
Nim
19c29e126d
Onion and pepper ( #889 )
...
* onion and pepper
* flavor
* crates
2025-02-13 15:21:41 +03:00
Nim
460f438bb2
Various meats ( #865 )
...
* meat
* color fix
* recipe
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-13 11:29:19 +03:00
Ed
007249b675
Master fix + Bank removal ( #888 )
...
* bugfix
* bank removal
* red and blue carpet
* Update carpets.yml
2025-02-12 22:36:19 +03:00
Ed
73b4060c65
passport ( #886 )
2025-02-12 17:20:50 +03:00
Ed
811104ada8
JoinQueue ( #883 )
...
* JoinQueue stalker port
* fix queues
---------
Co-authored-by: JerryImMouse <toperkas@gmail.com >
2025-02-12 00:35:54 +03:00
github-actions[bot]
33495266b4
@JerryImMouse has signed the CLA in crystallpunk-14/crystall-punk-14#883
2025-02-11 21:17:54 +00:00
Ed
aa069d1fa7
unrandomize prices ( #885 )
2025-02-11 23:46:46 +03:00
creamybag
ef3629d85d
Rework dresses + long leather boots #2 ( #882 )
...
* dress finally
* dress, really
* swap layers
* no, that way
* and this one
* fixes and belt remove
* Update general.yml
---------
Co-authored-by: Ed <edwardxperia2000@gmail.com >
2025-02-11 17:49:59 +03:00
Ed
a5de1b72e2
Create TagResource.cs
2025-02-10 23:02:20 +03:00
Арт
21592c24bc
New construction recipes ( #872 )
...
* FilesSort
* NewCrafts
* Locale
* Doors&Tomb
* RemFrames&SmallFixes
* Grilles
* BarrelsBenchPalletCurtains
* EditLocale
* BarrelIconSprite
* Fix_ResDuplicates
* Res_Fix
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-02-10 22:18:22 +03:00
Ed
4f4d24ac5b
Balance bugtweak ( #881 )
...
* Update CP14UniqueLootSystem.cs
* some demiplane balance
* rings undepants
* fix #870
* fix #868
* Update CP14ClientWallpaperSystem.cs
2025-02-10 22:07:25 +03:00
Ed
c78bc23c06
Update CP14UniqueLootSystem.cs ( #877 )
2025-02-10 20:45:53 +03:00
omsoyk
72606bda02
Fix cave stone iron ( #880 )
2025-02-10 20:39:20 +03:00
github-actions[bot]
9e9eb62315
@omsoyk has signed the CLA in crystallpunk-14/crystall-punk-14#880
2025-02-10 17:18:48 +00:00
Арт
c678e96fbc
New vests ( #862 )
...
* Sprites&Meta
* Add_Vests
* Belt
* Loadouts&Fixes
* Rem_RedVest_FromGuildmaster
2025-02-10 17:47:40 +03:00
Nim
469aa2a6a4
density ( #873 )
2025-02-10 17:46:43 +03:00
Ed
7abb9a9716
Update DungeonSystem.Rooms.cs
2025-02-10 13:32:56 +03:00
Ed
72c9cb9014
Unstable demiplane update ( #866 )
...
* replace heat trigger to unsafe damage trigger
* end demiplane music
* timed demiplane modifier
* unhardcode some values
* demiplane crystal destruction waves
* time limit
* fixes
* Update CP14UniqueLootSystem.cs
* Update unstable_rift.yml
* tweks
* Update unstable_rift.yml
2025-02-09 17:18:24 +03:00
Nim
ec6b5b4b93
say ( #864 )
2025-02-09 00:06:28 +03:00
Арт
bd45567599
Small Fixes ( #861 )
...
* Rem_HairHiding_GuardsHelmet
* Rem_electrified_CrystalShardElectro
* Locale_Fix
2025-02-08 21:39:17 +03:00
Ed
9dad3eccc6
Update Dev.toml
2025-02-08 21:13:53 +03:00
github-actions[bot]
a50a0a28d8
@JustArt1m has signed the CLA in crystallpunk-14/crystall-punk-14#861
2025-02-08 14:50:41 +00:00
Ed
88c1569266
Unique artifacts ( #859 )
...
* unique artifacts
* Update demiplane_keys.yml
* shadow staff
* fixes
* rename solution
* Update CP14UniqueLootSystem.cs
* try fix
* Update CP14UniqueLootSystem.cs
2025-02-08 17:29:29 +03:00
KittenColony
9ed582d7e4
Revert "EN playtest toggle ( #851 )" ( #860 )
...
This reverts commit fa989c7a22
2025-02-08 16:46:26 +13:00
KittenColony
fa989c7a22
EN playtest toggle ( #851 )
...
* EN locale
* whitelist disable / locale readyup
2025-02-08 16:33:38 +13:00
Ed
78e690f38a
Unstable demiplanes ( #858 )
...
* events
* heartbeat ambient
* Update unstable_rift.yml
2025-02-08 01:09:48 +03:00
Nim
a264f97282
fix ( #857 )
2025-02-08 00:14:41 +03:00
Ed
cb583d6897
Ru localization sync ( #854 )
...
* localization sync
* Update entities.ftl
* Update entities.ftl
2025-02-07 17:12:54 +03:00
Ed
3fd780bc8e
Bank rename ( #855 )
...
* job renamings
* Job proto rename to merchant
* loadout renaming
* clothing rename
* Update migration.yml
* catalog
* more folders rename
* fix wood abuse
* add selling ores
* refolder
* fix icons
* herbals selling
2025-02-07 15:28:31 +03:00
Ed
558c199a29
Fix spells ( #853 )
...
* fix kick
* fix some spells
* Update ice_ghost.yml
2025-02-07 09:51:22 +03:00
Nim
49a502cc25
Bacinet ( #852 )
...
* yep
* fix
2025-02-07 01:02:59 +03:00
github-actions[bot]
68f0543f5d
@Nimfar11 has signed the CLA in crystallpunk-14/crystall-punk-14#852
2025-02-06 20:33:52 +00:00
Ed
2cfe92489a
Merge pull request #850 from crystallpunk-14/ed-06-02-2025-upstream-sync-fix
...
Upstream sync squash fix
2025-02-06 15:00:10 +03:00
Ed
5c391b753f
Merge remote-tracking branch 'upstream/stable' into ed-06-02-2025-upstream-sync-fix
...
# Conflicts:
# Content.IntegrationTests/Tests/PostMapInitTest.cs
# Content.Shared/Wieldable/Components/IncreaseDamageOnWieldComponent.cs
# Resources/Maps/Test/dev_map.yml
# Resources/Prototypes/Maps/Pools/default.yml
2025-02-06 14:38:00 +03:00
Ed
f83505cfba
Update cla.json
2025-02-06 14:12:15 +03:00
Ed
55f93d88d6
Update cla.json
2025-02-06 14:08:32 +03:00
Ed
ebde8d6873
Update cla.json
2025-02-06 14:07:42 +03:00
