Commit graph

6597 commits

Author SHA1 Message Date
iertis
1a62c50d57
Великий фикс апстрима (#2821)
Co-authored-by: Matthew Herber <32679887+Happyrobot33@users.noreply.github.com>
2025-08-18 01:28:45 +03:00
Vigers Ray
305718810a Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Maps/_Sunrise/Station/oasis.yml
#	Resources/Maps/_Sunrise/Station/packed.yml
#	Resources/Maps/_Sunrise/Station/plasma.yml
#	Resources/Maps/_Sunrise/event/void.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce_nt.rsi/meta.json
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/paramedic_nt.rsi/meta.json
#	Resources/migration.yml
2025-08-18 01:18:36 +03:00
Vigers Ray
82b6d63652 какашечки 2025-08-18 01:15:59 +03:00
Tayrtahn
8034cabbae
Fix error when deleting a toggled ToggleableClothingComponent (#39191) 2025-08-17 12:34:47 -07:00
Vigers Ray
978d665ba7 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Chat/Systems/ChatSystem.cs
2025-08-17 19:23:27 +03:00
Tayrtahn
5ea928863f
Cleanup warnings in ChatSystem (#36773)
* Cleanup warnings in ChatSystem

* fix after merge

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-08-17 08:39:23 -04:00
ViolentMonk
6e8260cf3f
Trigger for OnInteractUsing (#39692)
* Add trigger for InteractOnUsing

* Add blacklist and targetUsed fields

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnInteractUsingComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-16 23:57:16 +02:00
slarticodefast
bd05e10a2e
Merge staging into master (#39694) 2025-08-16 22:14:14 +02:00
slarticodefast
85158a3d48
Fix industrial reagent grinder bug, second attempt (#39690)
* fix recycler 3

* Update Resources/Prototypes/Entities/Structures/Machines/reagent_grinder.yml
2025-08-16 21:54:15 +02:00
ScarKy0
529d7ff292
Predict MessyDrinker (#39660)
init
2025-08-16 17:03:50 +02:00
Artxmisery
71f5c2d665
Equip and unequip triggers (#39675)
* added equip and unequip triggers for equipment and equipee

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnDidEquipComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-16 15:50:32 +02:00
Vigers Ray
d1ef2f7fc7
Copy machine fix (#2806) 2025-08-16 06:20:10 +03:00
ThereDrD
b38dc9bcce
Обновление консоли станционного учета (#2800)
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
2025-08-16 06:13:21 +03:00
Vigers Ray
a7131170fa Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Client/UserInterface/Systems/MenuBar/GameTopMenuBarUIController.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared.Database/LogType.cs
#	Resources/Prototypes/Body/Organs/Animal/animal.yml
#	Resources/Prototypes/Body/Organs/arachnid.yml
#	Resources/Prototypes/GameRules/events.yml
#	Resources/Prototypes/GameRules/roundstart.yml
2025-08-16 00:12:59 +03:00
Vigers Ray
4135561341 казуалы 2025-08-16 00:06:10 +03:00
Vigers Ray
e61b998076 Revert "temp fix of radio icons"
This reverts commit 13cc38b490.
2025-08-15 21:38:03 +03:00
Vigers Ray
f2709d24d4 ыыыы 2025-08-15 19:31:42 +03:00
beck-thompson
a8d6dbc324
Added button and manager for in game bug reports (Part 1) (#35350)
* Added the button and manager

* Minor cleanup

* Reigstered to the wrong thing!

* Unload UI

* Address the review

* First commit :)

* Some cleanup

* Added some comments and now the placehoder text goes away once you start typing

* Some cleanup and better test command

* Basic rate limiter class (Not finished)

* Cleanup

* Removed forgotten comment xD

* Whitespace removal

* Minor cleanup, cvar hours -> minutes

* More minor tweaks

* Don't cache timer and add examples to fields

* Added CCvar for time between bug reports

* Minor crash when restarting rounds fixed

* It compiled on my computer!

* Fix comment indents

* Remove unecessary async, removed magic strings, simplfied sawmill to not use post inject

* Make struct private

* Simplfiy TryGetLongHeader

* Changed list to enumerable

* URI cleanup

* Got rid of the queue, used a much better way!

* Made the comments a little better and fix some issues with them

* Added header consts

* Maximum reports per round is now an error message

* Time between reports is now in seconds

* Change ordering

* Change hotkey to O

* only update window when its open

* Split up validation

* address review

* Address a few issues

* inheritance fix

* API now doesn't keep track of requests, just uses the rate limited response from github

* Rough idea of how channels would work

* refactor: reorganized code, placed rate limiter into http-client-handler AND manager (usually only manager-one should work)

* cleanup

* Add user agent so api doesn't get mad

* Better error logs

* Cleanup

* It now throws!

* refactor: renaming, moved some methods, xml-doc cleanups

* refactor: BugReportWindow formatted to convention, enforced 1 updates only 1 per sec

* Add very basic licence info

* Fixed the issues!

* Set ccvar default to false

* make the button better

* fix test fail silly me

* Adress the review!

* refactor: cleanup of entry point code, binding server-side code with client-facing manager

* Resolve the other issues and cleanup and stuff smile :)

* not entity

* fixes

* Cleanup

* Cleanup

* forgor region

* fixes

* Split up function and more stuff

* Better unsubs yaygit add -A

* I pray...

* Revert "I pray..."

This reverts commit 9629fb4f1289c9009a03e4e4facd9ae975e6303e.

* I think I have to add it in the pr

* Revert "I think I have to add it in the pr"

This reverts commit e185b42f570fe5f0f51e0e44761d7938e22e67f7.

* Tweaks

* Minor tweak to permissions

---------

Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-08-15 09:10:38 -07:00
Vigers Ray
2bbb21a0a3 мда 2025-08-15 18:49:13 +03:00
Ligyb
ddae571794
уменьшение следов и увеличение радиуса швабры для этих же следов (#2772) 2025-08-15 18:20:42 +03:00
Daniel
f67e558adf
PRINTER UPDATE 2.1 (#2760) 2025-08-15 17:13:20 +03:00
Nemanja
f23e8c2861
Multiantag Gamemode (#37783)
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-08-15 16:06:51 +02:00
ScarKy0
b2c505df6a
Fix instances of predicted randomness (#39661)
init
2025-08-15 15:48:23 +02:00
SplikZerys
13cc38b490 temp fix of radio icons 2025-08-15 16:07:37 +03:00
pacable
37a41a9177
Various workflows fix (#2775) 2025-08-15 14:01:42 +03:00
iertis
d5ec9f0e5b
Фиксы апстрима (#2778)
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-15 12:45:53 +03:00
DrSmugleaf
d08252facb
Fix unbuckle admin logs only showing the ids and not names of the entities involved (#39655) 2025-08-15 10:45:41 +02:00
SplikZerys
40a36b5c92
height tweaks (#2751)
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-15 11:36:43 +03:00
slarticodefast
7a3026b4f8
Throwing triggers (#39650)
throw triggers
2025-08-14 22:33:37 -07:00
Artxmisery
2b31fa98c9
Add container-related triggers (#39647)
* added triggers for when an entity is inserted or removed from a container, for both the entity and the container

* removed unnecessary comments

* consolidated into one shared system for all four triggers

* consolidated into one shared system for all four triggers

* named it right this time

* made container owner user of got triggers and added guard statements

* container id

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnRemovedFromContainerComponent.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-15 01:53:48 +02:00
iertis
c08ed2bc1d
Новый орган абдукторов (#2758) 2025-08-15 00:25:51 +03:00
DerKurait
b7967b2065
Фикс систему истощения под апстрим (#2776)
Co-authored-by: Vitaliy_Merzun <dunoquas487@gmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-08-14 23:49:27 +03:00
Vigers Ray
d347b01fc8 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	.github/CODEOWNERS
#	Resources/Prototypes/Reagents/medicine.yml
2025-08-14 22:26:17 +03:00
slarticodefast
d939b4dec7
RemoveComponentsOnTrigger, ToggleComponentsOnTrigger (#39639) 2025-08-14 16:18:56 +02:00
Vigers Ray
b1b7778131 Merge remote-tracking branch 'space-wizards/master' 2025-08-14 13:14:17 +03:00
Vigers Ray
edf6996c5b ржомба отменяется 2025-08-14 13:06:37 +03:00
Studio Fae-Wilds
770dc68a48
Add trigger-refactor components and systems: Batch 1 (#39391)
* Adds the following batch of trigger refactor components and their associated systems:

TriggerOnLand: LandEvent
TriggerOnExamined: ExaminedEvent
TriggerOnUnbuckle: UnbuckledEvent
TriggerOnBuckle: BuckledEvent
TriggerOnStrap: StrappedEvent
TriggerOnUnstrapped: UnstrappedEvent

* Removes unnecessary lines from comment

* Fix comment formatting, corrects grammar and increases comment clarity.

* adds last forgotten edit to comments

* Update Content.Shared/Trigger/Systems/TriggerOnStrappedOrBuckledSystem.cs

Removes unnecessary comments

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnBuckledComponent.cs

Increases comment clarity

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnExaminedComponent.cs

Increases comment clarity

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnLandComponent.cs

Increases comment clarity

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnStrappedComponent.cs

Increases comment clarity

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUnbuckledComponent.cs

Increases comment clarity

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

* Update Content.Shared/Trigger/Components/Triggers/TriggerOnUnstrappedComponent.cs

Increases comment clarity

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

* refactored TriggerOnStrappedOrBuckledSystem.cs
removed TriggerOnExaminedSystem.cs and moved it into TriggerSystem.Interaction.cs

Changes currently untested, not sure how to make it so modders can change what method they want sending out the appropriate trigger key but want to save progress working on it and get feedback from maintainers

* Removed component which already exists as part of TriggerSystem.Interaction.cs

* Restores accidentally removed component

* Apply suggestions from code review

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-14 09:39:54 +02:00
slarticodefast
b427e7e8d4
fix lightbulb color (#39623) 2025-08-13 15:45:51 -07:00
Myra
0a991593f5
Revert "Fix: Break do_after if target/tool becomes inaccessible" (#39617) 2025-08-13 22:07:46 +02:00
Vigers Ray
e83aee1772 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml
2025-08-13 20:51:48 +03:00
Hannah Giovanna Dawson
2cb4e01019
StaminaDamageOnTriggerComponent (#39607)
* InflictStaminaOnTriggerSystem

Surprised this wasn't done alongside the damage one.

* Correct docstring

* Moar docstring changes!!!

* Resolve PR comment

* a

* Update Content.Shared/Trigger/Systems/StaminaDamageOnTriggerSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-13 18:50:34 +02:00
Vigers Ray
1745202a43 фиксы линтера 2025-08-13 19:35:03 +03:00
Vigers Ray
c9709e38f1 Добби свободен 2025-08-13 16:00:32 +03:00
Vigers Ray
7bdec90a3f новая партия говна 2025-08-13 14:27:23 +03:00
Vigers Ray
3cf56cd5b3 Merge remote-tracking branch 'space-wizards/master'
# Conflicts:
#	Content.Server/Access/Systems/AgentIDCardSystem.cs
#	Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
#	Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
#	Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
#	Content.Server/Zombies/ZombieSystem.cs
#	Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
#	Content.Shared/Standing/StandingStateComponent.cs
#	Content.Shared/Standing/StandingStateSystem.cs
#	Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
#	Content.Shared/Stunnable/SharedStunSystem.cs
#	Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl
#	Resources/Locale/en-US/_strings/ghost/observer-role.ftl
#	Resources/Locale/en-US/_strings/robotics/borg_modules.ftl
#	Resources/Prototypes/Entities/Clothing/Ears/specific.yml
#	Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
#	Resources/Prototypes/Entities/Clothing/Hands/specific.yml
#	Resources/Prototypes/Entities/Clothing/Head/specific.yml
#	Resources/Prototypes/Entities/Clothing/Neck/specific.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
#	Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
#	Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
#	Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Entities/Objects/Materials/parts.yml
#	Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
2025-08-13 14:13:30 +03:00
Vigers Ray
5465aa5084 оно закончилось, но впереди еще линтер (жокерфейс) 2025-08-13 13:58:04 +03:00
Winkarst-cpu
99ad34ed06
Disable the lock/unlock verb if we can't do that (#39605)
* Fix

* Update
2025-08-13 12:52:08 +02:00
slarticodefast
2743dcf67f
Move mind role components to shared (#39606) 2025-08-13 12:51:46 +02:00
Winkarst-cpu
1f4dfcdcf9
Predict GetVerbsEvent in PowerSwitchableSystem (#39589)
* Prediction

* Update
2025-08-13 09:54:02 +02:00
Winkarst-cpu
cea8dea005
Fix: Break do_after if target/tool becomes inaccessible (#35079) 2025-08-13 09:35:35 +03:00