juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
32,087 Commits 57 Branches 0 Tags
2358bc46d6f8d4ef71ca707e205dc55eda0155be
Commit Graph

10215 Commits

Author SHA1 Message Date
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
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
Viator-MV
39c6544dc9 visionCorrector (#1230) 2025-04-27 13:24:52 +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
Ed
8fbcaf496a some bugfixes 2025-04-25 23:17:06 +03:00
creamybag
72d8767a6d recoloring (#1221) 2025-04-25 18:27:07 +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
Ed
4bb614981f Keys & Locks crafting (#1207) 
* keeye

* random locks for demiplanes

* blank keys, material keys

* craft blank keys

* key file

* fix skill tree UIScaling

* fix audio and sounds and prediction

* delete crowbar, merge its into pickaxe

* QoL key shaping

* lock introdusing

* QoL progress lockpicking

* examinable lock

* lock insert

* mithril lockkpick

* Update wall_dirt.yml
 2025-04-24 17:10:52 +03:00
Ed
a2ed3154bb Update natural.yml 2025-04-22 22:05:24 +03:00
Nim
b70af8848c Modular helmet (#1206) 
* modular helmet

* fix

* del Bascinet
 2025-04-22 14:12:41 +03:00
Ed
0996413d72 Structure Durability rebalance - Part 1 (#1205) 
* walls rebalance pass

* windows and fence fix

* doors rebalance

* doors tweaks

* door construction rebalance

* Update WallWood.yml

* Update WallDirt.yml

* stone wall sfx

* ore rebalance

* Я не удержался и снес половину репы

* fix rsi

* Update windows.yml

* stonebrick constructions

* Update stonebrick.yml

* Update migration.yml

* Delete cargo_shuttle.yml

* Delete wall_marble.yml

* fix

* Update wooden.yml
 2025-04-22 13:22:28 +03:00
Deserty0
850111f469 Entity 0 fix (#1204) 
* fix

* Update scattering_grenades.yml

* Update EntityTest.cs
 2025-04-21 12:20:26 +03:00
Nim
5bbf0df340 Bell (#1185) 
* bell

* soundCollection

* sound

* bell sound

* bell short

* surrendering
 2025-04-21 11:46:58 +03:00
Ed
cd0fcb8b47 Global Fence update (#1186) 
* small wooden fence new

* birch and stonebrick fences

* big wooden fence

* birch big

* iron fence

* iron fence gate

* fence iron window

* fix

* fix
 2025-04-20 17:37:56 +03:00
Ed
f787bb5ea4 Ice bow artifact (#1200) 
* pvs

* fix tradepost

* ice bow artifact
 2025-04-19 17:24:57 +03:00
creamybag
000a064140 Modular Palette (#1199) 2025-04-19 17:22:58 +03:00
Ed
026a17be57 Raids (#1198) 
* simpliest undead raid

* map fix

* Comoss big update

* fix raids

* Update demiplane_rifts.yml

* fix

* Update mobs.yml
 2025-04-19 15:47:06 +03:00
Ed
b437be5cf8 Random bullfix go! (#1197) 
* some fixes for AI pathfinding

* cobblestone tile

* stonebrick update

* fix #1194

* fix #1193

* Update stonebricks_square_carved.png
 2025-04-18 22:47:17 +03:00
Ed
39ca6175e6 Simple sponsorship system (#1189) 
* simple sponsorship system

* priority Join

* OOC Sponsor Color

* Update CP14SponsorRolePrototype.cs

* loadout sponsorship

* bruh

* refactor to interfaces

* Update CP14ClientSponsorManager.cs

* finish loadout option

* role pass
 2025-04-17 19:55:25 +03:00
Nim
1a0136c21f a variety of fixes (#1191) 2025-04-17 16:12:04 +03:00
Nim
63993e221f skeleton ModifierSet (#1190) 2025-04-16 15:46:11 +03:00
Ed
5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync 
# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs
 2025-04-15 00:44:29 +03:00
creamybag
e7cd69e383 Carcat sprites fix (#1176) 
* CarcatSpritesFix

* fix
 2025-04-14 17:16:08 +03:00
Nim
b7e4fbb74a Amulets are jewellery (#1126) 
* amulets are jewellery

* transfer textures
 2025-04-14 14:50:07 +03:00
Nim
85204144fb magic modifier (#1103) 2025-04-14 14:45:36 +03:00
chromiumboy
87b6eb55e5 Hotfix for water/fuel tank fixtures (#36527) 
Sharing the same fixture layer as walls causes dragged water/fuel tanks to be blocked by things that they really shouldn't be, such as lights and holopads

Being PRed as a hotfix in order to fully finalize #36341
 2025-04-13 22:02:29 -07:00
Pieter-Jan Briers
7bb35889ce Revert "Feature/shader radial menu" due to shader issue (#36470) 2025-04-13 23:55:27 +02:00
Ed
5df9a526f0 new horns 2025-04-13 23:27:24 +03:00
Ed
4a98d86330 wastelands (#1181) 2025-04-13 22:43:47 +03:00
Ed
78c61c3094 ssss 2025-04-13 21:02:25 +03:00
Ed
5646e419bc Update Fear.yml 2025-04-13 19:51:20 +03:00
Ed
ac541b63ef new round leave system (#1178) 
* round leave

* maps update
 2025-04-13 15:36:41 +03:00
Ed
e968c7a9b8 wendigo tweak 2025-04-13 12:34:03 +03:00
Ed
26d81b684b Weather refill (#1175) 
* refillable by weather

* fix
 2025-04-13 01:01:22 +03:00
Ed
51b3492cea Update wendigo.yml 2025-04-12 22:01:14 +03:00
Ed
517bc5418b Wendigo demiplane antag (#1174) 
* wendigo

* ritual3

* Update sky_lightning.yml
 2025-04-12 17:32:53 +03:00
Viator-MV
ee30ae1341 frigid coast (#1173) 
* frigid coast

* fix

* Update snow.yml

* Update default.yml

* Update Frigid_Coast.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-04-12 16:35:41 +03:00
Ed
3c27e0ed99 Revert "Another Try" (#1170) 
* Revert "Another Try (#1167)"

This reverts commit 355fc410a3.

* Update EntityTest.cs

* Revert "Update EntityTest.cs"

This reverts commit 1f75981e59.
 2025-04-12 12:03:18 +03:00
Ed
e64c8f3d4f Dead tree (#1172) 
* farming rebalance

* Update base.yml

* Update CP14FarmingSystem.Resourse.cs

* dead tree

* Update scattering_grenades.yml
 2025-04-12 11:43:45 +03:00