cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 06:29:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repaths oxygen jetpacks and "removes" fake empty jetpack (#93676)

Browse Source 
## 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
This commit is contained in:
Aliceee2ch
2025-11-01 13:40:04 +01:00
committed by GitHub
parent 915102803c
commit 1513f779ad
18 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/SpaceRuins/garbagetruck4.dmm
+1 -1
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/hauntedtradingpost.dmm
+1 -1
View File
@@ -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,
_maps/RandomRuins/SpaceRuins/infested_frigate.dmm
+1 -1
View File
@@ -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,
_maps/map_files/CatwalkStation/CatwalkStation_2023.dmm
+1 -1
View File
@@ -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,
_maps/map_files/debug/multiz.dmm
+1 -1
View File
@@ -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
_maps/map_files/tramstation/tramstation.dmm
+2 -2
View File
@@ -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
},
code/__DEFINES/inventory.dm
+1 -1
View File
@@ -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,
code/game/gamemodes/objective_items.dm
+3 -3
View File
@@ -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"
code/game/machinery/suit_storage_unit.dm
+3 -3
View File
@@ -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
code/game/objects/items/storage/uplink_kits.dm
+1 -1
View File
@@ -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)
code/game/objects/items/tanks/jetpack.dm
+4 -12
View File
@@ -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."
code/modules/clothing/outfits/standard.dm
+1 -1
View File
@@ -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
code/modules/clothing/spacesuits/_spacesuits.dm
+1 -1
View File
@@ -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
code/modules/clothing/suits/_suits.dm
+1 -1
View File
@@ -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
code/modules/clothing/suits/costume.dm
+1 -1
View File
@@ -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,
code/modules/clothing/suits/jacket.dm
+1 -1
View File
@@ -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,
code/modules/mod/mod_clothes.dm
+1 -1
View File
@@ -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
tools/UpdatePaths/Scripts/93676_jetpack_repaths.txt
+9
View File
@@ -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}