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

459 Commits

Author SHA1 Message Date
Viator-MV
e06e1bb7fc Druid stuff (#1396) 
* staff

* Revert "staff"

This reverts commit bb7532e0b2.

* not resprite
 2025-06-09 14:35:56 +03:00
Nim
024d22dc05 Slippers and hat (#1398) 
* Slippers and hat

* sound

* fix
 2025-06-08 10:53:19 +03:00
Red
a04720e2a0 fuck rings (#1389) 2025-06-05 12:46:38 +03:00
Red
17be798db4 Grass bags (#1381) 
* grass bugs

* move to victoria

* Update tiles_grass_bag.yml
 2025-06-04 12:22:54 +03:00
Nim
dedd3a8b33 New carpets (#1375) 
* new carpets

* Flammable
 2025-06-04 09:57:09 +03:00
Nim
dd6f5a7e6f lockpick artifact (#1374) 2025-06-03 15:37:25 +03:00
TheKittehJesus
4c7b035c9c New belt controls (#1298) 
* Work for a madman

* God, that's a lot of hardcoding

* Fixed belt2 smartequip and cleaned up

* Continued clean up

* No scope creep!

* Replaced belt1 for upstream default belt

* Moved CP14OpenSkillMenu to CP14ContentContexts

* Changed naming of belt1 textures to just belt

* Updated new belt1 refrences

* I forgot to edit the RSI meta

* fix all BELT1 Texture instance

---------

Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
 2025-06-03 14:39:39 +03:00
DeLTaAlarm0
261441dd67 Open/closed table sign (#1275) 
* Added open/closed sign

* Added open/closed sign

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update workbench recipes

* Update openclosed_sign.yml

* Update openclosed_sign.yml

* Update misc.yml
 2025-06-03 14:22:24 +03:00
paige404
881a504334 Reorganize slime ymls, adjust damage resistances and vulnerabilities for slimes (#1300) 2025-06-03 00:59:07 +03:00
Red
43913d9d11 cozy (#1367) 2025-06-03 00:38:19 +03:00
Nim
5a2ccc3e08 Resprite (#1328) 
* well resprite

* broken well

* Campfire

* meta

* Quantity
 2025-06-02 14:16:42 +03:00
Red
5c5a473ec0 More merchant content (#1349) 
* energy crystals

* thaumaturgy trading
 2025-06-01 19:21:41 +03:00
Red
a3ae67a762 Trade reputation rework + Merchants back + Mining contract (#1347) 
* refactor unlocking

* fix contract debug crashing

* Update dev_map.yml

* bugfixes and content rebalance

* ore buy contract
 2025-06-01 15:10:36 +03:00
Red
71527bb4eb Merge pull request #1341 from crystallpunk-14/ed-31-05-2025-web 
Spider content update
 2025-05-31 14:31:44 +03:00
SenorJaba
3972d047c7 Guard bell resprite change (#1335) 2025-05-30 09:49:21 +03:00
Red
cde388f5dd Another Merchant gameplay attempt (#1308) 
* setup UI

* setup debug data

* graph control setup

* reputation trade component

* unlocking logic

* smoe real reputation costing

* remove sponsors part, add trading specific UI nodes

* port to default pricing system

* buy cooldown

* fuck off trading cabinets

* real good cooldown UI

* Cool unlock sound

* reputation earning

* cool purchare sound

* coin & sprite work

* delete old guidebooks

* cool purcharing VFX

* better ui

* victoria gardens

* Update migration.yml

* Update migration.yml

* cooldown removed

* contracts

* Update migration.yml

* remove CP14Material

* materials appraise

* food appraise

* auto economy pricing system

* alchemy reagents appraise

* coins resprite

* alchemy appraise 2

* modular weapon appraise

* selling platform

* Update PricingSystem.cs

* Update CP14TradingPlatformSystem.cs

* merchants returns + map update

* Update CP14StationEconomySystem.Price.cs
 2025-05-29 00:22:47 +03:00
Lucson1337
0551caf98f Eye patch/глазная повязка (#1329) 2025-05-29 00:22:20 +03:00
Nim
91cebc07c4 Merge pull request #1278 from Nimfar11/books 
Books sprite
 2025-05-26 12:52:58 +03:00
Cuir
14074a2ff3 Window improvements (#1292) 
* Added stone brick and marble brick windows to the crafting menu proper.
Sanitized capitalization of construction graph ids and nodes (but not entities).
Sanitized stone and marble structure descriptions.

* Windows that are built with frames now leave those frames behind when you smash them instead of disintegrating entirely.

* Syntax error because entity id

* wooden windows

* Added a base window frame as well as a wooden window frame and its broken variant.
Frames can be vaulted through, and the broken glass variant will deal slash damage and a short stun upon entering.
Wooden windows now deconstruct and shatter into both types of frames, which can also be deconstructed.
Fixed an issue with window collisions when connected across tiles.
Gave wooden windows their own prototype file and construction graph.

* stonevrick windows

* Added functionality to stone window frame types.
Fixed an issue where shattered windows weren't triggering unless they were flammable.

* some parenting work

* fix fixtures

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-05-23 12:03:36 +03:00
Alexsey Bezyuk
a73f8e3113 Seed sack and craft (#1287) 
* seed_sack

* full seed sack

* seed sack sprite

* name and description
 2025-05-21 12:41:22 +03:00
Ed
fd6965efe0 skimimimi 2025-05-18 15:36:28 +03:00
Ed
1cd20edecf Workshop resprite pack (#1279) 
* Jaraten resprite pack

* stamina TTomattT

* shrooms jaraten

* cloak fix

* passport resprite
 2025-05-18 01:24:07 +03:00
Ed
132d1db37b search of life spell (#1273) 2025-05-16 00:58:48 +03:00
Ed
e0a4f5592f Blood moon (#1270) 
* some setup

* fix dayccle events, add basic gamerules

* carcat guidebook update

* pfpf

* wawa

* fnish
 2025-05-15 17:32:26 +03:00
Viator-MV
80d668361c Mana trance (#1216) 
* That's it, Ed.

* skill

* CleanDisposed.

* now heal

* remake

* bruh rechek

* slowing

* Update metamagic.yml

* some ingame test and balance

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-14 14:56:27 +03:00
creamybag
edecdc3701 PackOmsoyk (#1267) 2025-05-14 13:53:56 +03:00
Ed
be495f274c Skill progression system (#1263) 
* delete skill trees

* Revert "delete skill trees"

This reverts commit 9d7fae73c4.

* learning refactor

* UI tweaks

* sword mastery skill

* telegraphy

* rapier mastery

* research table ui

* finish studing

* polish UI researching

* pyrokinetic

* more skill tree working

* heat adapt

* alchemist and metamagic update

* skill multiple effects support + metamagic bugg manapool

* impossible 😢

* skimitar gaming

* skimidi

* blacksmithing branch

* remove research restrictions

* remove species magic buff

* fix loc

* Update thaumaturgy.yml

* pip

* Delete skill_tree.yml
 2025-05-14 12:43:43 +03:00
Nim
abd69892c5 Myconide (#1265) 2025-05-11 17:04:52 +03:00
paige404
ebaa57133f Slime Crown (#1257) 
* Add slime crown, an admin-spawn artifact hat that makes all slimes friendly with the wearer.

* Add slime crown sprites
 2025-05-10 14:11:09 +03:00
Viator-MV
44f1c03e34 Spells extension (#1202) 
* fire

* trance_compression_distoration

* scroll loot

* fix

* myeh

* again mb?

* compression fix

* crystal fix

* disorion debuff

* delete all it

* final?

* nah

* not mine

* fix

* fix

* mmmm

* mana trance rebalance

* relocate trance

* fix

* blyat

* no compression

* delete all

* fix

* Update modifier_sets.yml

* Update heat.yml

* Update heat.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-10 13:28:33 +03:00
Nim
6e86a54a88 meat cooked (#1261) 2025-05-10 12:21:55 +03:00
Militore
aa2e080e31 Guard bell (#1242) 
* add Guard Bell

* revert vanila changes, add same functionality

* revert more vanila changes, replace .ogg, fix locale and locale usage

* Update GuardBell.yml

* Update base.yml

* add attributions.yml for alerts

* try changing to proper license

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-05-09 15:07:05 +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
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
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
e792440c19 Gob hairs (#1250) 
* renorma

* gobhairs
 2025-04-30 22:14:13 +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
Ed
c3b6938388 unicorns 2025-04-29 17:14:05 +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
Ed
7941be4490 dungeon walls resprite, fix TOSTRING problem from C4viwlle 2025-04-26 13:29:23 +03:00
creamybag
72d8767a6d recoloring (#1221) 2025-04-25 18:27:07 +03:00
Ed
a8b1b0ed37 sphere of light redesign 2025-04-25 14:11:36 +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
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
Nim
5bbf0df340 Bell (#1185) 
* bell

* soundCollection

* sound

* bell sound

* bell short

* surrendering
 2025-04-21 11:46:58 +03:00