juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,277 Commits 57 Branches 0 Tags
60737dc36eccfa5c5e9e92e755d32012bc2edff0
Commit Graph

9528 Commits

Author SHA1 Message Date
Ed
60737dc36e Freeze spell (#843) 
* freeze spell

* Update T0_freeze.yml
 2025-02-05 23:48:27 +03:00
Ed
35303d7d80 Guildmaster 2 spells (#842) 
* merge movement and gate magic types into darkness new

* demiplane infiltration spell

* Update CP14SharedDemiplanSytem.cs

* finish

* locale
 2025-02-05 22:52:50 +03:00
Nim
fed38041e0 pie pumpkin (#841) 2025-02-05 22:39:30 +03:00
Nim
bf46e6b5e8 Smoking pipe new (#823) 
* pipe

* fix delayed smoke ignition

* sage

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-02-05 17:44:34 +03:00
Ed
5e80f98242 Update elemental.yml 2025-02-05 14:24:12 +03:00
Ed
d100ed765b Echoes of voices from the demiplanes (#840) 
* split lightdarkness type magic to 2

* signal lights

* finish spells

* demiplane voices echoes

* Update closets.yml

* spells impact relay

* sprite fix
 2025-02-05 14:21:12 +03:00
Nim
4becbd2c12 Frogs (#831) 
* frogs

* uee

* yep
 2025-02-05 10:51:50 +03:00
creamybag
11a4ed5439 creamy shyba (#839) 2025-02-04 23:35:48 +03:00
Ed
543d45ee04 Normal quartz returns (#838) 
* return of normal quartz

* Update furnace.yml
 2025-02-04 17:57:05 +03:00
Ed
344d99dabb hunger damage experiment 2025-02-03 17:36:56 +03:00
Ed
478b927e2b copper prices fix 2025-02-03 17:32:47 +03:00
Ed
a6262a471d Resprites + Satchels (#834) 
* magic essence experiment

* demiplane key resprite

* some resprites

* guard commander cape

* vat and cauldron resprite

* flint resprite

* satchels!
 2025-02-02 03:29:55 +03:00
Ed
8e1d310a8e Guildmaster YML implementation + Clothing pack (#832) 
* banker clothing resprite

* dinazewwr

* commandant cape resprite

* guildmaster cloak

* Guildmaster loadout

* guildmaster job icon

* key locks work

* map update

* guildmaster keys

* guildmaster stamp

* update guildmaster house

* track demiplanes

* player death track

* localization

* guildmaster objective

* Update empire_orders.yml

* fix

* fix map
 2025-02-01 17:52:01 +03:00
Ed
ca2e378c8a Update furnace.yml 2025-01-31 18:40:49 +03:00
Ed
3f70d8600c Fixes (#824) 
* delete round seed

* delete worldEdge locale

* Update CP14BiomeSpawnerSystem.cs

* nails to 50 max stack

* wood planks stack increase

* flora material stack edit

* Update EntityTest.cs

* Update EntityTest.cs
 2025-01-31 18:24:54 +03:00
Ed
b3eed32588 Workbench Refactor (#826) 
* Workbench refactor

* fixes

* update all recipes protos

* scrap resprite

* scrap melting

* scrap weapon drop

* demiplane loot update

* weapon parts melting

* fix

* boilerplate

* material localization
 2025-01-31 14:47:51 +03:00
Ed
8c42cdbbdf Stackable ore (#820) 
* ore stacks

* Update ores.yml
 2025-01-30 13:48:42 +03:00
Ed
2383bfdf08 fix roles folders 2025-01-29 21:23:28 +03:00
Ed
0546a08087 Update mobs.yml 2025-01-29 21:10:28 +03:00
Ed
af2466f0fa Update mobs.yml 2025-01-29 17:47:09 +03:00
Nim
0463798b33 fix (#818) 2025-01-29 17:17:35 +03:00
Ed
ad9813cace ice caves demiplane (#817) 
* ice caves demiplane

* more things can spawn on snow

* Update base.yml

* fix guidebook quartz

* ice island demiplane

* xeno turret demiplane mobs
 2025-01-29 00:48:11 +03:00
Ed
63e03ae7af unique quartz energy crystals 2025-01-28 20:29:50 +03:00
Ed
2bb465cb8b Different crystals type update (#816) 
* crystals update

* fixes

* fixes

* hehehe
 2025-01-28 18:05:15 +03:00
Ed
42627a0c33 Random content (#815) 
* demiplane crystal sprite update

* fix demiplane astral haze vanilla

* fix infinity money stacking

* rabbits outbreak!

* fix meta

* fix rga

* fix CLRF

* move subterranean leap action to actions folder

* Update audio.yml

* Update natural.yml

* restore lzk commit

* fix endscreen text

* fix goblin displacement, fix #809

* Update kudzu.yml
 2025-01-28 13:04:10 +03:00
Ed
d3a5d232ac Update blacksmith.yml 2025-01-27 18:42:44 +03:00
Ed
af182db79e Another assets relicense (#814) 
* TheShuEd assets relicensing

* Max Gab mass relicensing

* omsoyk mass relicensing

* Prazat mass relicense

* Jaraten mass relicensing

* Update meta.json

* jaraten part 2

* finalize

* validation

* unrelated fixes

* Revert "jaraten part 2"

This reverts commit b39ee0cdb9.

* Revert "Jaraten mass relicensing"

This reverts commit 44febae380.

* Revert "validation"

This reverts commit 3d2f388f47.

* Revert "finalize"

This reverts commit 775f21a18d.

* final fix
 2025-01-27 16:03:13 +03:00
Ed
0e6082cd9f spells mini tweak 2025-01-26 21:11:13 +03:00
Ed
c670b79fd0 Update guildmaster.yml (#810) 2025-01-26 15:57:44 +03:00
Ed
72279cee6b english OBT 2025-01-25 19:51:24 +03:00
Ed
f2bfeefcae Guildmaster + Comoss update (#808) 
* setup guildmaster job

* divide artisans and adventurer departments

* comoss tavern update

* Update comoss.yml
 2025-01-25 17:47:17 +03:00
Nim
918c7d1e3b Pies (#794) 
* pie

* qwe

* recipe

* Solution

* dough

* some tweaks

* fix crafting bugs

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2025-01-25 14:40:16 +03:00
Ed
62658f5017 ice block window 2025-01-25 01:40:05 +03:00
Ed
2ee1716a85 fix role restriction 2025-01-24 22:43:04 +03:00
Ed
403344fd46 Ice spectre mob + jobs playtime requirement increase (#806) 
* increase roles playtime requirements

* ice spectre
 2025-01-24 21:56:30 +03:00
Ed
fdca66be06 update species guidebook 2025-01-24 09:58:16 +03:00
Ed
cc924a2478 Fix some bugs (#805) 
* fix buckling from fences

* fix #804
 2025-01-23 22:47:49 +03:00
Ed
3f84a19ff0 Elf mana spell rework + magic damage popups (#802) 
* fix #793

* safe elf mana. Fix #728
 2025-01-23 17:20:03 +03:00
Ed
a91f3c8793 safe zones 2025-01-23 12:17:17 +03:00
Ed
86811a93b2 healing staff remove from loadouts 2025-01-23 00:10:30 +03:00
Ed
cc7fadf45f fix 2025-01-23 00:05:21 +03:00
Ed
2962085b9a Modular hammers (#792) 
* modular hammer

* QoL modular assemble

* remove gattle big hammer

* crossbow crafting
 2025-01-22 23:53:36 +03:00
Ed
fc14c111aa Update demiplane.yml 2025-01-22 17:53:47 +03:00
Ed
e08705535f Update iron_grille.yml 2025-01-22 16:44:39 +03:00
Ed
12225eb37b comoss update, quiver in loadouts 2025-01-22 16:34:35 +03:00
Ed
1bffc4b6aa Merge pull request #784 from Nimfar11/bow-and-quiver 
Bow and sprite quiver
 2025-01-22 14:31:42 +03:00
Nimfar11
19d23e26ba craft 2025-01-22 13:21:52 +02:00
Ed
4e62349c0d Update anvil.yml 2025-01-22 13:54:52 +03:00
Ed
4aebd6ff98 Merge pull request #789 from crystallpunk-14/ed-22-01-2025-workbench-many 
Workbench support multiple result
 2025-01-22 13:53:03 +03:00
Ed
7d26a26547 Merge remote-tracking branch 'upstream/stable' into ed-22-01-2025-double-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Preferences/HumanoidCharacterProfile.cs
#	LICENSE.TXT
#	Resources/Locale/ru-RU/administration/commands/babyjail.ftl
#	Resources/Maps/Shuttles/emergency_elkridge.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/Maps/Pools/default.yml
 2025-01-22 13:46:46 +03:00