Commit Graph

11433 Commits

Author SHA1 Message Date
Nim
fbef31dfa6 return simple armour (#1770) 2025-09-13 15:22:02 +03:00
Nim
62a9ca1cfc nerf fire trap (#1768) 2025-09-12 17:24:18 +03:00
Kit
ab0add0f32 Condense (#1765) 2025-09-11 12:33:03 +03:00
Red
38f1a765d7 Some random tasks (#1763)
* Update venicialis.yml

* Update CP14CurrencySystem.Converter.cs

* fix #1759

* fix #1605

* fix #1604
2025-09-11 00:22:21 +03:00
Alexsey Bezyuk
a210244768 Goblins T2 Athletic (#1762) 2025-09-10 18:39:23 +03:00
Red
8e18c5e121 Bugfix + Carcat nerf (#1761)
* fix #1758

* nerf carcat

* fix #1747
2025-09-10 15:51:16 +03:00
4g10w
e6695858cb Armorattus Valoricus (#1675)
* Rat and armor

Added rat mob and rat armor.
Slightly changed interaction popup system to allow for both picking up
and hugging interaction. This adds an "Interact" item to context menu of
interactable (huggable) objects.
Trying to make it in a way that allows for more pets to be added later.

* Rat ghost role

Rat:
- added ghost role with descriptions and rules
- added hand
Rat armor:
- added crafting recipe

* Ghost role, armor and adjustments

Added:
- Ghost role spawner for rat

Changed:
- AI-controlled rat will now retaliate if attacked
- Rat is now a bit slower
- Playable humanoid races can no longer wear rat armor

Removed:
- Rat's hand because it leads to unwanted interactions
- Rat will no longer stabilize the demiplane, so it will collapse if rat
is the only player-controlled entity left. This is done because without
a hand rat cannot leave the demiplane on it's own

* Armor cost, Rat hunger, Rat ghostrole
Tweaks and Fix
Added:
- Rat's hunger level is now visible when examining it
Changed:
- Rat gets hungry slower than before. When starving it takes less damage and slows
  down by less amount
- Rat ghostrole prototype moved to it's own directory
Fixed:
- Rat armor physical composition now makes sense and costs exactly like
  it's ingredients

* fixing the rat armor composition... again

* Armor and HP tweaks

Changed:
- Lowered protection values given by rat armor to lower the price
- Increased crafting price for rat armor from 2 iron ingots to 6. A lot
of wasted material for such delicate work I suppose.
- Increased rat's HP by 10 to counter armor changes

* Removed interaction
Reverted InteractionPopupSystem and deleted interaction texts for rat

* Updated licenses and authorships of sprites

* fixed license and removed interaction from rat prototype

* Fixed armor looking wrong in rat's dead state

* Removed unnecessary images from rat.rsi

* Removed IronSmelting skill requirment since currently smith is removed

* Rat's size changed from Tiny to Normal to reflect how bigass this rat really is

---------

Co-authored-by: Nim <128169402+Nimfar11@users.noreply.github.com>
2025-09-10 11:31:44 +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
Nim
fb18edcedc MessyDrinker (#1756)
Co-authored-by: Red <96445749+TheShuEd@users.noreply.github.com>
2025-09-09 10:44:10 +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
Kit
d9814b1eb2 Alch guidebook refactor (#1717)
* ALCHEMY GUIDEBOOOK!!!!!

* forgoten translation

* FIXES!!!!!

* Requested translation changes
2025-09-08 02:45:11 +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
Red
ab7e3204f1 Adventure guild returns (#1745)
* adventure guild

* fix order board

* fixes

* loadout + fix

* commit
2025-09-07 19:15:29 +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
Viator-MV
dd930f513c fixing unnoticed bugs for new weapons (#1740)
* NO TIME TO EXPLAIN

* fix
2025-09-06 15:49:39 +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
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
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
Nim
188901bdfb Fix crate and skeleton (#1730)
* fix crate

* barrel

* T2 skeleton
2025-09-01 15:07:27 +03:00
Kit
f21cca0a1a Spineguard (#1659)
* sprites

* toxin

* spineguard

* spawning

* passive regen

* merge conflict fixes

* again

* again 2

* readd stuff

* agh

* requested changes
2025-08-30 10:27:03 +03:00
Princess Cheeseballs
c061798f4b [STAGING] 1984 Derelict Syndicate Borgs (#39978)
1984

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-29 16:28:28 -07:00
Vortebo
679c641611 Major Relic Update (#39215)
* goodbye cargo. you dont exist at all. no more cargo.

* Med, atmos

* relic is going to prison

* i changed some stuff

* i changed some more stuff

* substantial completion for engineering

* substantial completion for medical

* substantial completion, atmos

* substantial completion, shuttles

* hallway lighting improvements

* substantial completion, prison station

* honestly i think this looks better

* prison station electrical, spawn adjustments

* prison shuttle now flyable

* substantial completion, science

* substantial completion, oldstation

* minor accuracy adjustments

* minor corrections, finishing touches

* minor adjustments and fixes

* electrical fix, canon camera names

* signage adjustments

* network fixes

* more inaccuracies fixed

* fixed atmos and medkit issues

* arrivals shuttle flies forward

* adjustments

* adjustments

* adjustments

* deltaP adjustments

* invalid configurators removed
2025-08-28 11:40:36 -06:00
Hitlinemoss
84e0a0f6fa Improved cardboard-weapon descriptions (#39927) 2025-08-28 19:14:44 +02:00
Deserty0
704527bd2c Master fix (#1715)
* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit dc7e25e8f7.

* Update secret_weights.yml

* Update secret_weights.yml
2025-08-28 17:34:12 +03:00
Winkarst-cpu
5028161c7b New Feature: Symptoms of radiation poisoning (#39805)
* New Feature

* Cleanup

* Bump threshold

* Update

* Update

* Single change

* Me when I forgor the yaml

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-27 14:56:09 -07:00
Blaine Pavlock
2ebdd9d4cd Reagents now drop when dispensers are deconstructed (#39676)
* Reagents now drop when dispensers are deconstructed

* Updated containers to include beakerSlot types

* Update Resources/Prototypes/Entities/Structures/Dispensers/base_structuredispensers.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-27 23:06:50 +02:00
Princess Cheeseballs
ecc499a7d5 [Bugfix] Generators can now be weightless. (#39787)
FIX

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-27 22:37:31 +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
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
Hitlinemoss
60ea2b37fb Clipboards added to autolathe (and other folder changes) (#37705)
* Added plastic clipboards; added plastic clipboards to the PTech machine; added clipboards & plastic clipboards to the autolathe

* Fixed plastic clipboard inhand sprites; added and implemented 'empty' clipboard prototypes

* Cleaned up code for empty clipboards; removed BoxFolderBaseEmpty since now it's redundant

* Extensive folder cleanup

* Bugfixed random folder spawns

* Reduced amount of paper in CrateServiceBureaucracy

* Medical folder sprite rename

* BaseTraitorSocialObjective sprite fix

* Added office paper to bureaucracy crate

* First pass at addressing recent review

* Second pass at addressing recent review

* Fix of weird migration.yml error

* whoops, forgot to undo the rename to folder-white.png in the last few commits

* whoops, didn't commit that last commit properly

* whoops, forgot to undo this reordering
2025-08-27 09:07:32 +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
FungiFellow
1800be1f58 Prevented Engiborgs from picking up AI lawboards (#39730)
Update borg_modules.yml
2025-08-26 22:59:23 +02:00
slarticodefast
931dec8e28 Remove the dynamic game mode from player votes (#39902)
disable
2025-08-26 21:42:18 +02: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
ToastEnjoyer
2f752f2e59 Fixed pacified people using the laser carbine (#39891) 2025-08-25 17:44:01 -07: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
f77aec1720 Update water_creation.yml 2025-08-25 17:24:41 +03:00
Ed
add7fc6362 Update water_creation.yml 2025-08-25 17:12:41 +03:00
Ed
b13769a82c adapt codebase 2025-08-25 17:00:57 +03: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