cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] [no gbp] Jump jets activate a linked jetpack in a more sensible way [MDB IGNORE] (#23685)

Browse Source 
* [no gbp] Jump jets activate a linked jetpack in a more sensible way (#78296)

## About The Pull Request

fikou pointed out that the code I wrote not only wasn't reliable on
destroy but also was overengineered
but only _after_ he merged it 😠

now we just ask the jetpack module if it is on rather than using a weird
trait

## Changelog

not player facing

* [no gbp] Jump jets activate a linked jetpack in a more sensible way

---------

Co-authored-by: Jacquerel <hnevard@gmail.com>
This commit is contained in:
SkyratBot
2023-09-14 14:49:45 -07:00
committed by GitHub
co-authored by Jacquerel
parent a4e385ea0d
commit 0949b95e3a
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mod/modules/modules_general.dm
+3 -4
View File
@@ -209,10 +209,9 @@
launch_from.visible_message(span_warning("[mod.wearer] rockets into the air!"))
new /obj/effect/temp_visual/jet_plume(launch_from)
if (!HAS_TRAIT(mod.wearer, TRAIT_JETPACKING))
var/obj/item/mod/module/jetpack/linked_jetpack = locate() in mod.modules
if (!isnull(linked_jetpack))
linked_jetpack.on_activation()
var/obj/item/mod/module/jetpack/linked_jetpack = locate() in mod.modules
if (!isnull(linked_jetpack) && !linked_jetpack.active)
linked_jetpack.on_activation()
return TRUE
#undef FAILED_ACTIVATION_COOLDOWN