Commit Graph

6449 Commits

Author SHA1 Message Date
Deserty0
90797f88b6 help me 2025-09-19 22:22:56 +10:00
Deserty0
0c7dd03f79 я усталь 2025-09-12 13:44:21 +10:00
Deserty0
59d776ca72 MASSIVE UPDATE NUMBER ONE 2025-09-12 12:41:17 +10:00
Deserty0
782ae7c588 Update CP14FishBaseBehavior.cs 2025-09-11 03:07:27 +10:00
Deserty0
aa16b587fc Merge branch 'des-fishing' of https://github.com/crystallpunk-14/crystall-punk-14 into des-fishing 2025-09-11 01:14:46 +10:00
Deserty0
4de7747fb9 im actualy idk
ну шо ща пиздос
2025-09-11 01:14:20 +10:00
Deserty0
45f4668b11 Merge branch 'master' into des-fishing 2025-09-10 09:39:07 +10: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
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
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
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
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
dcecaded17 slow work 2025-09-04 22:54:20 +10:00
Deserty0
310126c660 init 2025-09-04 02:32:59 +10: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
slarticodefast
0edd848e92 Don't network ZombifyOnDeathComponent and ZombieImmuneComponent (#39963)
no networking
2025-08-29 15:40:24 -07:00
āda
49daf74069 Fix audio mispredict when quick inserting (#39930)
surprising

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-28 18:54:06 +02:00
Fildrance
60ea135fd3 Revert "Added button and manager for in game bug reports (Part 1)" (#39872)
Revert "Added button and manager for in game bug reports (Part 1) (#35350)"

This reverts commit a8d6dbc324.
2025-08-28 01:46:24 -07:00
Princess Cheeseballs
63f38558ca [Cleanup] Remove FellDownEvent (#39762)
* Remove

* Better description maybe

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-27 22:43:55 +02:00
chromiumboy
149bb4ca14 Re-anchorable structures (#39542)
* Initial commit

* Reverted reinvention of an existing feature...

* Fixed two missed entries

* Added extra examine check

* AI core and high security doors visuals snap to always face south
2025-08-27 17:04:39 +02:00
Centronias
973689425c Fixes Diona rooting not working since event based weightlessness refactor (#39893)
* Fixes Diona rooting not working since event based weightlessness refactor

Caused by #37971

* pr comments
2025-08-27 16:56:13 +02:00
SlamBamActionman
c36778e25e TriggerOnSimpleToolUsage and add tool locks to syndicate items (#39900) 2025-08-27 16:45:59 +02:00
Red
1eead99543 You are surrounded by unknown suspicious individuals, my lord. (#1710)
* base identity hide

* ui

* Better UI

* store data in Mind

* disable arrivals an leave announcement

* tips updated

* Enhance identity recognition and examination feedback

Added logic to display remembered character names during examination and improved the process for remembering character names on map initialization. Also updated localization files to include new examination feedback strings. Minor refactoring and bug fixes in identity recognition systems.

* Update CP14SharedIdentityRecognitionSystem.cs

* fix
2025-08-27 17:34:10 +03:00
Princess Cheeseballs
36c9f2006d [Bugfix] Fix Cross Grid Magboots (#39910)
* Augh

* Remove that

* ViewVariables property so it can be debugged at the very least.

* Remove

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-27 16:26:32 +02:00
Serylis of Five
00360968b7 Make Modular Grenades with Chemical payload respect their trigger delay (#39905)
* adds `KeysIn` data field to `ChemicalPayloadComponent`

And check when handling chemical payloads that a trigger key exists.

* Update Content.Server/Payload/EntitySystems/PayloadSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-27 00:26:13 +02:00
beck-thompson
8e8b318862 Fix chameleon backpacks not being able to be opened when locked (#39784)
* Fix chameleon backpacks not being able to be opened when locked

* rename

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-26 23:50:19 +02:00
InsoPL
c9c8fcbb82 Option to disable Crawling in Cvar (#39739) 2025-08-26 12:32:45 -07:00
slarticodefast
f4056e854b tool lock 2025-08-26 20:04:10 +02:00
beck-thompson
688c0b5884 Syndicate locks are now selectable (#39532)
* Syndicate locks are now selectable

* Minor tweaks

* Make not syndicate themed

* Address refview

* review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-26 16:18:10 +02:00
Perry Fraser
fd4a0a29b4 fix: Block EntityStorage from inserting into mechs (#37942)
This additionally moves the hard-coded check for HandsComp that
previously did this, and moves it into an event which now both
HandsSystem and MechSystem subscribe to.
2025-08-26 12:29:12 +02:00
Princess Cheeseballs
e8320cc9d8 [Bugfix] Fix topical self healing time multiplier not working (#39883)
* Commit

* Fix 2

* Prettier

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-25 11:05:55 -07:00
Ed
22edc77004 forgot this one 2025-08-25 20:46:10 +03:00
Red
4debb114e5 Magic system refactor part 1 (#1709)
* Refactor pacified block logic to action system

Moved pacified block functionality from magic spell components to the new CP14ActionSystem and related components. Removed CP14MagicEffectPacifiedBlockComponent and its logic, and introduced CP14ActionDangerousComponent for handling pacified checks. Updated examine and checks logic to use the new action-based components, improving separation of concerns between magic and action systems.

* finish pacified

* mobtargetstate refactor

* skillpoint cost refactor

* somaticAspect refactor

* material cost refactor

* mana cost now

* stamina cost

* SSD + verbal aspect

* religion

* music tool refactor

* vampire

* get rid of this event

* manacost refac

* Remove magicType field from spell definitions

Eliminated the 'magicType' property from all CP14MagicEffect components in spell YAML files across Electric, Fire, Life, Light, and Water categories. This streamlines spell configuration and may reflect a change in how magic types are handled in the system.

* Remove mana cost reduction effects from skill tiers

Eliminated the ModifyManacost effects from tier 2 and tier 3 skills in electromancy, healing, hydrosophistry, illusion, and pyrokinetic. This change standardizes skill progression and may be part of a balance update to mana cost mechanics.

* comment out T3 tiers

* namespace refactor

* fix hands
2025-08-25 20:40:10 +03:00
Ed
b13769a82c adapt codebase 2025-08-25 17:00:57 +03:00
Kyle Tyo
ffc7cc5e5d Combine AdminFrozenSystem in shared. (#39885)
commit
2025-08-25 15:49:27 +02:00
Ed
b8b17f7b8a Merge remote-tracking branch 'upstream/stable' into ed-25-08-2025-upstream-sync
# Conflicts:
#	.github/CODEOWNERS
#	Content.Client/UserInterface/Systems/Actions/Controls/ActionButton.cs
#	Content.Server/Administration/Systems/AdminVerbSystem.Antags.cs
#	Content.Server/Chat/Systems/ChatSystem.cs
#	Content.Server/Explosion/EntitySystems/TriggerSystem.cs
#	Content.Server/Nutrition/EntitySystems/SliceableFoodSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/Nutrition/Components/FoodComponent.cs
#	Content.Shared/Speech/ListenEvent.cs
#	Resources/Prototypes/Entities/Effects/admin_triggers.yml
2025-08-25 16:22:32 +03:00
Red
0a3bd9baba Adjust day/night cycle logic and lighting parameters (#1705)
Increased minimum light level and updated sun shadow directions for smoother transitions. Changed light curve calculation to use cosine, adjusted day detection threshold, and added a console command to check current light level. Renamed and fixed logic in CP14IsNight rule. Updated map and prototype files to use new ambient light colors and ensure consistency.
2025-08-25 02:03:24 +03:00
M4rchy-S
6c154fb79e Moving FlammableComponent to Shared (#39870) 2025-08-24 13:46:23 -07:00
Red
2df523061b Respawn button (#1702)
* Add respawn action for ghosts with confirmation popup

Introduces a new respawn action for ghosts, allowing them to return to the lobby and respawn as a new character. Adds supporting systems, localization, prototype definitions, and an icon for the action. The action includes a confirmation popup to prevent accidental use.

* Prevent respawning with the same character in a round

Introduces a system to block players from rejoining a round with a character that has already died, notifying them with a localized message. Refactors and moves respawn-related localization strings to new files for both English and Russian.

* Prevent admins from character reuse restriction

Added a check in CP14RespawnSystem to allow admins to bypass the restriction that prevents the same character from re-entering the round. This ensures that admin users are not limited by the character reuse logic.
2025-08-24 18:36:24 +03:00
Whatstone
b5529ecf2b Batchable lathe jobs, editable lathe job order (#38624)
* batchable lathe jobs, editable order

* requested changes

* LatheComponent comment, menu strings
2025-08-24 17:02:47 +02:00
slarticodefast
30aa61c29c Changeling cleanup and bugfix (#39843)
* fixes and cleanup

* key
2025-08-24 15:50:19 +02:00
Red
3c534069a4 Random tweaks (#1701)
* weather overlay offset

* sack head clothing

* remove raid

* less mushrooms, less muhrooms hat

* Update CP14VampireRuleSystem.cs

* Update base_clothing.yml

* fix

* Revert "Update base_clothing.yml"

This reverts commit e51d13fe77.

* Update backpacks.yml

* ашч

* double game preset

* Delete parts.yml

* Update sack.yml

* Update sack.yml

* g

* remove raids

* fuck you
2025-08-24 15:58:35 +03:00
Kyle Tyo
a8e0001f34 Cleanup of resolves and usings. (#39865)
* commit

* commit
2025-08-24 03:29:55 +02:00
āda
ab681dbcbb GameRuleOnTrigger (#39845)
* Gaming

* commit

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-24 01:10:55 +02:00
FungiFellow
ed7bea8e01 Inflatable Module (#35100)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-08-23 15:15:28 -07:00