Ignaz "Ian" Kraft
33bb537f81
make heat and freeze work on reagents ( #1314 )
...
* make heat and freeze work on reagents
* has to run before AdjustTemperature
* implement suggested changes
* almost missed this edge case
* 0k is the limit
* cleanup
2025-05-28 00:24:01 +03:00
Nim
2607eaeddd
Polymorph return ( #1327 )
...
* polymorph return
* AliveTarget
2025-05-28 00:08:58 +03:00
Kit
89dd70d7cd
Iceshard nerf ( #1324 )
2025-05-27 11:38:03 +03:00
Sefaia
f77a2c55c3
Added Guidebook entry for Locks, Keys and Lockpicking ( #1307 )
...
* Added Guidebook entry for Locks, Keys and Lockpicking
* Created a Mechanics Catagory for the Guidebook and allocated the two entries to it.
* Reorganized Lock and Lockpicking along adding TODO on mechanics
* Oops! Correcting a mistake at Lockpicking 101. Thank you @Woolpix18!
* Added a small fun fact about Lockpicks.
* Added Guidebook entries for Russian (IN NEED OF TRANSLATION) and simplified the guidebook entries for ease of reading.
* Update mechanics.yml
* Update mechanics.yml
---------
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com >
2025-05-27 11:32:13 +03:00
Nim
a1323c7b29
Tavernkeeper's Sandwich ( #1280 )
...
* burger
* Sandwich
* Separator
* CP14Sandwich
2025-05-26 12:53:07 +03:00
Nim
91cebc07c4
Merge pull request #1278 from Nimfar11/books
...
Books sprite
2025-05-26 12:52:58 +03:00
Ed
d44579df78
s
2025-05-26 12:30:16 +03:00
Ed
d34ece9eed
Update asteroid.yml
2025-05-26 12:10:01 +03:00
Ed
924897e27d
f
2025-05-23 15:08:17 +03:00
Ed
262a8a30c9
gf
2025-05-23 14:58:41 +03:00
Ed
8e7f68c062
part of fixes
2025-05-23 14:57:20 +03:00
Ed
3a9e6dc409
Update walls.yml
2025-05-23 13:52:18 +03:00
Red
40246e9b13
Merge branch 'master' into ed-12-05-2025-upstream
2025-05-23 12:58:11 +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
Sukilove
aadcaabf0e
Rotated Keyfile ( #1299 )
...
* Rotated the inventory sprite Keyfile by 45 degrees
* Update CP14RoundEndSystem.CBT.cs
* Rotated another 45 degrees
2025-05-22 23:26:34 +03:00
Red
352707f1d7
Remove Guildmaster & Merchant roles ( #1296 )
...
* b
* Update round_end.yml
* Update round_end.yml
2025-05-21 19:33:00 +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
Nim
afa522cc7c
Перевод на RU ( #1285 )
...
* translate
* fix
* rev
* slime
* fix local
2025-05-21 11:50:42 +03:00
Ed
9e26d985a5
Update roles.yml
2025-05-21 00:33:20 +03:00
Red
1d093c3919
Critical bugfixes ( #1291 )
...
* fix modifier duplication
* fix scrap melting
2025-05-21 00:30:16 +03:00
TheKittehJesus
726a078b95
added hideCaution to BaseSmokingPipe ( #1290 )
2025-05-21 00:02:44 +03:00
Red
7b7a837cf8
City Gate fix + Comoss update ( #1289 )
...
* city gate fix
* Update comoss.yml
* fix
* Update migration.yml
2025-05-20 22:36:43 +03:00
TheKittehJesus
2fc1384780
Proofreading changes [EN] ( #1288 )
...
* First batch of text fixes
* Tweaks
* that the tavern
---------
Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com >
2025-05-20 22:22:43 +03:00
Ed
ab619ad840
Merge branch 'master' of https://github.com/crystallpunk-14/crystall-punk-14
2025-05-19 21:45:33 +03:00
Red
f4caea3c6c
Garbage delete ( #1284 )
...
* fuck this
* and this
* aaand this
* content fix
* Update base.yml
* Update physical.yml
* kill bob
2025-05-19 14:53:00 +03:00
Alexsey Bezyuk
bd2f2e14d9
Wheat gather increase ( #1283 )
...
* wheat increase
* requirment bread count decrease
* Revert "wheat increase"
This reverts commit 9a7ecedcdc
2025-05-19 12:32:00 +03:00
Alexsey Bezyuk
f250f2b986
Gathering Seeds ( #1282 )
2025-05-19 12:13:29 +03:00
Ed
72976a9f3a
ро
2025-05-19 00:59:40 +03:00
Ed
0274826e32
Species free innate skill ( #1277 )
...
* innate free job skills
* returns species magic buff + unlock all skill
* Update tiefling.yml
* fix
2025-05-18 00:37:04 +03:00
Ed
5cd70ae1e9
fix achemist
2025-05-17 16:57:15 +03:00
Ed
23c9e11019
Blood moon part 2 ( #1272 )
...
* som tweaks
* fixing all
* bloodlust spell
* atatat
2025-05-17 14:12:49 +03:00
Viator-MV
74707a98c3
emiplane ghostrole fix ( #1271 )
...
* fine
* fix
* Update Content.Server/_CP14/DemiplaneTraveling/CP14StationDemiplaneMapSystem.cs
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
* Update Resources/Prototypes/_CP14/Procedural/Demiplane/Modifiers/GhostRoleDanger/misc.yml
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
2025-05-16 15:26:02 +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
Ed
26e4088cdd
Silva Photosynthes returns + Carcat guidebook page ( #1269 )
...
* f
* restore silva feature
* carcat guidebook
* day cycle
2025-05-15 00:37:42 +03:00
Ed
e361125549
Update blacksmith.yml
2025-05-14 22:34:49 +03:00
Ed
14d0c1f6ea
Update skimitar.yml
2025-05-14 19:12:43 +03:00
Ed
8c47af421f
balance pass
2025-05-14 18:22:05 +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
Ed
c2c66e77c1
Shrimp progression ( #1268 )
...
* Ore modifier category
* roundstart adventurer weapon equip
* forgot about guard
* Update adventure.yml
2025-05-14 14:22:33 +03:00
creamybag
edecdc3701
PackOmsoyk ( #1267 )
2025-05-14 13:53:56 +03:00
Ed
5293f1a0d2
remove desc name icon from recipes
2025-05-14 13:09:42 +03:00
Ed
be495f274c
Skill progression system ( #1263 )
...
* delete skill trees
* Revert "delete skill trees"
This reverts commit 9d7fae73c4😢
* 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
Ed
59e6435fe2
Merge remote-tracking branch 'upstream/stable' into ed-12-05-2025-upstream
...
# Conflicts:
# .github/CODEOWNERS
# Content.Client/Construction/UI/ConstructionMenuPresenter.cs
# Content.Shared/Construction/Prototypes/ConstructionPrototype.cs
# Content.Shared/Damage/Systems/SharedStaminaSystem.cs
# Content.Shared/Lock/LockSystem.cs
# Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
# Resources/Prototypes/Entities/Objects/Specific/chemistry.yml
# Resources/Prototypes/Procedural/vgroid.yml
2025-05-12 14:25:42 +03:00
Nim
abd69892c5
Myconide ( #1265 )
2025-05-11 17:04:52 +03:00
Nim
3164cb5b94
Fixing issues ( #1258 )
...
* fix
* gib frog
* zombie
* not damage
2025-05-10 21:45:11 +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
