392 Commits

Author SHA1 Message Date
Charlotte Tezuka
346539ba44 Last dance 2026-01-17 20:57:48 +02:00
Charlotte Tezuka
ea713efb05 Merge remote-tracking branch 'corvax/master' into upstream 2026-01-14 18:15:24 +02:00
GeneralGaws
2aa29de1ee Energy guns' fire mode text formating fix (#42103)
issue
2025-12-26 16:28:02 +00:00
slarticodefast
3266c94eac Unify BatteryComponent and PredictedBatteryComponent (#41867)
* unify

* cleanup and merge conflicts

* floating points

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-19 18:18:12 +00:00
Centronias
3c15d9f312 Adds BallisticAmmoSelfRefillerComponent (#38537)
* Adds BallisticAmmoSelfRefillerComponent

And uses it to replace battery-based refilling of the Syndicate L6 and Viper modules.

# Automagic Ballistic Ammo Refilling
- Add `BallisticAmmoSelfRefillerComponent`
- Handle `EmpPulseEvent` to pause refilling behavior for EMP's duration

# Supporting Changes
- Change `Content.Server.Weapons.Ranged.Systems.Update` override in `GunSystem.AutoFire.cs` to `UpdateAutoFire`
- Add `Content.Server.Weapons.Ranged.Systems.Update` to `GunSystem.cs` so that it can call `UpdateAutoFire` and `UpdateBallistic`
- Add public methods to GunSystem for use by refilling implementation
  - PauseSelfRefill
  - IsFullBallistic (same as #299)
  - CanInsertBallistic (same as #299)
  - TryBallisticInsert (same as #299)

* _timing -> Timing

* unspawned count stuff

* imagine building the code before pushing

* - apply to c20r ROW
- make predicted/shared

* revert server system import only changes

* oop

* o great and wise Slarti

* Scar comments

* field deltas + correct serializer

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-12-17 22:52:32 +00:00
JunJun
e9616e5244 Gun Tweaks (#430)
* base

* commnts add

* fix
2025-12-15 14:18:50 +03:00
metalgearsloth
51b7af73f7 Double bullet speeds (#34971)
* Double bullet speeds

The only reason we had it at 20m/s was tunneling reasons.

The quick maths is (BodyA size + BodyB size) / frametime. Currently the game is doing substepping AFAIK so we can use 0.016 as the frametime therefore with a 0.40 width body we can get up to 40.625 (assuming the target is no narrower than 0.25 which given my thindows change last year should be a decently safe assumption).

* Fix

* Fix impact visuals, as they overshoot otherwise

* Revert changes

---------

Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-12-07 16:35:06 +00:00
Errant
3eae394d24 Stable into Master (#41656)
[HOTFIX] FIX LIGHT MELEE LOGS (#41655)

God fugcking

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-01 12:19:23 +01:00
Princess Cheeseballs
c5e2c70eab [HOTFIX] FIX LIGHT MELEE LOGS (#41655)
God fugcking

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-01 03:01:04 -08:00
slarticodefast
e2ff167062 Predict powercells, chargers and PowerCellDraw (#41379)
* cleanup

* fix fixtures

* prediction

* fix test

* review

* fix svalinn visuals

* fix chargers

* fix portable recharger and its unlit visuals

* fix borgs

* oomba review

* fix examination prediction
2025-11-24 16:52:11 +00:00
Charlotte Tezuka
1595f938d3 Merge remote-tracking branch 'corvax/master' into wl-upstream 2025-11-11 16:35:48 +02:00
Sir Warock
5ec141b955 Fix Ammo Visuals Bug (#41362)
Fix Ammo Count Updating
2025-11-09 07:42:55 +00:00
SlamBamActionman
9133aca00b Fix walls and other unanchorable objects being unanchored by the G.O.R.I.L.L.A gauntlet (#41219)
* Initial commit

* Review fixes

* Bitwise? Yeah my wisdom score is a 10

* Review comments
2025-11-01 15:16:51 +00:00
Sir Warock
79035cd023 Fix Assumption of Nullable to have value (#41220)
* Fix Potential Test Fail

* Please the maintainer gods
2025-10-31 17:17:58 +00:00
SnappingOpossum
1cc726a609 Allow pacifists to use disabling modes of energy magnum and energy shotgun (#41029)
Pacifists can stun with emagnum and eshotgun
2025-10-30 19:19:36 +00:00
Hannah Giovanna Dawson
cdbe92d37d Update DamageableSystem to modern standards (#39417)
* Update DamageableSystem to modern standards

* DamageContainerId -> DamageContainerID with lint flag

* Replace strings with protoids

* Make CVar subscription declarations all consistently whitespaced

* ChangeDamage -> TryChangeDamage, cope with C# jank

* Revert event signature changes

* Restore a comment

* Re-add two queries

* Init the queries

* Use appearanceQuery in DamageChanged

* Use damageableQuery in TryChangeDamage

* Use damageableQuery in SetDamageModifierSetId

* Final cleanup, fix sandboxing

* Rectify ExplosionSystem:::ProcessEntity's call to TryChangeDamage

* Re-organize DamageableSystem

* first big fuck you breaking change.

* THATS A LOT OF DAMAGE!!!

* Fix test fails

* test fixes 2

* push it

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-10-27 19:53:04 +00:00
Kyle Tyo
1250b388f3 Mosin be tested, Verin be breaded. (#40957)
* Create WeaponSniperTests.cs

* Update SharedGunSystem.cs

* requested changes.

* Update WeaponTests.cs

* rerun tests

* Update WeaponTests.cs

* Update WeaponTests.cs

* Update Content.IntegrationTests/Tests/Weapons/WeaponTests.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-10-21 15:40:41 +00:00
beck-thompson
492a1aa9c3 Hitscans are now entities (#38035)
* Hitscans are now entities

* Cleanup

* Cleanup

* Silly mistakes but stop sign testing helps :)

* Address most of the review

* Reviews

* perry :(

* Final reviews

* Add comments

* Split event up

* better comment

* cleanup
2025-10-18 05:42:08 +00:00
Callmore
2696fd7cd5 Automatically add trash tag to spent bullet casings (#40829)
* Automatically add trash tag to spent bullet casings

* Resolving comments

* 2

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Cartridges/pistol.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-10-12 18:34:20 +00:00
slarticodefast
af05313f37 fix NetEntity datafield in JointVisualsComponent (#39987)
fix netentity datafield
2025-10-10 23:59:56 +00:00
slarticodefast
a6dce11566 Predict damage examine (#40168)
* predict damage examine

* .

* required true

* nits

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-10-10 23:23:26 +00:00
Charlotte Tezuka
1d11757bb0 Upstream 09.10 2025-10-09 14:18:23 +02:00
Sir Warock
f3202dcff9 Fix Shotgun ammocount not updating (#40568) 2025-09-29 10:28:28 +00:00
Charlotte Tezuka
d5e69e73e5 Upstream from corvax/master 19.09 2025-09-19 00:42:32 +02:00
slarticodefast
a4368264f0 Add chasm integration tests (#40286)
* add chasm integration test

* fix assert

* fix

* more fixes

* review
2025-09-17 14:19:46 +10:00
slarticodefast
8171589f56 fix chasmsystem resolve error (#40281) 2025-09-11 03:00:55 -07:00
Hayden
2315ea6ac2 Being grappled with a grapple gun allows you to cross chasms (#39983)
* Being grappled with a grapple gun allows you to cross chasms

Closes #31698

* Update Content.Shared/Weapons/Misc/SharedGrapplingGunSystem.cs

* AAAAAAAAAAAAAAAAA

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-09-07 17:34:00 -07:00
Kyle Tyo
a8e0001f34 Cleanup of resolves and usings. (#39865)
* commit

* commit
2025-08-24 03:29: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
Princess Cheeseballs
9de76e70c7 EVENT BASED WEIGHTLESSNESS (#37971)
* Init Commit

* Typos

* Commit 2

* Save Interaction Test Mob from failing

* ssss

* Confident I've gotten all the correct prototypes

* Whoops forgot to edit those

* aaaaa

* Better solution

* Test fail fixes

* Yaml fix

* THE FINAL TEST FIX

* Final fix(?)

* whoops

* Added a WeightlessnessChangedEvent

* Check out this diff

* Wait I'm dumb

* Final optimization and don't duplicate code

* Death to IsWeightless

* File scoped namespaces

* REVIEW

* Fix test fails

* FIX TEST FAILS REAL

* A

* Commit of doom

* borgar

* We don't need to specify on map init apparently

* Fuck it

* LOAD BEARING COMMENT

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-19 14:35:09 -04:00
ssdaniel24
8b848fc21a Merge remote-tracking branch 'corvax/master' into wl-upstream-sync 2025-08-12 11:47:33 +03:00
Kyle Tyo
ca18576625 Predict base and damage examines of cartridge ammo. (#39401)
* commit

* requested changes +
2025-08-06 16:29:57 +02:00
slarticodefast
2c40a950f7 Trigger Refactor (#39034) 2025-08-03 21:20:37 +02:00
Litogin
05798ddf3d add log 0 damage (#199) 2025-08-01 11:05:15 +03:00
Pieter-Jan Briers
5f52a3ae17 [Mald PR] Plushie sound 1984 (#39250)
* Make melee sounds respect their audio params

* Make food sounds respect audio params

* Plushie sound 1984

Most plushies have been made quieter (by varying degrees depending on how obnoxious the original sound was)

Made plushies 3x slower to use (squeak every 3 seconds / hit somebody every 3 seconds)
2025-07-28 03:11:21 -04:00
ssdaniel24
6591aabe4f Merge remote-tracking branch 'corvax/master' into upstream-07-23 2025-07-23 22:35:40 +03:00
slarticodefast
9a7cb00d4e Content fixes for engine PR (#39086)
* content changes for engine PR

* rerun tests
2025-07-22 12:25:28 +02:00
Princess Cheeseballs
e85bc1bb8c Stunnable New Status and Cleanup (#38618)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-07-21 19:22:11 +02:00
Princess Cheeseballs
391dfe4f4a Crawling Fixes 2: Salvage Nerf (NPCs can shoot downed targets) (#39085)
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-07-20 23:23:25 +02:00
Princess Cheeseballs
dec2d42a1d Crawling Part 1: The Knockdownening (#36881)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-20 01:54:42 +02:00
ScarKy0
975ebac202 Fix Mjollnir throw while on delay (#39018)
* init

* fuck dirty

* yippee
2025-07-16 22:27:21 +02:00
KOTOB
f3ce428165 SharedGunSystem spread bugfix (#38960)
two bytes
2025-07-12 23:59:05 -04:00
Perry Fraser
80c6650730 fix: wide swings with resistanceBypass now bypass resists (#38496) 2025-07-10 00:48:45 -07:00
Tayrtahn
75db49f9c0 Clean up all missing EntitySystem proxy method uses (#38353) 2025-06-26 16:50:49 -07:00
Nemanja
524725d378 HandsSystem Refactor (#38438)
* checkpoint

* pt 2

* pt... i forgot

* pt 4

* patch

* More test fixes

* optimization!!!

* the REAL hand system

* fix RetractableItemActionSystem.cs oversight

* the review

* test

* remove test usage of body prototype

* Update Content.IntegrationTests/Tests/Interaction/InteractionTest.cs

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* hellcode

* hellcode 2

* Minor cleanup

* test

* Chasing the last of the bugs

* changes

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-06-25 15:13:03 +02:00
kosticia
9c0ea2528e show reflection prob on examine (#38199)
* goaaaaaaaal

* hmmmmmmmmmm... sorry aeshus, but thats sucks

* adwaswa

* reviev

* awdasdws

* redo

* should work

* mistake

* change
Co-authored-by: Tayrtahn Tayrtahn@users.noreply.github.com

* Update Resources/Locale/en-US/reflect/reflect-component.ftl

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
2025-06-18 02:50:01 +02:00
ssdaniel24
3fc0562c41 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-06-10
Conflicts:
	Content.Server/GameTicking/GameTicker.Spawning.cs
	Resources/Credits/GitHub.txt
	Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml
	Resources/Prototypes/Entities/Objects/Tools/jetpacks.yml
	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
	Resources/Prototypes/GameRules/cargo_gifts.yml
	Resources/Prototypes/Maps/omega.yml
	Resources/Prototypes/Reagents/Consumable/Drink/alcohol.yml
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
	Resources/Textures/Mobs/Customization/reptilian_parts.rsi/tail_large_wagging.png
2025-06-10 22:07:39 +03:00
Krunklehorn
c2b1b81ec8 Add checks for various complex interactions (#37246)
* Prevent toggling radiation collectors

* Prevent resisting locks

* Prevent unbuckling others, early exit before doafter

* Prevent camera and camera router setup

* Prevent rotating and flipping

* Also prevent adding the unbuckle verb.

* Revert ResistLocker changes

* Prevent emitter tampering

* Also prevent lock verb

* Prevent toggling welders

* Prevent gun open/close bolt, rack and switch mode

* Prevent toggling stun batons
2025-06-02 10:06:45 -07:00
ssdaniel24
d399099102 Merge remote-tracking branch 'corvax/master' into wl-upstream-sync-try-2
Conflicts:
   Content.Client/Humanoid/HumanoidAppearanceSystem.cs
   Content.Client/LateJoin/LateJoinGui.cs
   Content.Client/Stylesheets/StyleNano.cs
   Content.Server/Administration/Systems/AdminVerbSystem.Tools.cs
   Content.Server/Fax/FaxSystem.cs
   Content.Server/GameTicking/GameTicker.Spawning.cs
   Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
   Content.Server/Station/Systems/StationSpawningSystem.cs
   Content.Shared.Database/LogType.cs
   Content.Shared/Ghost/GhostComponent.cs
   Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
   Content.Shared/Preferences/HumanoidCharacterProfile.cs
   Content.Shared/Roles/SharedRoleSystem.cs
   README.md
   Resources/ConfigPresets/Corvax/common.toml
   Resources/Credits/GitHub.txt
   Resources/Locale/ru-RU/ss14-ru/prototypes/entities/mobs/cyborgs/base_borg_chassis.ftl
   Resources/Maps/Shuttles/trading_outpost.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Command/iaa.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/brigmedic.yml
   Resources/Prototypes/Corvax/Roles/Jobs/Security/pilot.yml
   Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
   Resources/Prototypes/Entities/Mobs/Customization/Markings/reptilian.yml
   Resources/Prototypes/Entities/Mobs/Cyborgs/base_borg_chassis.yml
   Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
   Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
   Resources/Prototypes/Entities/Structures/Machines/chem_master.yml
   Resources/Prototypes/Entities/Structures/Power/substation.yml
   Resources/Prototypes/GameRules/cargo_gifts.yml
   Resources/Prototypes/GameRules/events.yml
   Resources/Prototypes/GameRules/meteorswarms.yml
   Resources/Prototypes/Maps/bagel.yml
   Resources/Prototypes/Reagents/Consumable/Drink/drinks.yml
   Resources/Prototypes/Reagents/chemicals.yml
   Resources/Prototypes/Reagents/medicine.yml
   Resources/Prototypes/Reagents/pyrotechnic.yml
   Resources/Prototypes/Reagents/toxins.yml
   Resources/Prototypes/Recipes/Cooking/meal_recipes.yml
   Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
   Resources/Prototypes/Roles/Jobs/Command/captain.yml
   Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
   Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
   Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
   Resources/Prototypes/Roles/Jobs/Medical/paramedic.yml
   Resources/Prototypes/Roles/Jobs/Science/research_director.yml
   Resources/Prototypes/Roles/Jobs/Security/detective.yml
   Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
   Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
   Resources/Prototypes/Roles/Jobs/Security/warden.yml
   Resources/Prototypes/Voice/disease_emotes.yml
   Resources/Prototypes/Voice/speech_emotes.yml
   Resources/Prototypes/radio_channels.yml
   Resources/Textures/Effects/speech.rsi/meta.json
   Resources/Textures/Interface/Default/Slots/id.png
   Resources/Textures/Interface/Minimalist/Slots/pda.png
   Resources/Textures/Mobs/Customization/reptilian_parts.rsi/meta.json
   Resources/Textures/Mobs/Silicon/chassis.rsi/meta.json
   RobustToolbox
2025-06-02 12:30:02 +03:00
Centronias
9053c9692f Decouple Lights from Toggleable Visuals (and headphone music notes bugfix) (#35341)
* - Combine enum keys `ToggleableLightVisuals` and `ToggleVisuals` into `ToggleableVisuals`
- Rename `ToggleableLightVisualsComponent` to `ToggleableVisualsComponent` and `ToggleableLightVisualsSystem` to `ToggleableVisualsSystem`
  - (The `SpriteLayer` field on the component is now required because the old default of `light` doesn't make sense anymore)
- Make it so that `ToggleableVisualsComponent` works even when there's not a light attached to the entity
  - (Amazingly this seems to have only applied to  Headphones, but I can only imagine there are many other things people would like to do with simple toggleable visuals)
- Explicitly make `ItemTogglePointLightComponent`'s purpose to make `ToggleVisualsComponent` apply to `PointLightComponent`s on the same entity.
  - Add field `ToggleableVisualsColorModulatesLights`, which makes the `Color` appearance value of `ToggleableVisuals` modulate the color of lights on the same entity
  - Lots of prototype updates to uptake the above

* fix bad merge

* unbork robust

* blindly letting rider reformat stuff

* I guess I never cleaned up these imports at all
2025-05-30 19:53:56 -04:00