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

32755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
github-actions[bot]
d9c2bd8e09 @paige404 has signed the CLA in crystallpunk-14/crystall-punk-14#1257 2025-05-08 08:40:48 +00:00
Ed
448cd605c4 bye frigid 2025-05-06 20:36:08 +03:00
Nim
d8e360367e Well and new bed, aristocratic cloak (#1228) 
* well and bed

* aristocratic cloak

* fix

* GuardCommander

* fix2

* nop merchant

* bed resp

* fix well visual

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-06 09:47:46 +03:00
Nim
89c737f37d Перевод на RU (#1231) 
* translated

* end

* review desert

* review 2

* fix
 2025-05-06 09:46:46 +03:00
Nim
6dca95de7b Ребаланс выпадения руды (#1244) 
* ore

* revert
 2025-05-06 09:46:04 +03:00
Viator-MV
95471fcb51 yeah.... (#1255) 2025-05-06 09:45:27 +03:00
Ed
0fc9e28637 Demiplane maps aftertest tweaks (#1256) 
* admin info panel in demiplane map

* fix core chasm destruction

* dimensit resource, more resources in demiplanes

* more fixes
 2025-05-06 08:29:09 +03:00
Ed
aeedff5caa Demiplane exploration map (#1251) 
* dehardcode nodeTreeControl part 1

* finish

* demiplane map system setup

* link map entity with station data!

* random demiplane map generation

* redesign demiplane map node tree

* center

* map generate v2

* location generation

* modifier generation

* missing location icons

* ui polish

* data refactor

* fix line color

* ejectabling

* split demiplane component into two

* blocker attempt

* revoking

* fix frontier calculation

* dimensit

* demiplane core room spawning

* demiplane cool destruction

* Update round_end.yml

* progression works now!

* Update CP14NodeTree.cs

* Update CP14NodeTree.cs

* documentation pass

* fix abusing, some balance pass

* demiplane naming fix

* см

* location names

* delete old keys

* Update buy.yml

* Update migration.yml

* fix guidebook

* Update misc.yml

* Update misc.yml
 2025-05-05 15:19:44 +03:00
4g10w
63a2248201 Medieval Screwdriver (#1253) 
* Medieval Screwdriver
Prototye & Texture

Added: screwdriver.rsi
- in hand textures
- main texture (with major help from omsoyk, tysm!)
- meta file
As opposed to vanilla SS14 screwdriver, this one only has one main texture.

Changed: screwdriver.yml prototype
- added all components from vanilla SS14 screwdriver (can be found in tools.yml prototype),
except for RandomSprite component that gives random color
- changed parent attribute from Screwdriver to BaseItem since we're making brand new screwdriver
- all components from initial prototype remained

* removed unused components

* Screwdriver recipe

Removed:
- Screwdriver recipe from anvil (iron bar)
Added:
- Screwdriver recipe to workbench (wooden grip + iron bolt)

To fit more with updated screwdriver visuals, recipe is updated too.
 2025-05-04 22:29:34 +03:00
Ed
5dc41e4189 Update Dev.toml 2025-05-04 17:01:51 +03:00
Viator-MV
3bbf692da5 Ultraskeletom Revmech Update (#1145) 
* help me

* reinforced swords

* skill tree

* fix

* T2 fix

* components

* fix 2

* fix

* halberd fix

* other variant

* recheck it please

* fix

* deskill

* deslikk++

* skel physical buffs

* bad fix

* fix

* extended life time

* fix

* fix

* fix

* heal from death

* sword fix

* fix

* try to fix

* valid crashout?

idk

* It's not my fault.

* fix

* fix

* fix

* review fix

* forgot

* fix

* ашч

* meh

* reequipment

* wrong agony

* fix

* gripfix

* fix

* looking for result

* coment remove

* some fixes

* ok

* aaaaaaaaaaaaaaaaa

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-03 16:51:25 +03:00
Ed
0b994d2e1f en 2025-05-03 16:37:09 +03:00
github-actions[bot]
ec1a938097 @4g10w has signed the CLA in crystallpunk-14/crystall-punk-14#1253 2025-05-02 22:22:30 +00:00
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.

* fix
 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