diff --git a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm index 90481462eb2..fae511289b9 100644 --- a/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm +++ b/_maps/RandomRuins/SpaceRuins/skyrat/cargodiselost.dmm @@ -2503,7 +2503,7 @@ /area/ruin/space/has_grav/cargodise_freighter/kitchen) "NQ" = ( /obj/structure/safe, -/obj/item/mod/module/jetpack/advanced, +/obj/item/mod/module/jetpack, /obj/item/mod/control/pre_equipped/standard, /turf/open/floor/mineral/plastitanium, /area/ruin/space/has_grav/cargodise_freighter/vault) diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm index 339894eb2d8..01c1304493d 100644 --- a/code/game/objects/items/tanks/jetpack.dm +++ b/code/game/objects/items/tanks/jetpack.dm @@ -10,7 +10,6 @@ actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization) var/gas_type = /datum/gas/oxygen var/on = FALSE - var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not var/stabilize = FALSE var/thrust_callback @@ -98,16 +97,12 @@ return FALSE on = TRUE update_icon(UPDATE_ICON_STATE) - if(full_speed) - user.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) return TRUE /obj/item/tank/jetpack/proc/turn_off(mob/user) SEND_SIGNAL(src, COMSIG_JETPACK_DEACTIVATED, user) on = FALSE update_icon(UPDATE_ICON_STATE) - if(user) - user.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) /obj/item/tank/jetpack/proc/allow_thrust(num, use_fuel = TRUE) if(!ismob(loc)) @@ -148,7 +143,6 @@ worn_icon_state = "jetpack-improvised" volume = 20 //normal jetpacks have 70 volume gas_type = null //it starts empty - full_speed = FALSE //moves at modsuit jetpack speeds /obj/item/tank/jetpack/improvised/allow_thrust(num) if(!ismob(loc)) diff --git a/code/modules/mod/mod_types.dm b/code/modules/mod/mod_types.dm index 18713d25517..e751d1e943b 100644 --- a/code/modules/mod/mod_types.dm +++ b/code/modules/mod/mod_types.dm @@ -197,13 +197,13 @@ /obj/item/mod/module/storage/large_capacity, /obj/item/mod/module/hat_stabilizer, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/pathfinder, /obj/item/mod/module/quick_cuff, /obj/item/mod/module/headprotector, ) default_pins = list( - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, ) /obj/item/mod/control/pre_equipped/cosmohonk @@ -245,7 +245,7 @@ /obj/item/mod/module/shock_absorber, /obj/item/mod/module/emp_shield, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flashlight, /obj/item/mod/module/dna_lock, @@ -254,7 +254,7 @@ ) default_pins = list( /obj/item/mod/module/armor_booster, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, ) @@ -268,7 +268,7 @@ /obj/item/mod/module/shock_absorber, /obj/item/mod/module/emp_shield, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flashlight, /obj/item/mod/module/hat_stabilizer/syndicate, @@ -276,14 +276,14 @@ ) default_pins = list( /obj/item/mod/module/armor_booster, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, ) /obj/item/mod/control/pre_equipped/nuclear/no_jetpack /obj/item/mod/control/pre_equipped/nuclear/no_jetpack/Initialize(mapload, new_theme, new_skin, new_core) - applied_modules -= list(/obj/item/mod/module/jetpack/advanced, /obj/item/mod/module/jump_jet) + applied_modules -= list(/obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet) return ..() /obj/item/mod/control/pre_equipped/nuclear/plasmaman @@ -305,7 +305,7 @@ /obj/item/mod/module/shock_absorber, /obj/item/mod/module/emp_shield, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flashlight, /obj/item/mod/module/hat_stabilizer/syndicate, @@ -313,7 +313,7 @@ ) default_pins = list( /obj/item/mod/module/armor_booster, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, ) @@ -324,7 +324,7 @@ /obj/item/mod/module/emp_shield, /obj/item/mod/module/magnetic_harness, /obj/item/mod/module/thermal_regulator, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flashlight, /obj/item/mod/module/hat_stabilizer/syndicate, @@ -333,7 +333,7 @@ ) default_pins = list( /obj/item/mod/module/armor_booster, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flamethrower, ) @@ -426,13 +426,13 @@ applied_modules = list( /obj/item/mod/module/storage, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, /obj/item/mod/module/flashlight, ) default_pins = list( /obj/item/mod/module/armor_booster, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/jump_jet, ) @@ -623,7 +623,7 @@ /obj/item/mod/module/stealth/ninja, /obj/item/mod/module/quick_carry/advanced, /obj/item/mod/module/magboot/advanced, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/anomaly_locked/kinesis/admin, /obj/item/mod/module/shove_blocker, /obj/item/mod/module/quick_cuff, @@ -631,7 +631,7 @@ default_pins = list( /obj/item/mod/module/stealth/ninja, /obj/item/mod/module/magboot/advanced, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/anomaly_locked/kinesis/admin, ) diff --git a/code/modules/mod/modules/modules_general.dm b/code/modules/mod/modules/modules_general.dm index 3ef6b955871..815cfb0a144 100644 --- a/code/modules/mod/modules/modules_general.dm +++ b/code/modules/mod/modules/modules_general.dm @@ -108,8 +108,6 @@ overlay_state_inactive = "module_jetpack" overlay_state_active = "module_jetpack_on" required_slots = list(ITEM_SLOT_BACK) - /// Do we give the wearer a speed buff. - var/full_speed = FALSE /// Do we have stabilizers? If yes the user won't move from inertia. var/stabilize = TRUE /// Callback to see if we can thrust the user. @@ -143,14 +141,6 @@ /datum/effect_system/trail_follow/ion/grav_allowed \ ) -/obj/item/mod/module/jetpack/on_activation() - if(full_speed) - mod.wearer.add_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) - -/obj/item/mod/module/jetpack/on_deactivation(display_message = TRUE, deleting = FALSE) - if(full_speed) - mod.wearer.remove_movespeed_modifier(/datum/movespeed_modifier/jetpack/fullspeed) - /obj/item/mod/module/jetpack/get_configuration() . = ..() .["stabilizers"] = add_ui_configuration("Stabilizers", "bool", stabilize) @@ -167,15 +157,6 @@ return FALSE return TRUE -/obj/item/mod/module/jetpack/advanced - name = "MOD advanced ion jetpack module" - desc = "An improvement on the previous model of electric thrusters. This one achieves higher speeds through \ - mounting of more jets and application of red paint." - icon_state = "jetpack_advanced" - overlay_state_inactive = "module_jetpackadv" - overlay_state_active = "module_jetpackadv_on" - full_speed = TRUE - /// Cooldown to use if we didn't actually launch a jump jet #define FAILED_ACTIVATION_COOLDOWN 3 SECONDS diff --git a/code/modules/movespeed/modifiers/items.dm b/code/modules/movespeed/modifiers/items.dm index 6bdf2f31760..601ecc22892 100644 --- a/code/modules/movespeed/modifiers/items.dm +++ b/code/modules/movespeed/modifiers/items.dm @@ -5,9 +5,6 @@ /datum/movespeed_modifier/jetpack/cybernetic multiplicative_slowdown = -0.5 -/datum/movespeed_modifier/jetpack/fullspeed - multiplicative_slowdown = -0.5 - /datum/movespeed_modifier/die_of_fate multiplicative_slowdown = 1 diff --git a/modular_skyrat/master_files/code/modules/mod/mod_types.dm b/modular_skyrat/master_files/code/modules/mod/mod_types.dm index f7228cf7499..e1353be35da 100644 --- a/modular_skyrat/master_files/code/modules/mod/mod_types.dm +++ b/modular_skyrat/master_files/code/modules/mod/mod_types.dm @@ -4,6 +4,6 @@ /obj/item/mod/module/storage/syndicate, /obj/item/mod/module/emp_shield, /obj/item/mod/module/magnetic_harness, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/chameleon, ) diff --git a/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm b/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm index 29058530673..4031e4b4ea6 100644 --- a/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm +++ b/modular_skyrat/modules/advanced_engineering/code/adv_engineering.dm @@ -16,11 +16,11 @@ /obj/item/mod/module/rad_protection, /obj/item/mod/module/flashlight, /obj/item/mod/module/t_ray, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/visor/meson, ) default_pins = list( - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/magboot/advanced, ) diff --git a/modular_skyrat/modules/assault_operatives/code/armaments/armament_modules.dm b/modular_skyrat/modules/assault_operatives/code/armaments/armament_modules.dm index 49a3b58b5f1..b39558276e3 100644 --- a/modular_skyrat/modules/assault_operatives/code/armaments/armament_modules.dm +++ b/modular_skyrat/modules/assault_operatives/code/armaments/armament_modules.dm @@ -31,5 +31,5 @@ cost = 3 /datum/armament_entry/assault_operatives/modules/jetpack - item_type = /obj/item/mod/module/jetpack/advanced + item_type = /obj/item/mod/module/jetpack cost = 5 diff --git a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm index 62ffc8fd6cb..90aefcaa713 100644 --- a/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm +++ b/modular_skyrat/modules/contractor/code/items/modsuit/modsuit.dm @@ -39,7 +39,7 @@ applied_modules = list( /obj/item/mod/module/baton_holster/preloaded/upgraded, /obj/item/mod/module/emp_shield, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/scorpion_hook, /obj/item/mod/module/springlock/contractor/no_complexity, /obj/item/mod/module/storage/syndicate, diff --git a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm index f81495baa79..51317a89327 100644 --- a/modular_skyrat/modules/novaya_ert/code/mod_suit.dm +++ b/modular_skyrat/modules/novaya_ert/code/mod_suit.dm @@ -87,12 +87,12 @@ /obj/item/mod/module/status_readout/operational, /obj/item/mod/module/auto_doc, /obj/item/mod/module/visor/thermal, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/magboot/advanced, ) default_pins = list( /obj/item/mod/module/visor/thermal, - /obj/item/mod/module/jetpack/advanced, + /obj/item/mod/module/jetpack, /obj/item/mod/module/magboot/advanced, ) diff --git a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm index 748ba7cb211..d3fd4aca43a 100644 --- a/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm +++ b/modular_skyrat/modules/opposing_force/code/equipment/modsuit.dm @@ -70,7 +70,7 @@ category = OPFOR_EQUIPMENT_CATEGORY_MODSUIT_MODULES /datum/opposing_force_equipment/modsuit_modules/ion_advanced - item_type = /obj/item/mod/module/jetpack/advanced + item_type = /obj/item/mod/module/jetpack /datum/opposing_force_equipment/modsuit_modules/storage_syndicate item_type = /obj/item/mod/module/storage/syndicate