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 b39ee0cdb944febae3803d2f388f47775f21a18d
2025-01-27 16:03:13 +03:00
Ed
0e6082cd9f
spells mini tweak
2025-01-26 21:11:13 +03:00
github-actions[bot]
b92de3d768
@TheShuEd has signed the CLA in crystallpunk-14/crystall-punk-14#734
2025-01-26 14:43:02 +00:00
github-actions[bot]
d549098641
@Nimfar11 has signed the CLA in crystallpunk-14/crystall-punk-14#813
2025-01-26 14:14:04 +00:00
Ed
011104816a
Update cla.yml
2025-01-26 16:21:02 +03:00
Ed
00eedea77e
Update cla.yml
2025-01-26 16:14:12 +03:00
Ed
a9a2372ba8
Update cla.json
2025-01-26 16:09:39 +03:00
Ed
14930094d7
Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14
2025-01-26 16:05:23 +03:00
Ed
b0189002e8
Update cla.yml
2025-01-26 16:04:48 +03:00
Ed
c670b79fd0
Update guildmaster.yml ( #810 )
2025-01-26 15:57:44 +03:00
github-actions[bot]
d43b67c6d4
@TheShuEd has signed the CLA in crystallpunk-14/crystall-punk-14#810
2025-01-26 12:54:43 +00:00
github-actions[bot]
58db8c4699
Creating file for storing CLA Signatures
2025-01-26 12:53:32 +00:00
Ed
12edd8f023
Create cla.yml
2025-01-26 15:49:12 +03:00
Ed
852e19601a
license part 2
2025-01-26 15:34:52 +03:00
Ed
e5c8256cfa
license part 1
2025-01-26 15:33:18 +03:00
Ed
2201bb70dd
end OBT
2025-01-26 00:10:08 +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
65faa9ae63
fix ice wall sprite
2025-01-25 02:43:16 +03:00
Ed
62658f5017
ice block window
2025-01-25 01:40:05 +03:00
Ed
2de94ea8b2
Update SharedProjectileSystem.cs
2025-01-24 23:18:26 +03:00
Ed
2ee1716a85
fix role restriction
2025-01-24 22:43:04 +03:00
Ed
fb604d1e08
fix CLA licensing
2025-01-24 22:02:46 +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
37ad1ee518
Merge pull request #790 from crystallpunk-14/ed-22-01-2025-double-upstream
...
Fix upstream
2025-01-22 13:52:46 +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
Ed
32e00d38a1
Update workbenchs.yml
2025-01-22 13:22:56 +03:00
