Commit Graph

24433 Commits

Author SHA1 Message Date
Deserty0
88575e2286 I am become Death, the Code Destroyer 2025-10-05 16:48:09 +10:00
Deserty0
90797f88b6 help me 2025-09-19 22:22:56 +10:00
Deserty0
122193bc7b quick fix 2025-09-12 13:45:21 +10:00
Deserty0
59d776ca72 MASSIVE UPDATE NUMBER ONE 2025-09-12 12:41:17 +10:00
Deserty0
45f4668b11 Merge branch 'master' into des-fishing 2025-09-10 09:39:07 +10:00
CrystallEdge Server
fdbdfd896a Automatic changelog update 2025-09-10 01:33:54 +03:00
Viator-MV
def6b4a372 Venicialis guard-guild upate (#1754)
* guard-guild

* fix1

* guild weaponry and bioms
2025-09-10 01:32:48 +03:00
CrystallEdge Server
f94590e669 Automatic changelog update 2025-09-09 10:45:16 +03:00
Nim
fb18edcedc MessyDrinker (#1756)
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-09-09 10:44:10 +03:00
Gaby_Destroyer
3b32847db6 Updated Taskbar Icon (#1755)
Co-authored-by: Gaby_Destroyer <@gabrieljimenezlauret@gmail.com>
2025-09-09 00:59:35 +03:00
CrystallEdge Server
cd962f2305 Automatic changelog update 2025-09-08 17:33:42 +03:00
Nim
5dddaf4033 Merge pull request #1719 from Nimfar11/translate7
Перевод на RU
2025-09-08 17:32:36 +03:00
Ed
5f7600b6a2 Merge remote-tracking branch 'upstream/stable' into ed-08-09-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.IntegrationTests/Tests/CargoTest.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Shared/Chat/SharedChatSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/StatusEffectNew/StatusEffectSystem.Relay.cs
#	Content.Shared/Storage/Components/EntityStorageComponent.cs
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/human_hair.yml
#	Resources/Prototypes/game_presets.yml
2025-09-08 13:12:50 +03:00
Ed
67e5ef8ecb Refactor Food component to Edible in meal and cooking entities
Replaced the deprecated 'Food' component with the 'Edible' component in bowl, plate, and pie_pan YAML prototypes. Updated base cooking entity whitelist to include 'Edible' for compatibility. This change standardizes food consumption logic and improves maintainability.
2025-09-08 12:49:43 +03:00
Ed
a246db9ec1 remove random food 2025-09-08 11:51:45 +03:00
Ed
f84e1ba04d Merge branch 'master' into ed-25-08-2025-upstream-sync
# Conflicts:
#	Resources/Prototypes/_CP14/ModularCraft/Blade/axe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/base.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/dagger.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hammer.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/hoe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mace.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/mop.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/pickaxe.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/shovel.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sickle.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/skimitar.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/spear.yml
#	Resources/Prototypes/_CP14/ModularCraft/Blade/sword.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/guildmaster.yml
#	Resources/Prototypes/_CP14/ModularCraft/Garde/sharp.yml
2025-09-08 11:33:44 +03:00
Ed
e659a2a007 Merge branch 'master' into ed-25-08-2025-upstream-sync 2025-09-08 11:31:28 +03:00
CrystallEdge Server
4ed27eb520 Automatic changelog update 2025-09-08 02:46:16 +03:00
Kit
d9814b1eb2 Alch guidebook refactor (#1717)
* ALCHEMY GUIDEBOOOK!!!!!

* forgoten translation

* FIXES!!!!!

* Requested translation changes
2025-09-08 02:45:11 +03:00
CrystallEdge Server
ca889a0073 Automatic changelog update 2025-09-08 01:39:23 +03:00
omsoyk
ec2128fa03 resprite satchels (#1748) 2025-09-08 01:38:18 +03:00
Kit
063a9a87d6 some changes (#1749)
* some changes

* lower health regen

* spine guard more common

* MORE!!!!
2025-09-08 01:37:53 +03:00
CrystallEdge Server
ea123d36ff Automatic changelog update 2025-09-07 19:16:34 +03:00
Red
ab7e3204f1 Adventure guild returns (#1745)
* adventure guild

* fix order board

* fixes

* loadout + fix

* commit
2025-09-07 19:15:29 +03:00
CrystallEdge Server
6121eb44e7 Automatic changelog update 2025-09-07 14:23:35 +03:00
Red
ad46932d11 Balance tweaks (#1741)
* disable lurker pulling

* fix pack

* fix pack

* fak pix

* vampire objective tweak

* buff vampire search

* Update air_saturation.yml

* fix

* fix

* Update EntityTest.cs

* Update EntityTest.cs

* tick

* Update EntityTest.cs

* remove forkfiltered filter

* Update EntityTest.cs
2025-09-07 14:22:30 +03:00
Deserty0
c8b0560c7a UI 2025-09-07 04:31:11 +10:00
Deserty0
5d2fb2c4bc 13234546tyu 2025-09-07 01:37:52 +10:00
Viator-MV
dd930f513c fixing unnoticed bugs for new weapons (#1740)
* NO TIME TO EXPLAIN

* fix
2025-09-06 15:49:39 +03:00
CrystallEdge Server
d0759efbfe Automatic changelog update 2025-09-06 14:18:47 +03:00
Red
30b306b9ce Revert "wizard robes (#1725)" (#1737)
This reverts commit a71948ffb4.
2025-09-06 14:17:42 +03:00
Ed
dcaca3f4a6 fix 2025-09-06 14:03:56 +03:00
Princess Cheeseballs
adc7a829ae [HOTFIX] Fix Burgers (#39773)
* Borgar

* Review

* Predicted queuedel

* Predict

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-06 02:18:06 -07:00
Ed
9d3162585c Update CP14_Changelog.yml 2025-09-06 01:11:22 +03:00
CrystallEdge Server
13742f659d Automatic changelog update 2025-09-06 01:06:16 +03:00
Viator-MV
a71948ffb4 wizard robes (#1725)
* ALL

* no green

* material

* NO GREEN

* I SAID NO GREEN

* cost
2025-09-06 01:05:11 +03:00
Red
963bdc022f Rethinking equipment (#1711)
* delete all modular content

* clean up

* Update guard.yml

* spear first pass

* Add imperial two-handed sword and update spear

Introduces the imperial two-handed sword with new sprites, prototype, and animations. Refines spear configuration: adjusts damage, animation, and offsets, and updates its sprites and prototype to use a new resource path. Improves melee weapon animation logic for both thrust and slash attacks.

* neck displacement

* Update neck.png

* Update migration.yml

* dagger

* Add sword prototype and refactor melee weapon swing logic

Introduces a new sword entity and associated textures. Refactors melee weapon swing logic by renaming SwingLeft to CPSwingLeft and updating related code. Adjusts animation offsets and rotation values for daggers, spears, and two-handed swords. Moves and updates dagger texture assets to a new directory structure.

* hatchet

* sickle

* Add skimitar sword entity and sprites

Introduced a new 'skimitar' sword entity with description and associated sprite assets, including icon, in-hand, and equipped states. Also updated the imperial sword's name and description for clarity.

* Add rapier weapon and adjust melee weapon balance

Introduced the imperial rapier weapon with associated prototype and textures. Increased the default single-target melee damage modifier to 1.3 and removed per-weapon clickDamageModifier overrides from dagger, spear, sword, and two-handed sword. Also increased sword base damage to 10 for better balance.

* Add iron tool/weapon variants and update wall thresholds

Introduces iron variants for pickaxe, shovel, dagger, rapier, spear, sword, and two-handed sword, including new sprites and YAML prototypes. Adjusts wall and ore vein damage thresholds for destruction and sound triggers. Updates migration.yml to map modular iron weapons to new iron variants and spawns stone blocks on stonebrick wall breakage. Also refactors dagger textures to use an 'iron' directory.

* Refactor ice dagger and adjust blacksmith skills

Replaced CP14IceDagger with CP14WeaponDaggerIce, updating its parent, stats, and components for consistency. Adjusted base dagger damage types. Blacksmith job and related melting skills are now commented out or disabled, reflecting a change in skill progression and job setup.

* Update ice_dagger.yml

* Deprecate sword mastery skills and update melee swing logic

Commented out SwordMastery, RapierMastery, and SkimitarMastery skills and removed their assignment from guard and artisan job prototypes. Renamed CPSwingLeft to SwingLeft in melee weapon code for clarity and updated related logic.

* Remove requiredSkills from anvil and furnace recipes

Eliminated the 'requiredSkills' field from all recipes in Anvil/misc.yml and furnace.yml. This simplifies recipe definitions and removes skill prerequisites for crafting these items.

* Update guard_commander.yml

* Comment out freeLearnedSkills for T1 and T2 skeletons

Disabled the freeLearnedSkills entries, including SwordMastery and SkimitarMastery, in both T1 and T2 DemiplaneAntag skeleton YAML prototypes. This change may be for balancing or testing purposes.

* Update migration.yml

* Update migration.yml

* guidebook

* r

* spear passive + hammer passive

* tool hammer + skimitar refactor

* balance tweak

* kick nerf

* TOWER DEFENCE UPDATE

* default shield refactor

* buckler (only sprites)

* Update migration.yml

* buckler parry

* some fixes

* Update T2.yml

* Update T2.yml

* Update instruments.yml

* Update migration.yml

* M O P

* war axe

* Update migration.yml

* Keen Eye skill

* arrows + bow + loadouts

* Update tools.yml

* trading

* fix

* Update misc.yml

* Update migration.yml
2025-09-06 00:59:58 +03:00
Deserty0
3759f240b3 123 2025-09-06 04:14:26 +10:00
Deserty0
af2e62ff59 я очень устал босс 2025-09-06 03:03:37 +10:00
Deserty0
307c0dc01b fix meta 2025-09-05 23:55:54 +10:00
Deserty0
310126c660 init 2025-09-04 02:32:59 +10:00
CrystallEdge Server
2ae9ccbf15 Automatic changelog update 2025-09-02 11:53:42 +03:00
Nim
b01938ddcf Magic traps (#1662)
* magic trap

* demiplan

* energy

* Permanent

* meta

* ice trap

* fix

* ForkFiltered

* sound trap

* icon and loot

* blacklistTags

* staffs

* fix window

* manacost
2025-09-02 11:52:37 +03:00
CrystallEdge Server
6996d44039 Automatic changelog update 2025-09-01 15:08:33 +03:00
Nim
188901bdfb Fix crate and skeleton (#1730)
* fix crate

* barrel

* T2 skeleton
2025-09-01 15:07:27 +03:00
Spanky
c506432d64 Terminal Hotfix (#40027)
* Resave terminal.yml

* Fix airlock
2025-08-31 21:51:33 +02:00
Vasilis The Pikachu
5100068a78 Revert "Admin Log Browser Improvements (#39130)"
This reverts commit f67cebf7a4.

Per request of @Kowlin and @southbridge-fur

Check out https://github.com/space-wizards/space-station-14/issues/39960 for further information
2025-08-31 17:50:37 +02:00
SlamBamActionman
1150053580 Fix latejoin spawner on Plasma (#40012) 2025-08-31 02:58:28 -06:00
SlamBamActionman
b4bd973fbf Fix latejoinspawner on Exo (#40011) 2025-08-31 02:58:22 -06:00
SlamBamActionman
b41cbcf696 Fix latejoinspawner on Elkridge (#40010) 2025-08-31 02:58:15 -06:00