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

26981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaraten
f70e3051ed update update (#403) 2024-08-09 14:08:50 +03:00
Ed
e3e142592a add art (#402) 2024-08-09 11:03:39 +03:00
Ed
d4001598d4 workbench ui clean up (#399) 
* workbench ui clean fix

* stack localization
 2024-08-07 09:32:27 +03:00
Ed
78e140b4ae Revert "SpawnSpell tweak (#393)" (#398) 
This reverts commit dc853b6662.
 2024-08-06 20:25:29 +03:00
Tornado Tech
1b0bf2ad18 Added base workbench window (#372) 
* Added base workbench window

* Fixed serialization errors

* Created base UI layout

* Updated ui

* Updated UI after crafting
 2024-08-06 14:25:59 +03:00
Ed
dc853b6662 SpawnSpell tweak (#393) 
* some refactor

* Update flame_creation.yml
 2024-08-06 00:42:53 +03:00
Ed
37e0ffa173 Workshop update (#392) 
* kreks spell icons

* vladimirs walls update

* add flora material
 2024-08-05 22:46:22 +03:00
Ed
6ab9ca6bd0 yupiiii (#391) 2024-08-05 21:08:10 +03:00
Nim
934c1e44a6 second rebalance (#390) 
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-08-05 21:00:40 +03:00
Nim
818eb30d2d spells (#389) 2024-08-05 20:59:40 +03:00
Tornado Tech
12d2af692f Update wave.swsl (#388) 2024-08-05 16:48:22 +03:00
Ed
1f4b7f68bf Playtest polishing (#383) 
* fix predicting sharpening

* finish shadow step

* tweak ice dagger

* shadow grab test

* fireball spell

* ice shards spell

* battle royale crates

* loot tables

* remove expedition ship

* dev update

* br map update

* spells tweak

* tips update

* some fixes

* biome forest spawner

* give keys to orgs

* mobs and aura spawners

* expedition update: goal, new ship, new map

* fix doors layers

* add new map proto

* translate keys

* Update crates.yml

* Update PostMapInitTest.cs

* fix spawning on expedition ship

* Fuck you, Randy. Remove nails

* fix lock systems

* localize tips

* some tweaks

* update ship, remove shrooms.

* fixes

* Update StationSystem.cs

* Revert "Update StationSystem.cs"

This reverts commit f632241324.

* Update expedition_test.yml
 2024-08-05 15:22:14 +03:00
Jaraten
9a07a9a052 stone upd (#384) 
* stone upd

* fix ooopsiee

* fix tile
 2024-08-04 12:28:31 +03:00
Skilets
1633895321 Fix Hud (#385) 
Co-authored-by: SkiletsKir <113713080+Skilets@users.noreply.github.com>
 2024-08-04 11:49:17 +03:00
Tornado Tech
0cd3a3c2d9 Added personal signature system (#382) 
* Added personal signature system

* FUCKING RUSSIAN LANUAGE

A HATE LATTERS, HATEEEEEEEEEEEEEEEEEEEEEEE!

* Added locale and sound
 2024-08-04 11:48:09 +03:00
GrandApothecary19
72cbed696f More sprites for tavern (#357) 
* - add sprites

* - fixo for .ftl

* - fix because no whiskey in Eberron((

* - fixo
 2024-08-03 15:51:29 +03:00
Gagarinten-Noverdo
c620d66dab Biome spawner fix. Again (#381) 
* Biome spawner update. Round seed system

* Format fix

* Round seed M I T

* Error to Warning

* Test fix #2

* Test fix #3

* VV

* Del out of body

* Fix of flood
 2024-08-02 18:46:00 +03:00
Ed
599c599a4e Some shit (#380) 
* telegraphy effects

* shadow step spell backend

* add component spell

* predict sharpening

* Update ring.yml

* locale sync

* Update entities.ftl

* icon shadow step
 2024-08-02 13:51:54 +03:00
Ed
31c9485e3b Magic rings (#378) 
* flame creation spell backend

* flame creation visuals

* flame creation spell visual

* tweak

* some tweaks

* ice dagger spell

* move spells to rings

* Update ring.yml

* fix server crash
 2024-08-02 00:48:36 +03:00
Ed
56da23925f Magic Items (#370) 
* attuning to items start

* verbs attuning, forgot oldest attuning

* Update CP14SharedMagicAttuningSystem.cs

* some fixes

* add deattuning

* fix popups on owner

* file restructurization

* MORE FOLDER RENAMING GODD

* magic via holding yea!

* fix deattuning

* vfx bugfixs

* wearing magic items

* Cure wounds spell

* refactor spells

* more redo

* finish refactor
 2024-08-01 11:52:27 +03:00
Nim
19365c0314 Statue of Gob (#376) 
* statue of Gob

* fix
 2024-08-01 09:15:44 +03:00
Ed
82d89a97f1 Create FUNDING.yml 2024-07-31 13:28:03 +03:00
Tornado Tech
2bb43245c8 Renamed .sln file (#371) 2024-07-31 11:17:02 +03:00
Nim
909fa27450 Rebalance melee weapons (#363) 
* weapons rebalance

* Update shield.yml

* Update shield.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-30 22:43:09 +03:00
KommissarRed
7478e6b445 Remove "bruh" (#367) 2024-07-30 20:43:13 +03:00
Jaraten
5072800d4a wood furniture resprite (#360) 
* wood table + workbench

* cupboard + dresser

* wooden bucket

* wooden crates

* Update Resources/Prototypes/_CP14/Entities/Structures/Storage/Crates/crates.yml

* barrel

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-30 17:07:43 +03:00
Ed
1f587c10b8 Update LICENSE.TXT 2024-07-30 11:48:50 +03:00
Ed
22bb0ae283 Energy pilons WIP (#326) 
* split partial magic system

* add debug sprited pilons

* some energy pilons interactions

* Update CP14MagicEnergySystem.Relay.cs

* spupers (#322)

* spupers

* meta

* aura nodes + aura scanners

* scanner sprites

* maid dress

* reverse pilon logic

* relay delete, code clean up

* delete content

* Update basic.yml

* Update shirt.yml

* Update crystal.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-29 21:01:36 +03:00
Gagarinten-Noverdo
c69cb0320e Biome spawner update. Round seed system (#359) 
* Biome spawner update. Round seed system

* Format fix

* Round seed M I T

* Error to Warning

* Test fix #2

* Test fix #3

* VV

* Del out of body
 2024-07-29 19:16:55 +03:00
Ed
02c5e03ae7 Merge pull request #362 from crystallpunk-14/ed-28-07-2024-upstream 
Upstream sync
 2024-07-28 22:22:55 +03:00
Ed
cc5f27c057 ignore traits 2024-07-28 21:04:45 +03:00
Ed
fb40f8cd25 Merge remote-tracking branch 'upstream/master' into ed-28-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/core.yml
#	Resources/Prototypes/Maps/train.yml
#	Resources/Prototypes/Traits/categories.yml
#	Resources/Prototypes/Traits/disabilities.yml
 2024-07-28 20:58:48 +03:00
Ed
0d345c33b9 Update dev_map.yml (#361) 
* Update dev_map.yml

* Disable FTL test

* DisableEvacTest
 2024-07-28 20:56:05 +03:00
Ed
9011aab26b Add 3 roles (without gameplay, alas) (#356) 
* add role icons

* add roles prototype

* Update job.yml
 2024-07-28 18:22:50 +03:00
Jaraten
cf6b42d20c Stone-brick wall crushed (#336) 2024-07-28 17:27:24 +03:00
Ed
655b32b720 Magic spells backend (#358) 
* add EntityEffect aability support

* delayed actions

* renaming

* delayed projectile spells

* spawn on self + entityEffect on self spells

* spawn on point spell

* rename

* clean up base species components

* magic alert

* move magic energy to Shared, add manacost to spells

* magic recoil

* improve magic recoil

* verbal aspect

* somatic aspect

* add simple vfx proto and sprites

* add casting VFX

* add TODO
 2024-07-28 17:26:47 +03:00
PJBot
fce5269fc0 Automatic changelog update 2024-07-28 08:33:32 +00:00
Jona-K
2951ea2bee Adjustet MobBaseAncestor class (#30424) 2024-07-28 01:32:26 -07:00
Plykiya
79fa810b9c Update stomach removal and lung removal smite to not use Component.Owner (#29927) 
* Update stomach removal and lung removal smite

* New function makes things simple

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 01:25:40 -07:00
PJBot
ab84eee083 Automatic changelog update 2024-07-28 06:18:12 +00:00
Plykiya
1d55a439ff Make NoSlip component networked (#30425) 
Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-27 23:17:06 -07:00
Brandon Hu
4a9bd17a86 tweak(geras): Add a confirmation popup for gera transformation (#29215) 
* tweak(geras): Add a confirmation popup for gera transformation

* remove abstract parent
 2024-07-28 14:13:15 +10:00
PJBot
d9286dd6d9 Automatic changelog update 2024-07-28 03:50:12 +00:00
lzk
e1e2d26969 Fix pancakes stacks (#30270) 
Fix pancakes
 2024-07-28 13:49:06 +10:00
deathride58
3a10ffa030 Makes the labeller automatically label PRs with shader changes (#30316) 
adds shader label to git labeller
 2024-07-28 13:46:22 +10:00
metalgearsloth
404743f073 Fix examine threading issues (#30160) 2024-07-28 13:43:59 +10:00
IProduceWidgets
925d1e3ac8 Prevent gridfill from leaking (#30395) 
dont forget to set the airtights when the tights are aired
 2024-07-28 13:20:29 +10:00
Plykiya
7f9e06501f Update SharedDoorSystem.cs to not use Component.Owner (#29963) 
* Update SharedDoorSystem.cs

* comment

* empty space

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-28 13:18:12 +10:00
PJBot
255b7f3b7a Automatic changelog update 2024-07-28 03:15:24 +00:00
metalgearsloth
093054f7e3 Move vgroid much closer (#29943) 
* Move vgroid much closer

General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.

* Decrease max

* Tweaks

* godzilla

* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
 2024-07-28 13:14:18 +10:00