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

fixes gibtonite bomb #176

Merged
merged 1 commit into from
Oct 20, 2023
Merged

fixes gibtonite bomb #176

merged 1 commit into from
Oct 20, 2023

Conversation

Steals-The-PRs
Copy link
Collaborator

Mirrored on Skyrat: Skyrat-SS13/Skyrat-tg#24457
Original PR: tgstation/tgstation#79038

About The Pull Request

2023-10-16.19-42-51.mp4

i made it work slightly better too so
also this was in the code since like 2015 but it probably got broken sometime

also 10 second detonation timer is pretty harmless anyway so

Why It's Good For The Game

bug bad
fyi this was added in 2015 tgstation/tgstation#8587

Changelog

🆑 mc-oofert
fix: making assembly activated bombs works again
/:cl:

* fixes gibtonite bomb (#79038)

## About The Pull Request

https://github.com/tgstation/tgstation/assets/70376633/8d15d7c9-51c2-4aeb-b1c6-4386168947da

i made it work slightly better too so
also this was in the code since like 2015 but it probably got broken
sometime

also 10 second detonation timer is pretty harmless anyway so

## Why It's Good For The Game

bug bad
fyi this was added in 2015
tgstation/tgstation#8587

## Changelog
:cl:
fix: making assembly activated bombs works again
/:cl:

* fixes gibtonite bomb

---------

Co-authored-by: jimmyl <[email protected]>
@Iajret Iajret merged commit a75d80d into master Oct 20, 2023
23 checks passed
@Iajret Iajret deleted the upstream-mirror-24457 branch October 20, 2023 12:10
AnywayFarus added a commit that referenced this pull request Oct 20, 2023
Iajret pushed a commit that referenced this pull request Jan 3, 2024
* Fix ashwalker copypaste error for magic mirror (#80626)

## About The Pull Request

Copy pasted bad for this

## Changelog

:cl: Melbert
fix: Lizards now show a proper description in the magic mirror
/:cl:

* Fix ashwalker copypaste error for magic mirror

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: NovaBot <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants