Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIRROR] Fixes molotovs not lighting their splashed contents #624

Merged
merged 1 commit into from
Nov 15, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Original PR: Skyrat-SS13/Skyrat-tg#25001

About The Pull Request

Delays fire effects on target and creating a hotspot until after the liquid is splashed, not before.

How This Contributes To The Skyrat Roleplay Experience

Fixes #24986

Proof of Testing

Screenshots/Videos
Kindness.Garden.Sixty-Two.2023-11-13.20-26-05.mp4

Changelog

🆑 Shroopy
fix: Molotovs now light their splashed contents on fire.
/:cl:

* Fix molotovs not lighting their splashed contents

* Adds skyrat edit tags to the changes

* Update code/modules/reagents/reagent_containers/cups/glassbottle.dm

---------

Co-authored-by: Bloop <[email protected]>
@Iajret Iajret merged commit ee8adbf into master Nov 15, 2023
24 checks passed
@Iajret Iajret deleted the upstream-mirror-25001 branch November 15, 2023 09:09
AnywayFarus added a commit that referenced this pull request Nov 15, 2023
Iajret pushed a commit that referenced this pull request Jan 26, 2024
* Add donator mask

* update ckey whitelist
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants