Commit graph

20 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
āda
024301e698
RandomChance trigger condition (#39543)
* branch names don't matter anyway

* commits are a window to the soul

* requested change

* also requested

* ship it

* remove key

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-13 01:04:29 +02:00
āda
a5351b8c77
ExtinguishOnTrigger and TriggerOnInteractHand (#39537)
* simplely one commit

* simplelly two commit

* requested changes

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
2025-08-11 21:21:11 +02:00
āda
ad5fe5678c
Trigger on round end (#39545)
* works if it works

* small rewording

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-11 09:44:36 +02:00
āda
7825d30562
Fire stacks trigger (#39530)
* Simple as

* whoops

* not gonna work

* chopped

* missed something

* Better name

* formatting

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-08-10 21:59:32 +02:00
beck-thompson
80375370f8
Add voice locks to various hidden syndicate items (#39310) 2025-08-10 11:10:13 -07:00
slarticodefast
534553dddf
Turn some implants into triggers (#39364)
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-08-06 12:52:11 -07:00
slarticodefast
2c40a950f7
Trigger Refactor (#39034) 2025-08-03 21:20:37 +02:00