From fe6c77f77f1cb3373e1147879d38995a3a316808 Mon Sep 17 00:00:00 2001
From: jonathan123700 <gonatantsatskin@gmail.com>
Date: Sat, 5 Oct 2024 18:48:46 +0300
Subject: [PATCH] broken for years, fixed in seconds

---
 .../objects/items/weapons/tanks/jetpack.dm    |  2 +
 html/changelogs/Snowy1237-jetpack_fix.yml     | 58 +++++++++++++++++++
 2 files changed, 60 insertions(+)
 create mode 100644 html/changelogs/Snowy1237-jetpack_fix.yml

diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index a76d31ab89f..a34602590e8 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -14,6 +14,8 @@
 		// Skip sanity check for H.back, as istype can safely handle a null.
 		if (istype(H.back, /obj/item/tank/jetpack))
 			return H.back
+		else if (istype(H.s_store, /obj/item/tank/jetpack))
+			return H.s_store
 		else if (istype(H.back, /obj/item/rig))
 			var/obj/item/rig/rig = H.back
 			for (var/obj/item/rig_module/maneuvering_jets/module in rig.installed_modules)
diff --git a/html/changelogs/Snowy1237-jetpack_fix.yml b/html/changelogs/Snowy1237-jetpack_fix.yml
new file mode 100644
index 00000000000..80b8738b22d
--- /dev/null
+++ b/html/changelogs/Snowy1237-jetpack_fix.yml
@@ -0,0 +1,58 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#     - (fixes bugs)
+#   wip
+#     - (work in progress)
+#   qol
+#     - (quality of life)
+#   soundadd
+#     - (adds a sound)
+#   sounddel
+#     - (removes a sound)
+#   rscadd
+#     - (adds a feature)
+#   rscdel
+#     - (removes a feature)
+#   imageadd
+#     - (adds an image or sprite)
+#   imagedel
+#     - (removes an image or sprite)
+#   spellcheck
+#     - (fixes spelling or grammar)
+#   experiment
+#     - (experimental change)
+#   balance
+#     - (balance changes)
+#   code_imp
+#     - (misc internal code change)
+#   refactor
+#     - (refactors code)
+#   config
+#     - (makes a change to the config files)
+#   admin
+#     - (makes changes to administrator tools)
+#   server
+#     - (miscellaneous changes to server)
+#################################
+
+# Your name.
+author: Snowy1237
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, this gets changed to [] after reading.  Just remove the brackets when you add new shit.
+# Please surround your changes in  double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Fixed jetpacks not working while in suit storage."