juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,271 Commits 57 Branches 0 Tags
56f4012a495c50309d6efd5da35c4ccedfffc356
Commit Graph

21103 Commits

Author SHA1 Message Date
Ed
56f4012a49 Lava + Chest resprite (#1007) 
* simple lava

* add into demiplanes

* Update meta.json

* wooden chest update

* Update migration.yml

* Update dev_map.yml

* manual migration

* Update factoria.yml
 2025-03-11 17:39:46 +03:00
Nim
41e9e9f6ef Mannequin slot (#1003) 
* mannequin slot

* pos
 2025-03-11 10:55:40 +03:00
Link
0168dbabbb Separated mana modifiers (#1001) 
* brainrot

* Update test_armor.yml
 2025-03-11 10:23:09 +03:00
Link
540def6650 Update skeleton.yml (#1005) 2025-03-11 10:22:20 +03:00
Nim
2ce913dd2d fix (#1002) 2025-03-10 19:02:31 +03:00
Ed
dd26640465 fix #980 2025-03-10 17:03:59 +03:00
Ed
e7fc6bc652 some weapon balance 2025-03-10 17:01:39 +03:00
Nim
74fa1251c7 Modular armour 1 (#936) 
* armor

* fix

* fix color

* migra

* + *

* balance

* caustic

* presets

* migr2

* plate

* chainmail

* fix speed

* ehh

* ehh2

* ehh3

* fix layers

* mask craft

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2025-03-10 16:24:10 +03:00
Deserty0
7806e2234f Update cleaner.yml (#1000) 
* Update cleaner.yml

* Update cleaner.yml
 2025-03-10 16:18:51 +03:00
Nim
391cc8e7a5 Green salad (#999) 
* green salad

* maxvol

* duplicate
 2025-03-10 15:18:36 +03:00
Ed
10b38f04ce 129 Dinazewwr hairstyles (#717) 
* first pass

* Sync new sprites

* ru loc

* chatgpt moment

* clean up

* Update human-hair.ftl
 2025-03-10 13:06:18 +03:00
Ed
66058ffc49 Auto CBT (#997) 
* auto doggy

* fix

* fix
 2025-03-09 23:29:20 +03:00
Ed
759260c2ba unique loot rework 2025-03-09 18:48:48 +03:00
creamybag
a0337843ac baff (#995) 2025-03-09 17:48:41 +03:00
Viator-MV
d6a2c5f9f6 Commos upate 8.03.25 (#994) 
* personal house fix comoss.yml

* Update comoss.yml

* Update comoss_d.yml

* MaGiC sPlItInG
 2025-03-08 23:26:14 +03:00
Ed
978f9cf4b9 vampire buff 2025-03-08 14:46:13 +03:00
Ed
fc0e41c562 Update subgamemodes.yml 2025-03-08 14:31:42 +03:00
Nim
990a498e0d tweak meat rabbit (#993) 2025-03-08 12:34:52 +03:00
Ed
d1587d31b5 mimimi (#992) 2025-03-07 17:17:27 +03:00
Viator-MV
71e6b90f1a Skeleton update (#986) 
* Literally everything

Как будто я не должен был делать всё в 1 коммит

* фиксы

маленькие изменения по запросу Эда

* fix

HideSpawnMenu

* fix2

fix

* final fix

final fix

* real final fix

* spell fix

* fix
 2025-03-07 17:15:17 +03:00
creamybag
d0602d7d1d Jaster update! (#990) 
* hihihi

* hihihi 32x32
 2025-03-07 17:13:52 +03:00
Nim
228258e575 Dice (#989) 
* dice

* wallet

* crate
 2025-03-07 15:36:58 +03:00
Ed
6aac9d6447 Update wizard.yml 2025-03-07 14:53:58 +03:00
Ed
0b5712ce97 Vampire antag (#988) 
* new blood types

* vampire systems setup

* death under sun

* vampire blood nutrition

* alerts

* autolearn skills

* base bite actions

* suck blood spell

* polish

* Update blood.yml

* unshitcode

* vampire hunger visual

* nerf speed

* hypnosis + map update

* darkness demiplane warning
 2025-03-07 14:52:43 +03:00
Nim
cea7d93d12 Fixes (#975) 
* fixs

* not
 2025-03-06 16:33:10 +03:00
Tornado Tech
4a11cf9c53 Merge pull request #977 from crystallpunk-14/skill-remaster 
Knowledge refactor
 2025-03-06 22:29:36 +10:00
Tornado Tech
1ad686f42e feature: add to adghost CP14AllKnowing 2025-03-06 19:59:33 +10:00
Tornado Tech
06697abcdb fix: Books\knowledge.yml 2025-03-06 19:57:04 +10:00
Ed
c1acf81541 NewTrade (#969) 
* trading portal replace traveling storeship

* clean up content

* clean up content 2

* seel and buy realization

* fixes

* Update migration.yml

* Update migration.yml

* Update dev_map.yml

* Update dev_map.yml

* thats work correctly now

* bugfies and visual

* factions

* faction restruct + name reduce

* unnesting sell cargo positions

* unnesting cargo positions

* more cargo content

* Update buy.yml

* improve tradeportal visual

* Update migration.yml

* Bank ad Commandant removal

* merchant objectives

* finish

* clean up content

* Update migration.yml

* fix goal calculation

* Update comoss.yml

* Update dev_map.yml
 2025-03-06 12:01:43 +03:00
Viator-MV
0d23f79eb6 Обновление скелетов (#971) 
* Literally everything

Как будто я не должен был делать всё в 1 коммит

* фиксы

маленькие изменения по запросу Эда

* fix

HideSpawnMenu

* fix2

fix

* final fix

final fix
 2025-03-06 11:40:30 +03:00
Nim
e54e8a95ee Sheep (#972) 
* sheep

* demi mod
 2025-03-05 17:30:06 +03:00
creamybag
d9a5869504 Merge pull request #973 from creamybag/GuildmasterHat 
Guildmaster hat
 2025-03-05 17:28:41 +03:00
Ed
f9ff91d74b Update default.yml 2025-03-04 13:56:12 +03:00
Ed
b7b52e664d Update Dev.toml 2025-03-03 23:59:32 +03:00
Ed
acc9886242 Merge remote-tracking branch 'upstream/stable' into ed-2025-03-03-upstream-stable-2 
# Conflicts:
#	Content.Client/Options/UI/OptionsMenu.xaml
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
 2025-03-03 23:23:40 +03:00
Nim
2855cc906b Мелкий фикс перевода (#966) 
* fix

* a

* ehh

* yep
 2025-03-03 23:17:00 +03:00
Ed
81b9cdfff7 Alchemy integration test (#967) 
* Update TryAllReactionsTest.cs

* test drive

* fix traveling ship roundremove

* Update CP14RoundRemoveShuttleSystem.cs

* Dev map update
 2025-03-03 23:15:40 +03:00
Ed
3fb7cc0cd7 minor balance tweak 2025-03-03 18:43:44 +03:00
Ed
a0b190fd97 Update vials.yml 2025-03-03 16:55:12 +03:00
Ed
719ee50c96 CP14AreaEffectBehavior 2025-03-03 16:07:19 +03:00
Ed
c7c2e7265b Update essence_collector.yml 2025-03-03 14:37:13 +03:00
Ed
bef78c62c0 Alchemical bomb (#965) 
* smoke bomb system

* collector fixes

* bomb integration

* fix

* tweak
 2025-03-03 14:06:50 +03:00
VideoKompany
bab794e68f Added 'arrow' to the names of the arrowheads (#964) 
Co-authored-by: VideoKompany <135313844+VlaDOS1408@users.noreply.github.com>
 2025-03-03 10:37:36 +03:00
Nim
9ea547d8be Перевод на RU (#949) 
* translate

* fix

* yee

* qwerty

* fix

* Signal

* Skeleton

* arrow

* fix
 2025-03-03 09:38:09 +03:00
Errant
7bf09bfdb5 add altered silicon to rules (#35455) 
* add altered silicon to rules

* skreee

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
 2025-03-02 20:41:07 +01:00
creamybag
a16dd2fd3e Shirts in pants #2 (#934) 
* New shirt, all fix

* merchant,chainmail
 2025-03-02 22:16:34 +03:00
creamybag
8bbb0dad84 lute (#962) 2025-03-02 17:03:40 +03:00
Myra
98cca7b0f8 Change Phalanximine to be more complex, increase Arithrazine damage (#32209) 2025-03-02 13:47:11 +01:00
Ed
8652e71b39 Essence nodes (#961) 
* essence nodes

* Update essence_nodes.yml
 2025-03-02 15:13:21 +03:00
Ed
9a787bc7b8 Thaumaturgic alchemy refactor WIP (#955) 
* essences thaumaturgy refactor

* migrate structure crystals

* shard migrate

* bruh

* fix migration

* fixes

* 1 combining

* Create essence_brewing.yml

* Update magic.yml

* stack essence support

* FUCK THIIA ALL, DELETE ALL

* redesign counter spell

* Update precurser.yml

* magic splitting solution

* precurser splitting

* Praecantatio

* Update cleaner.yml

* add potions recipe

* fuck alchemy guidebook

* guidebook update

* fixes

* energia fix

* Update migration.yml

* fixes

* Update Alchemy.xml

* fix

* medium vial

* fixes?

* Update essence_combining.yml

* Update target_effect_creation_water.yml

* alchemist Comoss update

* Update closets.yml

* mana opertion glove

* Update migration.yml

* Update vials.yml

* Update GuideReagentReaction.xaml

* try to fix

* manual migration

* Update comoss_d.yml

* fix

* manual migration 2

* precursor admixture

* Update heater.yml
 2025-03-02 13:28:13 +03:00