From 1513f779addf8da973584844b0e365ea2e4e9722 Mon Sep 17 00:00:00 2001 From: Aliceee2ch <160794176+Aliceee2ch@users.noreply.github.com> Date: Sat, 1 Nov 2025 14:40:04 +0200 Subject: [PATCH] Repaths oxygen jetpacks and "removes" fake empty jetpack (#93676) ## About The Pull Request removes oxygen jetpack subtype and makes empty jetpack actual oxygen ## Why It's Good For The Game because our empty jetpack wasnt actually empty and we infact had two oxygen jetpacks? ## Changelog N/A --- _maps/RandomRuins/SpaceRuins/garbagetruck4.dmm | 2 +- .../SpaceRuins/hauntedtradingpost.dmm | 2 +- .../RandomRuins/SpaceRuins/infested_frigate.dmm | 2 +- .../CatwalkStation/CatwalkStation_2023.dmm | 2 +- _maps/map_files/debug/multiz.dmm | 2 +- _maps/map_files/tramstation/tramstation.dmm | 4 ++-- code/__DEFINES/inventory.dm | 2 +- code/game/gamemodes/objective_items.dm | 6 +++--- code/game/machinery/suit_storage_unit.dm | 6 +++--- code/game/objects/items/storage/uplink_kits.dm | 2 +- code/game/objects/items/tanks/jetpack.dm | 16 ++++------------ code/modules/clothing/outfits/standard.dm | 2 +- code/modules/clothing/spacesuits/_spacesuits.dm | 2 +- code/modules/clothing/suits/_suits.dm | 2 +- code/modules/clothing/suits/costume.dm | 2 +- code/modules/clothing/suits/jacket.dm | 2 +- code/modules/mod/mod_clothes.dm | 2 +- .../Scripts/93676_jetpack_repaths.txt | 9 +++++++++ 18 files changed, 34 insertions(+), 33 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt diff --git a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm index 00f49ef1cf1..f85f79cb150 100644 --- a/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm +++ b/_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm @@ -746,7 +746,7 @@ /obj/item/coin/plastic, /obj/structure/safe, /obj/structure/spider/stickyweb, -/obj/item/tank/jetpack/oxygen{ +/obj/item/tank/jetpack{ desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. It's blue, and has a triangle chiselled into the paint." }, /obj/item/switchblade, diff --git a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm index 3b3445795be..0b550628297 100644 --- a/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm @@ -1936,7 +1936,7 @@ /turf/template_noop, /area/template_noop) "qY" = ( -/obj/item/tank/jetpack/oxygen/security{ +/obj/item/tank/jetpack/security{ name = "red jetpack (oxygen)" }, /obj/item/tank/internals/oxygen/red, diff --git a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm index 9565fa689c3..345a69b4a51 100644 --- a/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm +++ b/_maps/RandomRuins/SpaceRuins/infested_frigate.dmm @@ -2657,7 +2657,7 @@ /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, /obj/item/storage/box/bodybags, -/obj/item/tank/jetpack/oxygen, +/obj/item/tank/jetpack, /obj/item/storage/box/coffeepack, /obj/item/storage/box/coffeepack, /obj/item/storage/box/emptysandbags, diff --git a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm index 793a8e79c6f..b782d0aac24 100644 --- a/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm +++ b/_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm @@ -24735,7 +24735,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/tank/jetpack/oxygen{ +/obj/item/tank/jetpack{ pixel_y = 4 }, /turf/open/floor/iron/dark, diff --git a/_maps/map_files/debug/multiz.dmm b/_maps/map_files/debug/multiz.dmm index a856336cb46..750a52c096e 100644 --- a/_maps/map_files/debug/multiz.dmm +++ b/_maps/map_files/debug/multiz.dmm @@ -1022,7 +1022,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/tank/jetpack/oxygen/captain, +/obj/item/tank/jetpack/captain, /obj/item/storage/belt/utility/chief/full, /obj/item/clothing/gloves/color/yellow{ pixel_y = 10 diff --git a/_maps/map_files/tramstation/tramstation.dmm b/_maps/map_files/tramstation/tramstation.dmm index 8ee47544104..7d753979de7 100644 --- a/_maps/map_files/tramstation/tramstation.dmm +++ b/_maps/map_files/tramstation/tramstation.dmm @@ -35082,8 +35082,8 @@ "lgP" = ( /obj/effect/turf_decal/stripes/corner, /obj/structure/rack, -/obj/item/tank/jetpack/oxygen, -/obj/item/tank/jetpack/oxygen{ +/obj/item/tank/jetpack, +/obj/item/tank/jetpack{ pixel_x = 3; pixel_y = 3 }, diff --git a/code/__DEFINES/inventory.dm b/code/__DEFINES/inventory.dm index 689b07c741a..acb81751012 100644 --- a/code/__DEFINES/inventory.dm +++ b/code/__DEFINES/inventory.dm @@ -216,7 +216,7 @@ GLOBAL_LIST_INIT(any_suit_storage, typecacheof(list( /obj/item/radio, /obj/item/storage/bag/books, /obj/item/storage/fancy/cigarettes, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, /obj/item/stack/spacecash, /obj/item/storage/wallet, /obj/item/folder, diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 448d4244dae..bb0c93c3022 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -401,15 +401,15 @@ GLOBAL_DATUM_INIT(steal_item_handler, /datum/objective_item_handler, new()) /datum/objective_item/steal/jetpack name = "the Captain's jetpack" - targetitem = /obj/item/tank/jetpack/oxygen/captain + targetitem = /obj/item/tank/jetpack/captain excludefromjob = list(JOB_CAPTAIN) item_owner = list(JOB_CAPTAIN) exists_on_map = TRUE difficulty = 3 steal_hint = "A special yellow jetpack found in the Suit Storage Unit in the Captain's Quarters." -/obj/item/tank/jetpack/oxygen/captain/add_stealing_item_objective() - return add_item_to_steal(src, /obj/item/tank/jetpack/oxygen/captain) +/obj/item/tank/jetpack/captain/add_stealing_item_objective() + return add_item_to_steal(src, /obj/item/tank/jetpack/captain) /datum/objective_item/steal/magboots name = "the chief engineer's advanced magnetic boots" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index d8e5432d64e..65f66907c9d 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -80,12 +80,12 @@ /obj/machinery/suit_storage_unit/captain mask_type = /obj/item/clothing/mask/gas/atmos/captain - storage_type = /obj/item/tank/jetpack/oxygen/captain + storage_type = /obj/item/tank/jetpack/captain mod_type = /obj/item/mod/control/pre_equipped/magnate /obj/machinery/suit_storage_unit/centcom mask_type = /obj/item/clothing/mask/gas/atmos/centcom - storage_type = /obj/item/tank/jetpack/oxygen/captain + storage_type = /obj/item/tank/jetpack/captain mod_type = /obj/item/mod/control/pre_equipped/corporate /obj/machinery/suit_storage_unit/engine @@ -137,7 +137,7 @@ /obj/machinery/suit_storage_unit/syndicate mask_type = /obj/item/clothing/mask/gas/syndicate - storage_type = /obj/item/tank/jetpack/oxygen/harness + storage_type = /obj/item/tank/jetpack/harness mod_type = /obj/item/mod/control/pre_equipped/nuclear /obj/machinery/suit_storage_unit/syndicate/lavaland diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 53548989384..64f3aacf5d4 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -751,7 +751,7 @@ new spess_suit(src) // Above allows me to get the helmet from a variable on the object var/obj/item/clothing/head/helmet/space/syndicate/spess_helmet = GLOB.syndicate_space_suits_to_helmets[spess_suit] new spess_helmet(src) // 4 TC for the space gear - new /obj/item/tank/jetpack/oxygen/harness(src) // They kinda need this to fly to the cruiser. + new /obj/item/tank/jetpack/harness(src) // They kinda need this to fly to the cruiser. // Tacticool gear new /obj/item/clothing/shoes/combat(src) new /obj/item/clothing/under/syndicate(src) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 815631e4cf8..efab2d8e01f 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -1,5 +1,5 @@ /obj/item/tank/jetpack - name = "jetpack (empty)" + name = "jetpack (oxygen)" desc = "A tank of compressed gas for use as propulsion in zero-gravity areas. Use with caution." icon_state = "jetpack" inhand_icon_state = "jetpack" @@ -207,13 +207,7 @@ icon_state = "jetpack-void" inhand_icon_state = "jetpack-void" -/obj/item/tank/jetpack/oxygen - name = "jetpack (oxygen)" - desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas. Use with caution." - icon_state = "jetpack" - inhand_icon_state = "jetpack" - -/obj/item/tank/jetpack/oxygen/harness +/obj/item/tank/jetpack/harness name = "jet harness (oxygen)" desc = "A lightweight tactical harness, used by those who don't want to be weighed down by traditional jetpacks." icon_state = "jetpack-mini" @@ -222,7 +216,7 @@ throw_range = 7 w_class = WEIGHT_CLASS_NORMAL -/obj/item/tank/jetpack/oxygen/captain +/obj/item/tank/jetpack/captain name = "captain's jetpack" desc = "A compact, lightweight jetpack containing a high amount of compressed oxygen." icon_state = "jetpack-captain" @@ -234,14 +228,12 @@ drift_force = 2 NEWTONS stabilizer_force = 2 NEWTONS -/obj/item/tank/jetpack/oxygen/security +/obj/item/tank/jetpack/security name = "security jetpack (oxygen)" desc = "A tank of compressed oxygen for use as propulsion in zero-gravity areas by security forces." icon_state = "jetpack-sec" inhand_icon_state = "jetpack-sec" - - /obj/item/tank/jetpack/carbondioxide name = "jetpack (carbon dioxide)" desc = "A tank of compressed carbon dioxide for use as propulsion in zero-gravity areas. Painted black to indicate that it should not be used as a source for internals." diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 2730af4c636..8381debdf01 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -35,7 +35,7 @@ uniform = /obj/item/clothing/under/color/grey shoes = /obj/item/clothing/shoes/sneakers/black suit = /obj/item/clothing/suit/space - back = /obj/item/tank/jetpack/oxygen + back = /obj/item/tank/jetpack head = /obj/item/clothing/head/helmet/space mask = /obj/item/clothing/mask/breath diff --git a/code/modules/clothing/spacesuits/_spacesuits.dm b/code/modules/clothing/spacesuits/_spacesuits.dm index 66e98ba27a9..a68b57456e0 100644 --- a/code/modules/clothing/spacesuits/_spacesuits.dm +++ b/code/modules/clothing/spacesuits/_spacesuits.dm @@ -64,7 +64,7 @@ allowed = list( /obj/item/flashlight, /obj/item/tank/internals, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, ) slowdown = 1 armor_type = /datum/armor/suit_space diff --git a/code/modules/clothing/suits/_suits.dm b/code/modules/clothing/suits/_suits.dm index 74bb02622fc..b25cd2d0dc0 100644 --- a/code/modules/clothing/suits/_suits.dm +++ b/code/modules/clothing/suits/_suits.dm @@ -8,7 +8,7 @@ allowed = list( /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, /obj/item/storage/belt/holster, ) armor_type = /datum/armor/none diff --git a/code/modules/clothing/suits/costume.dm b/code/modules/clothing/suits/costume.dm index 656cdd287bd..a5717b3817e 100644 --- a/code/modules/clothing/suits/costume.dm +++ b/code/modules/clothing/suits/costume.dm @@ -560,7 +560,7 @@ allowed = list( /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, /obj/item/storage/belt/holster, //new /obj/item/toy/clockwork_watch, diff --git a/code/modules/clothing/suits/jacket.dm b/code/modules/clothing/suits/jacket.dm index 820aeba2e14..daa7036442d 100644 --- a/code/modules/clothing/suits/jacket.dm +++ b/code/modules/clothing/suits/jacket.dm @@ -28,7 +28,7 @@ /obj/item/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, diff --git a/code/modules/mod/mod_clothes.dm b/code/modules/mod/mod_clothes.dm index 28428a8fe13..bfebdb155e5 100644 --- a/code/modules/mod/mod_clothes.dm +++ b/code/modules/mod/mod_clothes.dm @@ -27,7 +27,7 @@ allowed = list( /obj/item/tank/internals, /obj/item/flashlight, - /obj/item/tank/jetpack/oxygen/captain, + /obj/item/tank/jetpack/captain, ) armor_type = /datum/armor/none body_parts_covered = CHEST|GROIN diff --git a/tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt b/tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt new file mode 100644 index 00000000000..4b5856fe769 --- /dev/null +++ b/tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt @@ -0,0 +1,9 @@ +/obj/item/tank/jetpack : @DELETE + +/obj/item/tank/jetpack/oxygen : /obj/item/tank/jetpack{@OLD} + +/obj/item/tank/jetpack/oxygen/harness : /obj/item/tank/jetpack/harness{@OLD} + +/obj/item/tank/jetpack/oxygen/captain : /obj/item/tank/jetpack/captain{@OLD} + +/obj/item/tank/jetpack/oxygen/security : /obj/item/tank/jetpack/security{@OLD} \ No newline at end of file