8815 Commits

Author SHA1 Message Date
Remuchi
4c8c415eed [Fix] Парад фиксов (#1110)
* fix: thermals and night vision now work

* fix: it has to be this way

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* fix: I hate the way they are separated

* fix: now cult actions close examine menu (#1046)

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* fix: railins and some other things now dont snap to south upon being built (#1029)

* fix: who did this translation wtf

* fix: assball bat can now wideswing (#1030)

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* fix: spend flares are actually spent now (#959)

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* fix: made part exchange system a bit less shitty

I really have no time or interest in it to rewrite it completely rn

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* fix: fixed cult factories timers being broken

Also fixed them being openable by anyone.

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>

* Apply suggestions from code review

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>

---------

Signed-off-by: Remuchi <RemuchiOfficial@gmail.com>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>
2026-04-16 10:53:08 +03:00
DDDecard
bd18b730f7 Различные исправления (#1103)
* fix dead mobs bonking when entering biomass reclaimer

* fix animals cooling resistance

* fix dupe pill canisters in chemmaster

* balance jaws of life

* fix

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* update

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Chemistry/EntitySystems/ChemMasterSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/Clumsy/ClumsySystem.cs

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2026-04-11 17:44:11 +03:00
Gersoon
3fa3c5af9f Almagest update 2 (#1104)
* AutoEquip+redEdit

* guns+projectile+equip for red

* rsi fix

* +blue

* review suggestion

* startingGear + deleteSpawnOnGamerule

* DeleteSpawnOnGamerule + map

* +magboots for marine

* 1

* 2

* 3

* +grenades

* final + fix

* fix

* fix2

* fix3

* Update Content.Server/_White/PVS/PVSIgnoreSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Mining/MeteorSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Mining/MeteorSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Mining/MeteorSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/_White/PVS/PVSIgnoreSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Projectiles/ProjectileSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Shared/_White/PVS/PVSIgnoreComponent.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Projectiles/ProjectileSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Projectiles/ProjectileSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Content.Server/Projectiles/ProjectileSystem.cs

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>

* Fix govna ya ebal

* fixWalls

* Apply suggestions from code review

Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* fix hz

* fix hz2

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>
2026-04-04 19:12:16 +03:00
DDDecard
568e2cb27e fix AME energy calculation (#1096)
* fix AME energy calculation

* ops

* ops 2

* fix

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* add link

Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
Co-authored-by: RedFoxIV <38788538+RedFoxIV@users.noreply.github.com>
2026-03-31 12:57:50 +03:00
kekoven1
0c1692fb2c [add] normiz telekinez (#1086)
* ver1

* Update psionic.ftl

* Update psionic.ftl

* weakness

* r34I0rФ4к367676767
2026-03-30 22:51:59 +03:00
Gersoon
97d1ad3dde AlmagestV3 First update (#1088)
* AutoEquip+redEdit

* guns+projectile+equip for red

* rsi fix

* +blue

* review suggestion

* startingGear + deleteSpawnOnGamerule

* DeleteSpawnOnGamerule + map

* +magboots for marine

---------

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2026-03-22 14:30:39 +02:00
Gersoon
15cc3b830d AlmagestV3Fix (#1083)
* Fix

* FixOfFix+sound
2026-03-15 21:56:40 +07:00
Spatison
3183a7afe7 Battle ship 2 (#1080)
* fix

* fix replay

* fix label
2026-03-08 15:24:53 +02:00
Spatison
698c6a1079 Merge pull request #1076 from Spatison/battle-ship
Battle ship
2026-03-06 12:13:42 +02:00
DVONIKS
b8a815b35c Merge pull request #1071 from Spatison/wizmerge
Wizmerge
2026-02-15 00:29:25 +02:00
Spatison
159bf33cab fix wizmerge 2026-02-15 01:02:58 +03:00
Leon Friedrich
a83dd82934 Add role prototype validation tests (#32801)
* Add role prototype validation test

* Rejig GetPrototypesWithComponent

* More tests n stuff

(cherry picked from commit 4e0018697fbc358e6c0bb3243e67f05b126e5f9e)
2026-02-15 00:11:24 +03:00
Spatison
8e5d669987 Generic animations (#1067)
* generic animation

* AnimateOnHit

* Dynamic Value

* AnimateOnStartup

* Animated Emotes

* Play Animation Command

* RedFox review

* Rabbit review

* RedFox review

* PlayClient

* Rabbit review

* RedFox review
2026-02-13 21:40:44 +02:00
Spatison
782c6bba3e Иправление тестов (#1069)
* fix test

* fis Amalgest2(#1068)

* fuck

* fix test
2026-02-13 21:40:00 +02:00
Spatison
69b59fe875 Merge branch 'master' into wizmerge
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Tools/handheld_mass_scanner.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Launchers/launchers.yml
#	Resources/Prototypes/Recipes/Lathes/devices.yml
2026-02-13 19:59:55 +03:00
Mervill
226b2fed8e Remove some wayward folder includes in the csproj (#31244)
remove some wayward folder inlcudes

(cherry picked from commit 9331e80a057d62aec43ca40d7d934d05569b9353)
2026-02-13 19:14:22 +03:00
Coolsurf6
a4189d8de8 Added Pain Numbness Trait (#34538)
* added pain-numbness component and system

* added numb as a trait that pulls the pain numbness component

* removed new event as mob threshold event as already being fired

* checked for MobThresholdsComponent first before running VerifyThresholds

* refacted force say to using LocalizedDatasetPrototype and added numb messages

* added severity check alert

* added comment for BeforeForceSayEvent

* removed space formatting

* changed Cancelled to CancelUpdate, fixed spacing and added two more damage-force-say-numb

* changed prefix damage-force-say-numb to 5 (whoops)

(cherry picked from commit 012c8355594823bc327fc42693a43a7c00f0caf9)
2026-02-13 17:48:10 +03:00
AJCM-git
979a862735 Fixes the ShowRulesCommand and the client not syncing rules correctly (#28752)
(cherry picked from commit c339773b5f6823630e9fa04bbec2dd1d87e521ff)
2026-02-12 22:42:48 +03:00
themias
dd9a15ea14 Fix muzzle accent (#34419)
(cherry picked from commit 771278df5495b717b6ad9ce60100bd64b68b3937)
2026-02-12 19:12:00 +03:00
Nemanja
3598317469 fix and buff the handheld mass scanner (#31284)
(cherry picked from commit 65c0b699f283d848c94fd26eb7a061643e749109)
2026-02-11 20:30:43 +03:00
Simon
a5d56e183a Fix some markup related obsolete warnings in research and anomaly related systems (#30072)
Fix some Markup related obsolete warnings in Research and Anomaly related systems

(cherry picked from commit b35539db4a800559926a6e998b7f38e5cfc9365e)
2026-02-11 20:00:27 +03:00
Leon Friedrich
2df51c76ec Optimize & clean up RadiationSystem (#34459)
* Optimize & clean up RadiationSystem

* comments

* Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
(cherry picked from commit 9d4e60068ba3bc68303a742cd993827ff20315f6)
2026-02-11 19:50:59 +03:00
metalgearsloth
6e10efe4aa Predict some power PowerReceiver stuff (#33834)
* Predict some power PowerReceiver stuff

Need it for some atmos device prediction.

* Also this

(cherry picked from commit 75a7407e33f328c230ad7309b0d1571a4f7f8256)
2026-02-11 19:44:36 +03:00
Luiz Costa
78b2e1282d Fix TEG acting as infinite energy source on destruction (#29972)
* TEG now checks for power supply before checking for IsFullyBuilt

* Update Content.Server/Power/Generation/Teg/TegSystem.cs

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
(cherry picked from commit 9c905cd58f5453c6ab7821709bdbf5fcf1249df9)
2026-02-11 19:31:28 +03:00
Partmedia
55384ad772 Fix incorrect use of atmos dt (#29112)
(cherry picked from commit 388d372ee8eac2e2af39cfed142ea90fb69fa212)
2026-02-11 19:31:05 +03:00
Partmedia
639829a78b Adjust TEG efficiency curve, remove heat transfer limit (#29050)
The TEG used to limit hot-cold energy transfer based on actual power drawn, and had maximum efficiency at whatever temperature difference. This PR adjusts the hot-cold energy transfer to be uncapped, "venting" the excess heat that is not used to generate power, and adds an efficiency curve that limits efficiency at low thermal temperatures.

People have been cheesing the TEG by hooking up the hot end to the CO2 miner (which produces infinite, room-temperature gas) and the cold end to a space radiator.

With this change, you will actually need to set up a burn chamber in order to get appreciable power out of the TEG (see below).

If you build a gas holding chamber, you will have to throttle the gas flowing into the TEG instead of constantly cycling the gas through over and over again.

(cherry picked from commit 6835e6b4aa40967ca7263a2ae8391a33ab2d0b2d)
2026-02-11 19:30:42 +03:00
Pieter-Jan Briers
ec7e1213f8 Fix powered machines working unpowered if the panel is open. (#32135)
(cherry picked from commit 8385de8769fe8835e9ed74641d5c42bae6dc125c)
2026-02-11 19:19:18 +03:00
metalgearsloth
eb84ecc7d9 Predict ActivatableUIRequiresPower (#28405)
A lot of BUIs aren't going to handle the state coming in cleanly but we can fix em as we find em.

(cherry picked from commit e4a5f2a1450d226bf281e46f1323f41213707bb6)
2026-02-11 19:15:04 +03:00
Cooper Wallace
8d7752467a Wizard Recall shows Disappearing text at Coordinate (#35272)
* Add prediction for coordinate based popups

* Remove use of deprecated EntityCoordinates.ToMap

* RecallItem displays disppearing text at entity coordinates

* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Popups/SharedPopupSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Add ItemRecall message for witnesses

* Update Content.Shared/ItemRecall/SharedItemRecallSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Locale/en-US/item-recall/item-recall.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Fix namespace issues

* Fix Loc string

* Dont fixstuff tired..

* Prefix THE

* Filter around the entity, and remove recipient if needed

* Alphabetical imports

* Update Content.Client/Popups/PopupSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* fixup

* Better handling.

---------

Co-authored-by: Cooper Wallace <CooperWallace@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit e0d911bc4727c33f3cf68cb1cdce464a04a29d8b)
2026-02-11 18:44:33 +03:00
Ed
39261517d5 Fix embeddable projectiles dissapearing (reopening) (#35153)
(cherry picked from commit 244d7a629e05a1397d9c2254a77001d2a50cc8fd)
2026-02-11 18:42:23 +03:00
TemporalOroboros
e9465642ed Purges uses of TransformComponent.WorldMatrix and TransformComponent.InvWorldMatrix (#34944)
(cherry picked from commit dc67a5a0ba591ae2c8219ab900920fd24b591b0d)
2026-02-10 15:32:56 +03:00
Julian Giebel
74072829b2 Implement map text (#28705)
(cherry picked from commit de07c291de827bd8a2e843974d4362a13be3bb89)
2026-02-10 15:18:38 +03:00
Spatison
dfa90bb047 fix wizmerge 2026-02-10 10:30:22 +03:00
c4llv07e
72776b5253 Add telegram to the server info-links (#33459)
(cherry picked from commit 646d41d3a7824168053349ce6159bac5acec2eb9)
2026-02-09 21:21:39 +03:00
SlamBamActionman
3563c92a2e Implanter draw rework (#32136)
* Initial commit

* Clean-up

* Fix ftl, new damage

* ftl fix for real

* Updates based on feedback

* Child implant fix

* Make the UI only open when implanter is in draw mode

* Review fixes

* shunting

(cherry picked from commit 41c51e29052c16f092e6941f7e9ccfd14dfb3dae)
2026-02-09 20:24:42 +03:00
metalgearsloth
d64ffc9b00 Add sun shadows (planet lighting stage 2) (#35145)
* Implements a Dynamic Lighting System on maps.

* Edit: the night should be a little bit brighter and blue now.

* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.

* Edit: The offset is now serverside, this makes the time accurate in all situations.

* Removing ununsed import

* Minor tweaks

* Tweak in time precision

* Minor tweak + Unused import removed

* Edit: apparently RealTime is better for what I'm looking for

* Fix: Now the time is calculated correctly.

* Minor tweaks

* Adds condition for when the light should be updated

* Add planet lighting

* she

* close-ish

* c

* bittersweat

* Fixes

* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"

This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.

* Europa and day-night

* weh

* rooves working

* Clean

* Remove Europa

* Fixes

* fix

* Update

* Fix caves

* Update for engine

* Add sun shadows (planet lighting v2)

For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.

* Documentation

* a

* Fixes

* Move blur to an overlay

* Slughands

* Fixes

* Apply RoofOverlay per-grid not per-map

* Fix light render scales

* sangas

* Juice it a bit

* Better angle

* Fixes

* Add color support

* Rounding bandaid

* Wehs

* Better

* Remember I forgot to do this when writing docs

---------

Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com>
(cherry picked from commit f51b9bc86e3762476a450c24ff4d632118ea9c2d)
2026-02-09 20:07:32 +03:00
metalgearsloth
c5d6f06e23 Add CanLoad for biomes (#33050)
CPUJob to come later.

(cherry picked from commit d7a1753c7dcd2606f9345c072456781736b3061f)
2026-02-09 20:06:09 +03:00
Gersoon
ba0fe864c9 Amalgest2 (#1068)
* Base

* Base2

* NoMap

* Update Almagest.yml

* Fix
2026-02-08 18:17:47 +03:00
chromiumboy
5259617541 Holopad UI tweak for incoming calls (#34137)
* Initial commit

* Update

* Comment correction

* Minor margin increase

(cherry picked from commit c1c4b1c9a478aac5b9f516d27d8381f7ba8a62f3)
2026-02-08 14:43:43 +03:00
chromiumboy
1810a8d4bb Minor fixes for the holopad (#33969)
Initial commit

(cherry picked from commit 39600f9516bbb6e53fd2ccda3a13855195629086)
2026-02-08 13:38:25 +03:00
Kyle Tyo
7c43cbdaad Replace obsolete FromMap calls with ToCoordinates (#35304)
(cherry picked from commit c8dce26dbbb8af7a431bb31ebe6f29d1b3aa6a24)
2026-02-07 20:39:51 +03:00
TemporalOroboros
8126431405 Purges uses of TransformComponent.WorldRotation (#34946)
(cherry picked from commit 08e5362f43bf0533888a3005dec2bea290aa8579)
2026-02-07 20:08:43 +03:00
ScarKy0
0aa83800c7 [Admin] Omni Accent Smite (#34824)
gods forgive me

(cherry picked from commit 8d1a300b5787ace516ff85f6a6a86dc2e46da3ec)
2026-02-07 19:51:00 +03:00
Plykiya
9c623d25a7 Cluster grenade refactor and contra markings (#31108)
* Cluster grenade refactor

* oopsies on the name

* Solve client-side errors

* reviews addressed

* filling scattering grenades is now predicted

* reviews addressed

(cherry picked from commit a4d6f09a4fc11c2cd7cdacc390f4c42995757ff6)
2026-02-07 19:16:31 +03:00
Saphire Lattice
b1eccb905c Change minibomb to be explosion resistant and start timer on damage (#32429)
* Make minibomb explosion resistant and trigger timer on damage

* Tune damage behaviour and threshold for minibomb

(cherry picked from commit f22f9e39c5e9af1a8f622e12eb2f916b69c6be22)
2026-02-07 19:07:23 +03:00
Cojoke
c8e3b2c37e Fix the ability to shoot out of crates (#28961)
* Fix the ability to shoot out of crates

* Makes it check what inventory the player is in

* use IsEntityOrParentInContainer

* Fix Issues Github had

* gaahhh... Prevents lasers from being shot out of crates

* gaahhh... Prevents lasers from being shot out of crates

* Fix laser?

* hmmm... this is better looking I think?

* Uncook indentation

* Rerun tests?

(cherry picked from commit 19a06b6cc0498fa59ffe7328df0f524f753968f4)
2026-02-07 19:04:37 +03:00
deltanedas
15b7bbb849 cham projector fixes/rewrite (#27111)
* cant disguise to thing in a container

* copy cigarette visualiser

* prevent aghost throwing an error

* make disguises die in space

* fuck it rewrite it to not use polymorph

* fix action troll

* oop

* add vebr

* add access to the components

* 2/3

* fix

* relay damage from disguise to user

* fix integrity

* :trollface:

* :trollface:

* m

* kill integrity

* fix a bug

* review

* remove them from component

* relay flash effect to the disguise

* fix icon being weird

* change method since multiple systems cant handle same network event

* :trollface:

* actually network Disguise real

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

(cherry picked from commit 80e148c265dc8602f50e3941dbd94bb396a1f5b5)
2026-02-07 17:53:55 +03:00
ShadowCommander
6eddc6da6b Replace DoorVisuals.Powered with PowerDeviceVisuals.Powered (#34646)
(cherry picked from commit 976172b85e6e9b6b85a49af85ed7467e648bd622)
2026-02-07 14:38:30 +03:00
Plykiya
d6982440c2 Predicted dice rolls (#34863)
* Predicted dice rolls

* Removed server-side dice system, make Shared no longer abstract, move visual code to client-side system

* cleanup

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit 862a2a744e1a8cb2643851b0f85c1372b1feadb6)
2026-02-07 14:23:21 +03:00
Tayrtahn
9e1c0ddba6 Code cleanup: radio jammer (#29052)
* Code cleanup for radio jammer

* More Entity<T> for the people, and fix an accidental variable reuse

(cherry picked from commit e33f0341ada2d8bd6ed4195ac3f0578b23e4ba8c)
2026-02-07 14:18:54 +03:00